--- np2/i386c/memory.c 2003/12/27 11:55:23 1.6 +++ np2/i386c/memory.c 2004/01/05 15:47:18 1.7 @@ -14,7 +14,7 @@ BYTE mem[0x200000]; -#define USE_HIMEM +#define USE_HIMEM 0x10fff0 // ---- write byte @@ -811,7 +811,7 @@ REG8 MEMCALL __i286_memoryread(UINT32 ad return(mem[address]); } #if defined(USE_HIMEM) - else if (address >= 0x10fff0) { + else if (address >= USE_HIMEM) { address -= 0x100000; if (address < CPU_EXTMEMSIZE) { return(CPU_EXTMEM[address]); @@ -834,9 +834,9 @@ REG16 MEMCALL __i286_memoryread_w(UINT32 return(LOADINTELWORD(mem + address)); } #if defined(USE_HIMEM) - else if (address >= (0x10fff0 - 1)) { + else if (address >= (USE_HIMEM - 1)) { address -= 0x100000; - if (address == (0x00fff0 - 1)) { + if (address == (USE_HIMEM - 0x100000 - 1)) { ret = mem[0x100000 + address]; } else if (address < CPU_EXTMEMSIZE) { @@ -882,7 +882,7 @@ void MEMCALL __i286_memorywrite(UINT32 a mem[address] = (BYTE)value; } #if defined(USE_HIMEM) - else if (address >= 0x10fff0) { + else if (address >= USE_HIMEM) { address -= 0x100000; if (address < CPU_EXTMEMSIZE) { CPU_EXTMEM[address] = (BYTE)value; @@ -900,9 +900,9 @@ void MEMCALL __i286_memorywrite_w(UINT32 STOREINTELWORD(mem + address, value); } #if defined(USE_HIMEM) - else if (address >= (0x10fff0 - 1)) { + else if (address >= (USE_HIMEM - 1)) { address -= 0x100000; - if (address == (0x00fff0 - 1)) { + if (address == (USE_HIMEM - 0x100000 - 1)) { mem[address] = (BYTE)value; } else if (address < CPU_EXTMEMSIZE) {