np2/i386c/ia32/paging.h - diff

Return to paging.h CVS log

Up to [RetroPC.NET] / np2 / i386c / ia32

Diff for /np2/i386c/ia32/paging.h between versions 1.7 and 1.8

version 1.7, 2004/02/04 13:24:35	version 1.8, 2004/02/05 16:43:44
Line 121 extern "C" {	Line 121 extern "C" {
#define CPU_PTE_WRITABLE (1 << 1)	#define CPU_PTE_WRITABLE (1 << 1)
#define CPU_PTE_PRESENT (1 << 0)	#define CPU_PTE_PRESENT (1 << 0)

/* paging_check(): rw */
	/*
	* linear address memory access function
	*/
	DWORD MEMCALL cpu_linear_memory_read(DWORD address, DWORD length, int code, int user_mode);
	void MEMCALL cpu_linear_memory_write(DWORD address, DWORD value, DWORD length, int user_mode);
	void MEMCALL paging_check(DWORD laddr, DWORD length, int crw, int user_mode);

	/* crw */
#define CPU_PAGE_READ (0 << 0)	#define CPU_PAGE_READ (0 << 0)
#define CPU_PAGE_WRITE (1 << 0)	#define CPU_PAGE_WRITE (1 << 0)
#define CPU_PAGE_CODE (1 << 1)	#define CPU_PAGE_CODE (1 << 1)
Line 131 extern "C" {	Line 139 extern "C" {
#define CPU_PAGE_WRITE_DATA (CPU_PAGE_WRITE\|CPU_PAGE_DATA)	#define CPU_PAGE_WRITE_DATA (CPU_PAGE_WRITE\|CPU_PAGE_DATA)


/*
* linear address function
*/
DWORD MEMCALL cpu_linear_memory_read(DWORD address, DWORD length, int code, int user_mode);
void MEMCALL cpu_linear_memory_write(DWORD address, DWORD value, DWORD length, int user_mode);
void MEMCALL paging_check(DWORD laddr, DWORD length, int crw, int user_mode);

#define cpu_lmemoryread(a,pl) \	#define cpu_lmemoryread(a,pl) \
(!CPU_STAT_PAGING) ? \	(!CPU_STAT_PAGING) ? \
cpu_memoryread(a) : \	cpu_memoryread(a) : \
Line 165 void MEMCALL paging_check(DWORD laddr, D	Line 166 void MEMCALL paging_check(DWORD laddr, D
cpu_linear_memory_write(a,v,4,pl)	cpu_linear_memory_write(a,v,4,pl)

/*	/*
* access code segment linear memory	* code segment
*/	*/
#define cpu_lcmemoryread(a) \	#define cpu_lcmemoryread(a) \
(!CPU_STAT_PAGING) ? \	(!CPU_STAT_PAGING) ? \
cpu_memoryread(a) : \	cpu_memoryread(a) : \
(BYTE)cpu_linear_memory_read(a,1,CPU_PAGE_READ_CODE,CPU_IS_USER_MODE())	(BYTE)cpu_linear_memory_read(a,1,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
#define cpu_lcmemoryread_w(a) \	#define cpu_lcmemoryread_w(a) \
(!CPU_STAT_PAGING) ? \	(!CPU_STAT_PAGING) ? \
cpu_memoryread_w(a) : \	cpu_memoryread_w(a) : \
(WORD)cpu_linear_memory_read(a,2,CPU_PAGE_READ_CODE,CPU_IS_USER_MODE())	(WORD)cpu_linear_memory_read(a,2,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
#define cpu_lcmemoryread_d(a) \	#define cpu_lcmemoryread_d(a) \
(!CPU_STAT_PAGING) ? \	(!CPU_STAT_PAGING) ? \
cpu_memoryread_d(a) : \	cpu_memoryread_d(a) : \
cpu_linear_memory_read(a,4,CPU_PAGE_READ_CODE,CPU_IS_USER_MODE())	cpu_linear_memory_read(a,4,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)

/*	/*
* access linear memory with superviser mode	* linear address memory access with superviser mode
*/	*/
#define cpu_kmemoryread(a) cpu_lmemoryread(a,CPU_MODE_SUPERVISER)	#define cpu_kmemoryread(a) cpu_lmemoryread(a,CPU_MODE_SUPERVISER)
#define cpu_kmemoryread_w(a) cpu_lmemoryread_w(a,CPU_MODE_SUPERVISER)	#define cpu_kmemoryread_w(a) cpu_lmemoryread_w(a,CPU_MODE_SUPERVISER)
Line 196 void MEMCALL paging_check(DWORD laddr, D	Line 197 void MEMCALL paging_check(DWORD laddr, D
*/	*/
#define set_CR3(cr3) \	#define set_CR3(cr3) \
do { \	do { \
	VERBOSE(("set_CR3: old = %08x, new = 0x%08x", CPU_CR3, (cr3) & CPU_CR3_MASK)); \
CPU_CR3 = (cr3) & CPU_CR3_MASK; \	CPU_CR3 = (cr3) & CPU_CR3_MASK; \
CPU_STAT_PDE_BASE = CPU_CR3 & CPU_CR3_PD_MASK; \	CPU_STAT_PDE_BASE = CPU_CR3 & CPU_CR3_PD_MASK; \
tlb_flush(FALSE); \	tlb_flush(FALSE); \

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.7
changed lines
	Added in v.1.8