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

Diff for /np2/i386c/memory.h between versions 1.7 and 1.18

version 1.7, 2004/02/05 16:41:32 version 1.18, 2007/02/05 15:23:38
Line 6 Line 6
 #define MEMCALL FASTCALL  #define MEMCALL FASTCALL
 #endif  #endif
   
   #if !defined(MEMCALL)
   #define MEMCALL
   #endif
   
 // 000000-0fffff メインメモリ  // 000000-0fffff メインメモリ
 // 100000-10ffef HMA  // 100000-10ffef HMA
Line 16 Line 19
 // 1e0000-1e7fff VRAM1  // 1e0000-1e7fff VRAM1
 // 1f8000-1fffff ITF-ROM  // 1f8000-1fffff ITF-ROM
   
   #define CPU_MEMREADMAX  0x0a4000
   #define CPU_MEMWRITEMAX 0x0a0000
   
 #define VRAM_STEP       0x100000  #define VRAM_STEP       0x100000
 #define VRAM_B          0x0a8000  #define VRAM_B          0x0a8000
 #define VRAM_R          0x0b0000  #define VRAM_R          0x0b0000
Line 36 Line 42
 #define FONT_ADRS       0x110000  #define FONT_ADRS       0x110000
 #define ITF_ADRS        0x1f8000  #define ITF_ADRS        0x1f8000
   
   #define USE_HIMEM               0x110000
   
 #ifdef __cplusplus  #ifdef __cplusplus
 extern "C" {  extern "C" {
 #endif  #endif
   
 extern  BYTE    mem[0x200000];  extern  UINT8   mem[0x200000];
   
 void MEMCALL i286_memorymap(UINT type);  void MEMCALL memm_arch(UINT type);
 void MEMCALL i286_vram_dispatch(UINT operate);  void MEMCALL memm_vram(UINT operate);
   
 void MEMCALL i286_memorywrite(UINT32 address, REG8 value);  REG8 MEMCALL memp_read8(UINT32 address);
 void MEMCALL i286_memorywrite_w(UINT32 address, REG16 value);  REG16 MEMCALL memp_read16(UINT32 address);
 void MEMCALL i286_memorywrite_d(UINT32 address, UINT32 value);  UINT32 MEMCALL memp_read32(UINT32 address);
 REG8 MEMCALL i286_memoryread(UINT32 address);  void MEMCALL memp_write8(UINT32 address, REG8 value);
 REG16 MEMCALL i286_memoryread_w(UINT32 address);  void MEMCALL memp_write16(UINT32 address, REG16 value);
 UINT32 MEMCALL i286_memoryread_d(UINT32 address);  void MEMCALL memp_write32(UINT32 address, UINT32 value);
   void MEMCALL memp_reads(UINT32 address, void *dat, UINT leng);
 #ifdef NP2_MEMORY_ASM  void MEMCALL memp_writes(UINT32 address, const void *dat, UINT leng);
 BYTE MEMCALL i286_membyte_read(WORD seg, WORD off);  
 WORD MEMCALL i286_memword_read(WORD seg, WORD off);  REG8 MEMCALL meml_read8(UINT32 address);
 void MEMCALL i286_membyte_write(WORD seg, WORD off, BYTE dat);  REG16 MEMCALL meml_read16(UINT32 address);
 void MEMCALL i286_memword_write(WORD seg, WORD off, WORD dat);  UINT32 MEMCALL meml_read32(UINT32 address);
 #else  void MEMCALL meml_write8(UINT32 address, REG8 dat);
 #define i286_membyte_read(a, b) \  void MEMCALL meml_write16(UINT32 address, REG16 dat);
         i286_memoryread(((DWORD)(a) << 4) + (WORD)(b))  void MEMCALL meml_write32(UINT32 address, UINT32 dat);
 #define i286_memword_read(a, b) \  void MEMCALL meml_reads(UINT32 address, void *dat, UINT leng);
         i286_memoryread_w(((DWORD)(a) << 4) + (WORD)(b))  void MEMCALL meml_writes(UINT32 address, const void *dat, UINT leng);
   
 #define i286_membyte_write(a, b, c) \  REG8 MEMCALL memr_read8(UINT seg, UINT off);
         i286_memorywrite(((DWORD)(a) << 4) + (WORD)(b), (c))  REG16 MEMCALL memr_read16(UINT seg, UINT off);
 #define i286_memword_write(a, b, c) \  UINT32 MEMCALL memr_read32(UINT seg, UINT off);
         i286_memorywrite_w(((DWORD)(a) << 4) + (WORD)(b), (c))  void MEMCALL memr_write8(UINT seg, UINT off, REG8 dat);
 #endif  void MEMCALL memr_write16(UINT seg, UINT off, REG16 dat);
   void MEMCALL memr_write32(UINT seg, UINT off, UINT32 dat);
 void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng);  void MEMCALL memr_reads(UINT seg, UINT off, void *dat, UINT leng);
 void MEMCALL i286_memstr_write(UINT seg, UINT off, const void *dat, UINT leng);  void MEMCALL memr_writes(UINT seg, UINT off, const void *dat, UINT leng);
 void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng);  
 void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng);  
   
 #ifdef __cplusplus  #ifdef __cplusplus
 }  }
 #endif  #endif
   
   
   // ---- Memory map
   
   #define MEMM_ARCH(t)            memm_arch(t)
   #define MEMM_VRAM(o)            memm_vram(o)
   
   
   // ---- Physical Space (DMA)
   
   #define MEMP_READ8(addr)                                        \
                           memp_read8((addr))
   #define MEMP_READ16(addr)                                       \
                           memp_read16((addr))
   #define MEMP_READ32(addr)                                       \
                           memp_read32((addr))
   #define MEMP_WRITE8(addr, dat)                          \
                           memp_write8((addr), (dat))
   #define MEMP_WRITE16(addr, dat)                         \
                           memp_write16((addr), (dat))
   #define MEMP_WRITE32(addr, dat)                         \
                           memp_write32((addr), (dat))
   #define MEMP_READS(addr, dat, leng)                     \
                           memp_reads((addr), (dat), (leng))
   #define MEMP_WRITES(addr, dat, leng)            \
                           memp_writes((addr), (dat), (leng))
   
   
   // ---- Logical Space (BIOS)
   
   #define MEML_READ8(addr)                                        \
                           meml_read8((addr))
   #define MEML_READ16(addr)                                       \
                           meml_read16((addr))
   #define MEML_READ32(addr)                                       \
                           meml_read32((addr))
   #define MEML_WRITE8(addr, dat)                          \
                           meml_write8((addr), (dat))
   #define MEML_WRITE16(addr, dat)                         \
                           meml_write16((addr), (dat))
   #define MEML_WRITE32(addr, dat)                         \
                           meml_write32((addr), (dat))
   #define MEML_READS(addr, dat, leng)                     \
                           meml_reads((addr), (dat), (leng))
   #define MEML_WRITES(addr, dat, leng)            \
                           meml_writes((addr), (dat), (leng))
   
   #define MEMR_READ8(seg, off)                            \
                           memr_read8((seg), (off))
   #define MEMR_READ16(seg, off)                           \
                           memr_read16((seg), (off))
   #define MEMR_WRITE8(seg, off, dat)                      \
                           memr_write8((seg), (off), (dat))
   #define MEMR_WRITE16(seg, off, dat)                     \
                           memr_write16((seg), (off), (dat))
   #define MEMR_READS(seg, off, dat, leng)         \
                           memr_reads((seg), (off), (dat), (leng))
   #define MEMR_WRITES(seg, off, dat, leng)        \
                           memr_writes((seg), (off), (dat), (leng))
   
 #endif  /* !NP2_I386C_MEMORY_H__ */  #endif  /* !NP2_I386C_MEMORY_H__ */
Removed from v.1.7  
changed lines
  Added in v.1.18

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