[BACK]Return to paging.h CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / i386c / ia32

Diff for /np2/i386c/ia32/paging.h between versions 1.10 and 1.15

version 1.10, 2004/02/20 16:09:04 version 1.15, 2004/03/24 14:03:52
Line 128  extern "C" { Line 128  extern "C" {
 /*  /*
  * linear address memory access function   * linear address memory access function
  */   */
 UINT32 MEMCALL cpu_linear_memory_read(UINT32 address, UINT length, int code, int user_mode);  #if defined(IA32_PAGING_EACHSIZE)
 void MEMCALL cpu_linear_memory_write(UINT32 address, UINT32 value, UINT length, int user_mode);  UINT8 MEMCALL cpu_memory_access_la_RMW_b(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg);
 void MEMCALL paging_check(UINT32 laddr, UINT length, int crw, int user_mode);  UINT16 MEMCALL cpu_memory_access_la_RMW_w(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg);
   UINT32 MEMCALL cpu_memory_access_la_RMW_d(UINT32 laddr, UINT32 (*func)(UINT32, void *), void *arg);
   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_memory_access_la_RMW(UINT32 laddr, UINT length, const int user_mode, UINT32 (*func)(UINT32, void *), void *arg);
   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 cpu_memory_access_la_region(UINT32 address, UINT length, const int crw, const int user_mode, BYTE *data);
   void MEMCALL paging_check(UINT32 laddr, UINT length, const int crw, const int user_mode);
   
 /* crw */  /* crw */
 #define CPU_PAGE_READ           (0 << 0)  #define CPU_PAGE_READ           (0 << 0)
Line 141  void MEMCALL paging_check(UINT32 laddr,  Line 155  void MEMCALL paging_check(UINT32 laddr, 
 #define CPU_PAGE_READ_DATA      (CPU_PAGE_READ|CPU_PAGE_DATA)  #define CPU_PAGE_READ_DATA      (CPU_PAGE_READ|CPU_PAGE_DATA)
 #define CPU_PAGE_WRITE_DATA     (CPU_PAGE_WRITE|CPU_PAGE_DATA)  #define CPU_PAGE_WRITE_DATA     (CPU_PAGE_WRITE|CPU_PAGE_DATA)
   
   #if defined(IA32_PAGING_EACHSIZE)
   
   #define cpu_lmemoryread(a,pl) \
           (!CPU_STAT_PAGING) ? \
            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)
   #define cpu_lmemoryread_d(a,pl) \
           (!CPU_STAT_PAGING) ? \
            cpu_memoryread_d(a) : cpu_linear_memory_read_d(a,CPU_PAGE_READ_DATA,pl)
   
   #define cpu_lmemorywrite(a,v,pl) \
           (!CPU_STAT_PAGING) ? \
            cpu_memorywrite(a,v) : cpu_linear_memory_write_b(a,v,pl)
   #define cpu_lmemorywrite_b(a,v,pl) cpu_lmemorywrite(a,v,pl)
   #define cpu_lmemorywrite_w(a,v,pl) \
           (!CPU_STAT_PAGING) ? \
            cpu_memorywrite_w(a,v) : cpu_linear_memory_write_w(a,v,pl)
   #define cpu_lmemorywrite_d(a,v,pl) \
           (!CPU_STAT_PAGING) ? \
            cpu_memorywrite_d(a,v) : cpu_linear_memory_write_d(a,v,pl)
   
   /* code */
   #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_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)
   
 #define cpu_lmemoryread(a,pl) \  #define cpu_lmemoryread(a,pl) \
         (!CPU_STAT_PAGING) ? \          (!CPU_STAT_PAGING) ? \
          cpu_memoryread(a) : \           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) \  #define cpu_lmemoryread_w(a,pl) \
         (!CPU_STAT_PAGING) ? \          (!CPU_STAT_PAGING) ? \
          cpu_memoryread_w(a) : \           cpu_memoryread_w(a) : \
Line 159  void MEMCALL paging_check(UINT32 laddr,  Line 220  void MEMCALL paging_check(UINT32 laddr, 
         (!CPU_STAT_PAGING) ? \          (!CPU_STAT_PAGING) ? \
          cpu_memorywrite(a,v) : \           cpu_memorywrite(a,v) : \
          cpu_linear_memory_write(a,v,1,pl)           cpu_linear_memory_write(a,v,1,pl)
   #define cpu_lmemorywrite_b(a,v,pl) cpu_lmemorywrite(a,v,pl)
 #define cpu_lmemorywrite_w(a,v,pl) \  #define cpu_lmemorywrite_w(a,v,pl) \
         (!CPU_STAT_PAGING) ? \          (!CPU_STAT_PAGING) ? \
          cpu_memorywrite_w(a,v) : \           cpu_memorywrite_w(a,v) : \
Line 168  void MEMCALL paging_check(UINT32 laddr,  Line 230  void MEMCALL paging_check(UINT32 laddr, 
          cpu_memorywrite_d(a,v) : \           cpu_memorywrite_d(a,v) : \
          cpu_linear_memory_write(a,v,4,pl)           cpu_linear_memory_write(a,v,4,pl)
   
 /*  /* code */
  * code segment  
  */  
 #define cpu_lcmemoryread(a) \  #define cpu_lcmemoryread(a) \
         (!CPU_STAT_PAGING) ? \          (!CPU_STAT_PAGING) ? \
          cpu_memoryread(a) : \           cpu_memoryread(a) : \
Line 184  void MEMCALL paging_check(UINT32 laddr,  Line 244  void MEMCALL paging_check(UINT32 laddr, 
          cpu_memoryread_d(a) : \           cpu_memoryread_d(a) : \
          cpu_linear_memory_read(a,4,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)           cpu_linear_memory_read(a,4,CPU_PAGE_READ_CODE,CPU_STAT_USER_MODE)
   
   #endif  /* IA32_PAGING_EACHSIZE */
   
 /*  /*
  * linear address memory access with superviser mode   * linear address memory access with superviser mode
  */   */
Line 213  do { \ Line 275  do { \
 #if defined(IA32_SUPPORT_TLB)  #if defined(IA32_SUPPORT_TLB)
 void tlb_init(void);  void tlb_init(void);
 void tlb_flush(BOOL allflush);  void tlb_flush(BOOL allflush);
 void tlb_flush_page(UINT32 vaddr);  void tlb_flush_page(UINT32 laddr);
 #else  #else
 #define tlb_init()  #define tlb_init()
 #define tlb_flush(allflush)     (void)allflush  #define tlb_flush(allflush)     (void)(allflush)
 #define tlb_flush_page(vaddr)   (void)vaddr  #define tlb_flush_page(laddr)   (void)(laddr)
 #endif  #endif
   
 #ifdef __cplusplus  #ifdef __cplusplus
Removed from v.1.10  
changed lines
  Added in v.1.15

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