--- np2/i386c/ia32/cpu_mem.h	2004/02/20 16:09:04	1.4
+++ np2/i386c/ia32/cpu_mem.h	2004/03/25 15:08:32	1.7
@@ -1,7 +1,7 @@
-/*	$Id: cpu_mem.h,v 1.4 2004/02/20 16:09:04 monaka Exp $	*/
+/*	$Id: cpu_mem.h,v 1.7 2004/03/25 15:08:32 monaka Exp $	*/
 
 /*
- * Copyright (c) 2002-2003 NONAKA Kimihiro
+ * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,27 +42,33 @@ extern "C" {
  */
 void cpu_memoryread_check(descriptor_t *sd, UINT32 madr, UINT length, int e);
 void cpu_memorywrite_check(descriptor_t *sd, UINT32 madr, UINT length, int e);
-BOOL cpu_stack_push_check(descriptor_t *sd, UINT32 madr, UINT length);
-BOOL cpu_stack_pop_check(descriptor_t *sd, UINT32 madr, UINT length);
-#define	CHECK_STACK_PUSH(sdp, addr, n)	cpu_stack_push_check(sdp, addr, n)
-#define	CHECK_STACK_POP(sdp, addr, n)	cpu_stack_pop_check(sdp, addr, n)
+void cpu_stack_push_check(UINT16 s, descriptor_t *sd, UINT32 madr, UINT length);
+void cpu_stack_pop_check(UINT16 s, descriptor_t *sd, UINT32 madr, UINT length);
+#define	STACK_PUSH_CHECK(s, sd, addr, n) cpu_stack_push_check(s, sd, addr, n)
+#define	STACK_POP_CHECK(s, sd, addr, n) cpu_stack_pop_check(s, sd, addr, n)
 
 /*
  * virtual address function
  */
-void MEMCALL cpu_vmemorywrite(int idx, UINT32 address, UINT8 value);
-void MEMCALL cpu_vmemorywrite_w(int idx, UINT32 address, UINT16 value);
-void MEMCALL cpu_vmemorywrite_d(int idx, UINT32 address, UINT32 value);
-UINT8 MEMCALL cpu_vmemoryread(int idx, UINT32 address);
-UINT16 MEMCALL cpu_vmemoryread_w(int idx, UINT32 address);
-UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 address);
+void MEMCALL cpu_vmemorywrite_b(int idx, UINT32 offset, UINT8 value) GCC_ATTR_REGPARM;
+void MEMCALL cpu_vmemorywrite_w(int idx, UINT32 offset, UINT16 value) GCC_ATTR_REGPARM;
+void MEMCALL cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 value) GCC_ATTR_REGPARM;
+UINT8 MEMCALL cpu_vmemoryread_b(int idx, UINT32 offset) GCC_ATTR_REGPARM;
+UINT16 MEMCALL cpu_vmemoryread_w(int idx, UINT32 offset) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 offset) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+#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)
 
 /*
  * code fetch
  */
-UINT8 MEMCALL cpu_codefetch(UINT32 madr);
-UINT16 MEMCALL cpu_codefetch_w(UINT32 madr);
-UINT32 MEMCALL cpu_codefetch_d(UINT32 madr);
+UINT8 MEMCALL cpu_codefetch(UINT32 madr) GCC_ATTR_REGPARM;
+UINT16 MEMCALL cpu_codefetch_w(UINT32 madr) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_codefetch_d(UINT32 madr) GCC_ATTR_REGPARM;
 
 #ifdef __cplusplus
 }