--- np2/i386c/ia32/cpu_mem.h	2008/03/22 04:03:07	1.11
+++ np2/i386c/ia32/cpu_mem.h	2012/01/08 19:09:40	1.15
@@ -1,5 +1,3 @@
-/*	$Id: cpu_mem.h,v 1.11 2008/03/22 04:03:07 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
@@ -38,8 +36,8 @@ extern "C" {
 /*
  * memory access check
  */
-void cpu_stack_push_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len);
-void cpu_stack_pop_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len);
+void MEMCALL cpu_stack_push_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len);
+void MEMCALL cpu_stack_pop_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len);
 #define	SS_PUSH_CHECK(sp, len) \
 	cpu_stack_push_check(CPU_SS_INDEX, &CPU_SS_DESC, (sp), (len))
 #define	SS_POP_CHECK(sp, len) \
@@ -49,21 +47,20 @@ void cpu_stack_pop_check(UINT16 s, descr
  * virtual address function
  */
 void MEMCALL cpu_vmemorywrite_b(int idx, UINT32 offset, UINT8 value);
+#define	cpu_vmemorywrite(i,o,v)		cpu_vmemorywrite_b(i,o,v)
 void MEMCALL cpu_vmemorywrite_w(int idx, UINT32 offset, UINT16 value);
 void MEMCALL cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 value);
 void MEMCALL cpu_vmemorywrite_q(int idx, UINT32 offset, UINT64 value);
 void MEMCALL cpu_vmemorywrite_f(int idx, UINT32 offset, const REG80 *value);
 UINT8 MEMCALL cpu_vmemoryread_b(int idx, UINT32 offset);
+#define	cpu_vmemoryread(i,o)		cpu_vmemoryread_b(i,o)
 UINT16 MEMCALL cpu_vmemoryread_w(int idx, UINT32 offset);
 UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 offset);
 UINT64 MEMCALL cpu_vmemoryread_q(int idx, UINT32 offset);
 REG80 MEMCALL cpu_vmemoryread_f(int idx, UINT32 offset);
-UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
-UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
-UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
-#define	cpu_vmemorywrite(i,o,v)			cpu_vmemorywrite_b(i,o,v)
-#define	cpu_vmemoryread(i,o)			cpu_vmemoryread_b(i,o)
-#define	cpu_memory_access_va_RMW(i,o,f,a)	cpu_memory_access_va_RMW_b(i,o,f,a)
+UINT32 MEMCALL cpu_vmemory_RMW_b(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
+UINT32 MEMCALL cpu_vmemory_RMW_w(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
+UINT32 MEMCALL cpu_vmemory_RMW_d(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
 
 /*
  * code fetch