--- np2/i386c/ia32/paging.h	2004/03/23 19:32:37	1.14
+++ np2/i386c/ia32/paging.h	2004/06/15 13:50:13	1.18
@@ -1,4 +1,4 @@
-/*	$Id: paging.h,v 1.14 2004/03/23 19:32:37 yui Exp $	*/
+/*	$Id: paging.h,v 1.18 2004/06/15 13:50:13 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -128,42 +128,43 @@ extern "C" {
 /*
  * linear address memory access function
  */
-void MEMCALL cpu_memory_access_la_region(UINT32 address, UINT length, const int crw, const int user_mode, BYTE *data);
-UINT32 MEMCALL cpu_memory_access_la_RMW(UINT32 laddr, UINT length, const int user_mode, UINT32 (*func)(UINT32, void *), void *arg);
+void MEMCALL cpu_memory_access_la_region(UINT32 address, UINT length, const int ucrw, BYTE *data);
+void MEMCALL paging_check(UINT32 laddr, UINT length, const int ucrw);
 
-#if defined(IA32_PAGING_EACHSIZE)
-UINT8 MEMCALL cpu_linear_memory_read_b(UINT32 laddr, const int crw, const int user_mode);
-UINT16 MEMCALL cpu_linear_memory_read_w(UINT32 laddr, const int crw, const int user_mode);
-UINT32 MEMCALL cpu_linear_memory_read_d(UINT32 laddr, const int crw, const int user_mode);
-void MEMCALL cpu_linear_memory_write_b(UINT32 laddr, UINT8 value, const int user_mode);
-void MEMCALL cpu_linear_memory_write_w(UINT32 laddr, UINT16 value, const int user_mode);
-void MEMCALL cpu_linear_memory_write_d(UINT32 laddr, UINT32 value, const int user_mode);
-#else	// IA32_PAGING_EACHSIZE
-UINT32 MEMCALL cpu_linear_memory_read(UINT32 address, UINT length, const int crw, const int user_mode);
-void MEMCALL cpu_linear_memory_write(UINT32 address, UINT32 value, UINT length, const int user_mode);
-#endif	// IA32_PAGING_EACHSIZE
-void MEMCALL paging_check(UINT32 laddr, UINT length, const int crw, const int user_mode);
-
-/* crw */
-#define	CPU_PAGE_READ		(0 << 0)
+/* ucrw */
 #define	CPU_PAGE_WRITE		(1 << 0)
 #define	CPU_PAGE_CODE		(1 << 1)
 #define	CPU_PAGE_DATA		(1 << 2)
-#define	CPU_PAGE_READ_CODE	(CPU_PAGE_READ|CPU_PAGE_CODE)
-#define	CPU_PAGE_READ_DATA	(CPU_PAGE_READ|CPU_PAGE_DATA)
+#define	CPU_PAGE_USER_MODE	(1 << 3)	/* == CPU_MODE_USER */
+#define	CPU_PAGE_READ_CODE	(CPU_PAGE_CODE)
+#define	CPU_PAGE_READ_DATA	(CPU_PAGE_DATA)
 #define	CPU_PAGE_WRITE_DATA	(CPU_PAGE_WRITE|CPU_PAGE_DATA)
 
 #if defined(IA32_PAGING_EACHSIZE)
+
+UINT8 MEMCALL cpu_memory_access_la_RMW_b(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+UINT16 MEMCALL cpu_memory_access_la_RMW_w(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_memory_access_la_RMW_d(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+UINT8 MEMCALL cpu_linear_memory_read_b(UINT32 laddr, const int ucrw) GCC_ATTR_REGPARM;
+UINT16 MEMCALL cpu_linear_memory_read_w(UINT32 laddr, const int ucrw) GCC_ATTR_REGPARM;
+UINT32 MEMCALL cpu_linear_memory_read_d(UINT32 laddr, const int ucrw) GCC_ATTR_REGPARM;
+void MEMCALL cpu_linear_memory_write_b(UINT32 laddr, UINT8 value, const int user_mode) GCC_ATTR_REGPARM;
+void MEMCALL cpu_linear_memory_write_w(UINT32 laddr, UINT16 value, const int user_mode) GCC_ATTR_REGPARM;
+void MEMCALL cpu_linear_memory_write_d(UINT32 laddr, UINT32 value, const int user_mode) GCC_ATTR_REGPARM;
+
 #define	cpu_lmemoryread(a,pl) \
 	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread(a) : cpu_linear_memory_read_b(a,CPU_PAGE_READ_DATA,pl)
+	 cpu_memoryread(a) : \
+	 cpu_linear_memory_read_b(a,CPU_PAGE_READ_DATA | (pl))
 #define	cpu_lmemoryread_b(a,pl) cpu_lmemoryread(a,pl)
 #define	cpu_lmemoryread_w(a,pl) \
 	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_w(a) : cpu_linear_memory_read_w(a,CPU_PAGE_READ_DATA,pl)
+	 cpu_memoryread_w(a) : \
+	 cpu_linear_memory_read_w(a,CPU_PAGE_READ_DATA | (pl))
 #define	cpu_lmemoryread_d(a,pl) \
 	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_d(a) : cpu_linear_memory_read_d(a,CPU_PAGE_READ_DATA,pl)
+	 cpu_memoryread_d(a) : \
+	 cpu_linear_memory_read_d(a,CPU_PAGE_READ_DATA | (pl))
 
 #define	cpu_lmemorywrite(a,v,pl) \
 	(!CPU_STAT_PAGING) ? \
@@ -175,20 +176,37 @@ void MEMCALL paging_check(UINT32 laddr, 
 #define	cpu_lmemorywrite_d(a,v,pl) \
 	(!CPU_STAT_PAGING) ? \
 	 cpu_memorywrite_d(a,v) : cpu_linear_memory_write_d(a,v,pl)
-#else	// IA32_PAGING_EACHSIZE
+
+#else	/* !IA32_PAGING_EACHSIZE */
+
+UINT32 MEMCALL cpu_memory_access_la_RMW(UINT32 laddr, UINT length, UINT32 (*func)(UINT32, void *), void *arg) GCC_ATTR_REGPARM;
+#define	cpu_memory_access_la_RMW_b(l,f,a) cpu_memory_access_la_RMW(l,1,f,a)
+#define	cpu_memory_access_la_RMW_w(l,f,a) cpu_memory_access_la_RMW(l,2,f,a)
+#define	cpu_memory_access_la_RMW_d(l,f,a) cpu_memory_access_la_RMW(l,4,f,a)
+
+UINT32 MEMCALL cpu_linear_memory_read(UINT32 address, UINT length, const int ucrw) GCC_ATTR_REGPARM;
+#define	cpu_linear_memory_read_b(a,pl) cpu_linear_memory_read(a,1,pl)
+#define	cpu_linear_memory_read_w(a,pl) cpu_linear_memory_read(a,2,pl)
+#define	cpu_linear_memory_read_d(a,pl) cpu_linear_memory_read(a,4,pl)
+
+void MEMCALL cpu_linear_memory_write(UINT32 address, UINT32 value, UINT length, const int user_mode) GCC_ATTR_REGPARM;
+#define	cpu_linear_memory_write_b(a,v,pl) cpu_linear_memory_write(a,v,1,pl)
+#define	cpu_linear_memory_write_w(a,v,pl) cpu_linear_memory_write(a,v,2,pl)
+#define	cpu_linear_memory_write_d(a,v,pl) cpu_linear_memory_write(a,v,4,pl)
+
 #define	cpu_lmemoryread(a,pl) \
 	(!CPU_STAT_PAGING) ? \
 	 cpu_memoryread(a) : \
-	 (UINT8)cpu_linear_memory_read(a,1,CPU_PAGE_READ_DATA,pl)
+	 (UINT8)cpu_linear_memory_read(a,1,CPU_PAGE_READ_DATA | (pl))
 #define	cpu_lmemoryread_b(a,pl) cpu_lmemoryread(a,pl)
 #define	cpu_lmemoryread_w(a,pl) \
 	(!CPU_STAT_PAGING) ? \
 	 cpu_memoryread_w(a) : \
-	 (UINT16)cpu_linear_memory_read(a,2,CPU_PAGE_READ_DATA,pl)
+	 (UINT16)cpu_linear_memory_read(a,2,CPU_PAGE_READ_DATA | (pl))
 #define	cpu_lmemoryread_d(a,pl) \
 	(!CPU_STAT_PAGING) ? \
 	 cpu_memoryread_d(a) : \
-	 cpu_linear_memory_read(a,4,CPU_PAGE_READ_DATA,pl)
+	 cpu_linear_memory_read(a,4,CPU_PAGE_READ_DATA | (pl))
 
 #define	cpu_lmemorywrite(a,v,pl) \
 	(!CPU_STAT_PAGING) ? \
@@ -203,38 +221,8 @@ void MEMCALL paging_check(UINT32 laddr, 
 	(!CPU_STAT_PAGING) ? \
 	 cpu_memorywrite_d(a,v) : \
 	 cpu_linear_memory_write(a,v,4,pl)
-#endif	// IA32_PAGING_EACHSIZE
 
-/*
- * code segment
- */
-#if defined(IA32_PAGING_EACHSIZE)
-#define	cpu_lcmemoryread(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread(a) : \
-	 cpu_linear_memory_read_b(a,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#define	cpu_lcmemoryread_w(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_w(a) : \
-	 cpu_linear_memory_read_w(a,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#define	cpu_lcmemoryread_d(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_d(a) : \
-	 cpu_linear_memory_read_d(a,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#else	// IA32_PAGING_EACHSIZE
-#define	cpu_lcmemoryread(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread(a) : \
-	 (UINT8)cpu_linear_memory_read(a,1,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#define	cpu_lcmemoryread_w(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_w(a) : \
-	 (UINT16)cpu_linear_memory_read(a,2,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#define	cpu_lcmemoryread_d(a) \
-	(!CPU_STAT_PAGING) ? \
-	 cpu_memoryread_d(a) : \
-	 cpu_linear_memory_read(a,4,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
-#endif	// IA32_PAGING_EACHSIZE
+#endif	/* IA32_PAGING_EACHSIZE */
 
 /*
  * linear address memory access with superviser mode
@@ -262,14 +250,31 @@ do { \
 /*
  * TLB function
  */
+typedef struct {
+	UINT32	tag;	/* linear address */
+#define	TLB_ENTRY_TAG_VALID		(1 << 0)
+/*	pde & pte & CPU_PTE_WRITABLE	(1 << 1)	*/
+/*	pde & pte & CPU_PTE_USER_MODE	(1 << 2)	*/
+#define	TLB_ENTRY_TAG_DIRTY		CPU_PTE_DIRTY		/* (1 << 6) */
+#define	TLB_ENTRY_TAG_GLOBAL		CPU_PTE_GLOBAL_PAGE	/* (1 << 8) */
+#define	TLB_ENTRY_TAG_MAX_SHIFT		12
+
+	UINT32	paddr;	/* physical address */
+
+	UINT8	*memp;	/* shortcut for pre-fetch queue */
+} TLB_ENTRY_T;
+
+
 #if defined(IA32_SUPPORT_TLB)
 void tlb_init(void);
-void tlb_flush(BOOL allflush);
-void tlb_flush_page(UINT32 laddr);
+void MEMCALL tlb_flush(BOOL allflush) GCC_ATTR_REGPARM;
+void MEMCALL tlb_flush_page(UINT32 laddr) GCC_ATTR_REGPARM;
+TLB_ENTRY_T* MEMCALL tlb_lookup(const UINT32 laddr, const int ucrw) GCC_ATTR_REGPARM;
 #else
 #define	tlb_init()
 #define	tlb_flush(allflush)	(void)(allflush)
-#define	tlb_flush_page(laddr)	(void)(laddr)
+#define	tlb_flush_page(la)	(void)(la)
+#define	tlb_lookup(la, ucrw)	NULL
 #endif
 
 #ifdef __cplusplus