--- np2/i386c/memory.c 2004/03/02 16:31:21 1.12 +++ np2/i386c/memory.c 2004/04/05 12:02:30 1.25 @@ -3,7 +3,6 @@ #ifndef NP2_MEMORY_ASM #include "cpucore.h" -#include "memory.h" #include "egcmem.h" #include "mem9821.h" #include "pccore.h" @@ -15,16 +14,14 @@ BYTE mem[0x200000]; -#define USE_HIMEM 0x110000 - // ---- write byte -static void MEMCALL i286_wt(UINT32 address, REG8 value) { +static void MEMCALL i286_wt(UINT32 address, REG8 value) { // MAIN mem[address & CPU_ADRSMASK] = (BYTE)value; } -static void MEMCALL tram_wt(UINT32 address, REG8 value) { +static void MEMCALL tram_wt(UINT32 address, REG8 value) { // TRAM CPU_REMCLOCK -= MEMWAIT_TRAM; if (address < 0xa2000) { @@ -56,7 +53,7 @@ static void MEMCALL tram_wt(UINT32 addre } } -static void MEMCALL vram_w0(UINT32 address, REG8 value) { +static void MEMCALL vram_w0(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; mem[address] = (BYTE)value; @@ -64,7 +61,7 @@ static void MEMCALL vram_w0(UINT32 addre gdcs.grphdisp |= 1; } -static void MEMCALL vram_w1(UINT32 address, REG8 value) { +static void MEMCALL vram_w1(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; mem[address + VRAM_STEP] = (BYTE)value; @@ -72,7 +69,7 @@ static void MEMCALL vram_w1(UINT32 addre gdcs.grphdisp |= 2; } -static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) { +static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) { // VRAM REG8 mask; BYTE *vram; @@ -101,7 +98,7 @@ static void MEMCALL grcg_rmw0(UINT32 add } } -static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) { +static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) { // VRAM REG8 mask; BYTE *vram; @@ -130,7 +127,7 @@ static void MEMCALL grcg_rmw1(UINT32 add } } -static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) { +static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) { // VRAM BYTE *vram; @@ -154,7 +151,7 @@ static void MEMCALL grcg_tdw0(UINT32 add (void)value; } -static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) { +static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) { // VRAM BYTE *vram; @@ -178,18 +175,30 @@ static void MEMCALL grcg_tdw1(UINT32 add (void)value; } -static void MEMCALL egc_wt(UINT32 address, REG8 value) { +static void MEMCALL egc_wt(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_GRCG; egc_write(address, value); } -static void MEMCALL i286_wb(UINT32 address, REG8 value) { +static void MEMCALL emmc_wt(UINT32 address, REG8 value) { // EMS + + CPU_EMSPTR[(address >> 14) & 3][LOW14(address)] = (BYTE)value; +} + +static void MEMCALL i286_wd(UINT32 address, REG8 value) { // D000〜DFFF + + if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) { + mem[address] = (BYTE)value; + } +} + +static void MEMCALL i286_wb(UINT32 address, REG8 value) { // F800〜FFFF mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; } -static void MEMCALL i286_wn(UINT32 address, REG8 value) { +static void MEMCALL i286_wn(UINT32 address, REG8 value) { // NONE (void)address; (void)value; @@ -198,12 +207,12 @@ static void MEMCALL i286_wn(UINT32 addre // ---- read byte -static REG8 MEMCALL i286_rd(UINT32 address) { +static REG8 MEMCALL i286_rd(UINT32 address) { // MAIN return(mem[address & CPU_ADRSMASK]); } -static REG8 MEMCALL tram_rd(UINT32 address) { +static REG8 MEMCALL tram_rd(UINT32 address) { // TRAM CPU_REMCLOCK -= MEMWAIT_TRAM; if (address < 0xa4000) { @@ -220,19 +229,19 @@ static REG8 MEMCALL tram_rd(UINT32 addre return(mem[address]); } -static REG8 MEMCALL vram_r0(UINT32 address) { +static REG8 MEMCALL vram_r0(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; return(mem[address]); } -static REG8 MEMCALL vram_r1(UINT32 address) { +static REG8 MEMCALL vram_r1(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; return(mem[address + VRAM_STEP]); } -static REG8 MEMCALL grcg_tcr0(UINT32 address) { +static REG8 MEMCALL grcg_tcr0(UINT32 address) { // VRAM const BYTE *vram; REG8 ret; @@ -255,7 +264,7 @@ const BYTE *vram; return(ret ^ 0xff); } -static REG8 MEMCALL grcg_tcr1(UINT32 address) { +static REG8 MEMCALL grcg_tcr1(UINT32 address) { // VRAM const BYTE *vram; REG8 ret; @@ -278,13 +287,18 @@ const BYTE *vram; return(ret ^ 0xff); } -static REG8 MEMCALL egc_rd(UINT32 address) { +static REG8 MEMCALL egc_rd(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_GRCG; return(egc_read(address)); } -static REG8 MEMCALL i286_rb(UINT32 address) { +static REG8 MEMCALL emmc_rd(UINT32 address) { // EMS + + return(CPU_EMSPTR[(address >> 14) & 3][LOW14(address)]); +} + +static REG8 MEMCALL i286_rb(UINT32 address) { // F800-FFFF if (CPU_ITFBANK) { address += VRAM_STEP; @@ -441,25 +455,51 @@ static void MEMCALL grcgw_tdw1(UINT32 ad static void MEMCALL egcw_wt(UINT32 address, REG16 value) { CPU_REMCLOCK -= MEMWAIT_GRCG; - if (!(address & 1)) { - egc_write_w(address, value); + egc_write_w(address, value); +} + +static void MEMCALL emmcw_wt(UINT32 address, REG16 value) { + + BYTE *ptr; + + if ((address & 0x3fff) != 0x3fff) { + ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address); + STOREINTELWORD(ptr, value); } else { - if (!(egc.sft & 0x1000)) { - egc_write(address, (REG8)value); - egc_write(address + 1, (REG8)(value >> 8)); + CPU_EMSPTR[(address >> 14) & 3][0x3fff] = (BYTE)value; + CPU_EMSPTR[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8); + } +} + +static void MEMCALL i286w_wd(UINT32 address, REG16 value) { + + BYTE *ptr; + UINT16 bit; + + ptr = mem + address; + bit = 1 << ((address >> 12) & 15); + if ((address + 1) & 0xfff) { + if (CPU_RAM_D000 & bit) { + STOREINTELWORD(ptr, value); } - else { - egc_write(address + 1, (REG8)(value >> 8)); - egc_write(address, (REG8)value); + } + else { + if (CPU_RAM_D000 & bit) { + ptr[0] = (UINT8)value; + } + if (CPU_RAM_D000 & (bit << 1)) { + ptr[1] = (UINT8)(value >> 8); } } } static void MEMCALL i286w_wb(UINT32 address, REG16 value) { - mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; - mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8); + BYTE *ptr; + + ptr = mem + (address + 0x1c8000 - 0xe8000); + STOREINTELWORD(ptr, value); } static void MEMCALL i286w_wn(UINT32 address, REG16 value) { @@ -568,23 +608,23 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a static REG16 MEMCALL egcw_rd(UINT32 address) { + CPU_REMCLOCK -= MEMWAIT_GRCG; + return(egc_read_w(address)); +} + +static REG16 MEMCALL emmcw_rd(UINT32 address) { + +const BYTE *ptr; REG16 ret; - CPU_REMCLOCK -= MEMWAIT_GRCG; - if (!(address & 1)) { - return(egc_read_w(address)); + if ((address & 0x3fff) != 0x3fff) { + ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address); + return(LOADINTELWORD(ptr)); } else { - if (!(egc.sft & 0x1000)) { - ret = egc_read(address); - ret += egc_read(address + 1) << 8; - return(ret); - } - else { - ret = egc_read(address + 1) << 8; - ret += egc_read(address); - return(ret); - } + ret = CPU_EMSPTR[(address >> 14) & 3][0x3fff]; + ret += CPU_EMSPTR[((address + 1) >> 14) & 3][0] << 8; + return(ret); } } @@ -612,14 +652,12 @@ typedef struct { } MEMFN; typedef struct { - MEM8READ brd8; - MEM8READ ird8; - MEM8WRITE ewr8; - MEM8WRITE bwr8; - MEM16READ brd16; - MEM16READ ird16; - MEM16WRITE ewr16; - MEM16WRITE bwr16; + MEM8READ brd8; // E8000-F7FFF byte read + MEM8READ ird8; // F8000-FFFFF byte read + MEM8WRITE bwr8; // E8000-FFFFF byte write + MEM16READ brd16; // E8000-F7FFF word read + MEM16READ ird16; // F8000-FFFFF word read + MEM16WRITE bwr16; // F8000-FFFFF word write } MMAPTBL; typedef struct { @@ -636,7 +674,7 @@ static MEMFN memfn = { i286_rd, i286_rd, i286_rd, i286_rd, // 60 i286_rd, i286_rd, i286_rd, i286_rd, // 80 tram_rd, vram_r0, vram_r0, vram_r0, // a0 - i286_rd, i286_rd, i286_rd, i286_rd, // c0 + emmc_rd, emmc_rd, i286_rd, i286_rd, // c0 vram_r0, i286_rd, i286_rd, i286_rb}, // e0 {i286_wt, i286_wt, i286_wt, i286_wt, // 00 @@ -645,7 +683,7 @@ static MEMFN memfn = { i286_wt, i286_wt, i286_wt, i286_wt, // 60 i286_wt, i286_wt, i286_wt, i286_wt, // 80 tram_wt, vram_w0, vram_w0, vram_w0, // a0 - i286_wn, i286_wn, i286_wn, i286_wn, // c0 + emmc_wt, emmc_wt, i286_wd, i286_wd, // c0 vram_w0, i286_wn, i286_wn, i286_wn}, // e0 {i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 00 @@ -654,7 +692,7 @@ static MEMFN memfn = { i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 60 i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 80 tramw_rd, vramw_r0, vramw_r0, vramw_r0, // a0 - i286w_rd, i286w_rd, i286w_rd, i286w_rd, // c0 + emmcw_rd, emmcw_rd, i286w_rd, i286w_rd, // c0 vramw_r0, i286w_rd, i286w_rd, i286w_rb}, // e0 {i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 00 @@ -663,14 +701,14 @@ static MEMFN memfn = { i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 60 i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 80 tramw_wt, vramw_w0, vramw_w0, vramw_w0, // a0 - i286w_wn, i286w_wn, i286w_wn, i286w_wn, // c0 + emmcw_wt, emmcw_wt, i286w_wd, i286w_wd, // c0 vramw_w0, i286w_wn, i286w_wn, i286w_wn}}; // e0 static const MMAPTBL mmaptbl[2] = { - {i286_rd, i286_rb, i286_wn, i286_wn, - i286w_rd, i286w_rb, i286w_wn, i286w_wn}, - {i286_rb, i286_rb, i286_wt, i286_wb, - i286w_rb, i286w_rb, i286w_wt, i286w_wb}}; + {i286_rd, i286_rb, i286_wn, + i286w_rd, i286w_rb, i286w_wn}, + {i286_rb, i286_rb, i286_wb, + i286w_rb, i286w_rb, i286w_wb}}; static const VACCTBL vacctbl[0x10] = { {vram_r0, vram_w0, vramw_r0, vramw_w0}, // 00 @@ -713,9 +751,6 @@ const MMAPTBL *mm; memfn.rd8[0xe8000 >> 15] = mm->brd8; memfn.rd8[0xf0000 >> 15] = mm->brd8; memfn.rd8[0xf8000 >> 15] = mm->ird8; - - memfn.wr8[0xd0000 >> 15] = mm->ewr8; - memfn.wr8[0xd8000 >> 15] = mm->ewr8; memfn.wr8[0xe8000 >> 15] = mm->bwr8; memfn.wr8[0xf0000 >> 15] = mm->bwr8; memfn.wr8[0xf8000 >> 15] = mm->bwr8; @@ -723,9 +758,6 @@ const MMAPTBL *mm; memfn.rd16[0xe8000 >> 15] = mm->brd16; memfn.rd16[0xf0000 >> 15] = mm->brd16; memfn.rd16[0xf8000 >> 15] = mm->ird16; - - memfn.wr16[0xd0000 >> 15] = mm->ewr16; - memfn.wr16[0xd8000 >> 15] = mm->ewr16; memfn.wr16[0xe8000 >> 15] = mm->bwr16; memfn.wr16[0xf0000 >> 15] = mm->bwr16; memfn.wr16[0xf8000 >> 15] = mm->bwr16; @@ -735,10 +767,10 @@ void MEMCALL i286_vram_dispatch(UINT fun const VACCTBL *vacc; - vacc = vacctbl + (func & 0x0f); #if defined(SUPPORT_PC9821) if (!(func & 0x20)) { #endif + vacc = vacctbl + (func & 0x0f); memfn.rd8[0xa8000 >> 15] = vacc->rd8; memfn.rd8[0xb0000 >> 15] = vacc->rd8; memfn.rd8[0xb8000 >> 15] = vacc->rd8; @@ -770,22 +802,22 @@ const VACCTBL *vacc; else { memfn.rd8[0xa8000 >> 15] = mem9821_b0r; memfn.rd8[0xb0000 >> 15] = mem9821_b0r; - memfn.rd8[0xb8000 >> 15] = vacc->rd8; + memfn.rd8[0xb8000 >> 15] = i286_nonram_r; memfn.rd8[0xe0000 >> 15] = mem9821_b2r; memfn.wr8[0xa8000 >> 15] = mem9821_b0w; memfn.wr8[0xb0000 >> 15] = mem9821_b0w; - memfn.wr8[0xb8000 >> 15] = vacc->wr8; + memfn.wr8[0xb8000 >> 15] = i286_wn; memfn.wr8[0xe0000 >> 15] = mem9821_b2w; memfn.rd16[0xa8000 >> 15] = mem9821_b0rw; memfn.rd16[0xb0000 >> 15] = mem9821_b0rw; - memfn.rd16[0xb8000 >> 15] = vacc->rd16; + memfn.rd16[0xb8000 >> 15] = i286_nonram_rw; memfn.rd16[0xe0000 >> 15] = mem9821_b2rw; memfn.wr16[0xa8000 >> 15] = mem9821_b0ww; memfn.wr16[0xb0000 >> 15] = mem9821_b0ww; - memfn.wr16[0xb8000 >> 15] = vacc->wr16; + memfn.wr16[0xb8000 >> 15] = i286w_wn; memfn.wr16[0xe0000 >> 15] = mem9821_b2ww; } #endif @@ -796,12 +828,11 @@ REG8 MEMCALL i286_memoryread(UINT32 addr UINT32 pos; - addr &= CPU_ADRSMASK; if (addr < I286_MEMREADMAX) { return(mem[addr]); } else if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if (pos < CPU_EXTMEMSIZE) { return(CPU_EXTMEM[pos]); } @@ -809,11 +840,15 @@ REG8 MEMCALL i286_memoryread(UINT32 addr return(memfn.rd8[(addr >> 15) & 0x1f](addr - 0x00f00000)); } #if defined(SUPPORT_PC9821) - else if (addr >= 0xfff00000) { + else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) { + return(mem9821_r(addr)); + } + else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) { return(mem9821_r(addr)); } #endif else { +// TRACEOUT(("out of mem (read8): %x", addr)); return(0xff); } } @@ -827,13 +862,12 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a UINT32 pos; REG16 ret; - addr &= CPU_ADRSMASK; if (addr < (I286_MEMREADMAX - 1)) { return(LOADINTELWORD(mem + addr)); } else if ((addr + 1) & 0x7fff) { // non 32kb boundary if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if (pos < CPU_EXTMEMSIZE) { return(LOADINTELWORD(CPU_EXTMEM + pos)); } @@ -841,11 +875,15 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a return(memfn.rd16[(addr >> 15) & 0x1f](addr - 0x00f00000)); } #if defined(SUPPORT_PC9821) - else if (addr >= 0xfff00000) { + else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) { + return(mem9821_rw(addr)); + } + else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) { return(mem9821_rw(addr)); } #endif else { +// TRACEOUT(("out of mem (read16): %x", addr)); return(0xffff); } } @@ -863,12 +901,11 @@ UINT32 MEMCALL i286_memoryread_d(UINT32 UINT32 pos; UINT32 ret; - addr &= CPU_ADRSMASK; if (addr < (I286_MEMREADMAX - 3)) { return(LOADINTELDWORD(mem + addr)); } else if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if ((pos + 3) < CPU_EXTMEMSIZE) { return(LOADINTELDWORD(CPU_EXTMEM + pos)); } @@ -889,12 +926,11 @@ void MEMCALL i286_memorywrite(UINT32 add UINT32 pos; - addr &= CPU_ADRSMASK; if (addr < I286_MEMWRITEMAX) { mem[addr] = (BYTE)value; } else if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if (pos < CPU_EXTMEMSIZE) { CPU_EXTMEM[pos] = (BYTE)value; } @@ -902,12 +938,15 @@ void MEMCALL i286_memorywrite(UINT32 add memfn.wr8[(addr >> 15) & 0x1f](addr - 0x00f00000, value); } #if defined(SUPPORT_PC9821) - else if (addr >= 0xfff00000) { + else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) { + mem9821_w(addr, value); + } + else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) { mem9821_w(addr, value); } #endif else { - TRACEOUT(("mem_w %x %x", addr, value)); +// TRACEOUT(("out of mem (write8): %x", addr)); } } else { @@ -919,13 +958,12 @@ void MEMCALL i286_memorywrite_w(UINT32 a UINT32 pos; - addr &= CPU_ADRSMASK; if (addr < (I286_MEMWRITEMAX - 1)) { STOREINTELWORD(mem + addr, value); } else if ((addr + 1) & 0x7fff) { // non 32kb boundary if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if (pos < CPU_EXTMEMSIZE) { STOREINTELWORD(CPU_EXTMEM + pos, value); } @@ -933,10 +971,16 @@ void MEMCALL i286_memorywrite_w(UINT32 a memfn.wr16[(addr >> 15) & 0x1f](addr - 0x00f00000, value); } #if defined(SUPPORT_PC9821) - else if (addr >= 0xfff00000) { + else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) { + mem9821_ww(addr, value); + } + else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) { mem9821_ww(addr, value); } #endif + else { +// TRACEOUT(("out of mem (write16): %x", addr)); + } } else { memfn.wr16[(addr >> 15) & 0x1f](addr, value); @@ -952,13 +996,12 @@ void MEMCALL i286_memorywrite_d(UINT32 a UINT32 pos; - addr &= CPU_ADRSMASK; if (addr < (I286_MEMWRITEMAX - 3)) { STOREINTELDWORD(mem + addr, value); return; } else if (addr >= USE_HIMEM) { - pos = addr - 0x100000; + pos = (addr & CPU_ADRSMASK) - 0x100000; if ((pos + 3) < CPU_EXTMEMSIZE) { STOREINTELDWORD(CPU_EXTMEM + pos, value); return; @@ -975,7 +1018,7 @@ void MEMCALL i286_memorywrite_d(UINT32 a } } -#ifdef NP2_MEMORY_ASM +#if 0 REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) { UINT32 address; @@ -1027,121 +1070,241 @@ void MEMCALL i286_memword_write(UINT seg i286_memorywrite_w(address, value); } } -#endif /* NP2_MEMORY_ASM */ +#endif -void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) { +void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) { - BYTE *out; - UINT32 adrs; - UINT size; + BYTE *out = (BYTE *)dat; + UINT pos; + UINT diff; - out = (BYTE *)dat; - adrs = seg << 4; - off = LOW16(off); - if ((I286_MEMREADMAX >= 0x10000) && - (adrs < (I286_MEMREADMAX - 0x10000))) { - if (leng) { - size = 0x10000 - off; - if (size >= leng) { - CopyMemory(out, mem + adrs + off, leng); - return; - } - CopyMemory(out, mem + adrs + off, size); - out += size; - leng -= size; - } - while(leng >= 0x10000) { - CopyMemory(out, mem + adrs, 0x10000); - out += 0x10000; - leng -= 0x10000; + /* fast memory access */ + if (address + leng < I286_MEMREADMAX) { + CopyMemory(dat, mem + address, leng); + return; + } else if (address >= USE_HIMEM) { + pos = (address & CPU_ADRSMASK) - 0x100000; + if (pos + leng < CPU_EXTMEMSIZE) { + CopyMemory(dat, CPU_EXTMEM + pos, leng); + return; } - if (leng) { - CopyMemory(out, mem + adrs, leng); + if (pos < CPU_EXTMEMSIZE) { + diff = CPU_EXTMEMSIZE - pos; + CopyMemory(out, CPU_EXTMEM + pos, diff); + out += diff; + leng -= diff; + address += diff; } } - else { - while(leng--) { - *out++ = i286_memoryread(adrs + off); - off = LOW16(off + 1); - } + + /* slow memory access */ + while (leng-- > 0) { + *out++ = i286_memoryread(address++); } } -void MEMCALL i286_memstr_write(UINT seg, UINT off, const void *dat, UINT leng) { +void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) { - BYTE *out; - UINT32 adrs; - UINT size; + const BYTE *out = (BYTE *)dat; + UINT pos; + UINT diff; - out = (BYTE *)dat; - adrs = seg << 4; - off = LOW16(off); - if ((I286_MEMWRITEMAX >= 0x10000) && - (adrs < (I286_MEMWRITEMAX - 0x10000))) { - if (leng) { - size = 0x10000 - off; - if (size >= leng) { - CopyMemory(mem + adrs + off, out, leng); - return; - } - CopyMemory(mem + adrs + off, out, size); - out += size; - leng -= size; - } - while(leng >= 0x10000) { - CopyMemory(mem + adrs, out, 0x10000); - out += 0x10000; - leng -= 0x10000; + /* fast memory access */ + if (address + leng < I286_MEMREADMAX) { + CopyMemory(mem + address, dat, leng); + return; + } else if (address >= USE_HIMEM) { + pos = (address & CPU_ADRSMASK) - 0x100000; + if (pos + leng < CPU_EXTMEMSIZE) { + CopyMemory(CPU_EXTMEM + pos, dat, leng); + return; } - if (leng) { - CopyMemory(mem + adrs, out, leng); + if (pos < CPU_EXTMEMSIZE) { + diff = CPU_EXTMEMSIZE - pos; + CopyMemory(CPU_EXTMEM + pos, dat, diff); + out += diff; + leng -= diff; + address += diff; } } + + /* slow memory access */ + while (leng-- > 0) { + i286_memorywrite(address++, *out++); + } +} + + +// ---- Logical Space (BIOS) + +static UINT32 physicaladdr(UINT32 addr, BOOL wr) { + + UINT32 a; + UINT32 pde; + UINT32 pte; + + a = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc); + pde = i286_memoryread_d(a); + if (!(pde & CPU_PDE_PRESENT)) { + goto retdummy; + } + if (!(pde & CPU_PDE_ACCESS)) { + i286_memorywrite(a, (UINT8)(pde | CPU_PDE_ACCESS)); + } + a = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc); + pte = cpu_memoryread_d(a); + if (!(pte & CPU_PTE_PRESENT)) { + goto retdummy; + } + if (!(pte & CPU_PTE_ACCESS)) { + i286_memorywrite(a, (UINT8)(pte | CPU_PTE_ACCESS)); + } + if ((wr) && (!(pte & CPU_PTE_DIRTY))) { + i286_memorywrite(a, (UINT8)(pte | CPU_PTE_DIRTY)); + } + addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff); + return(addr); + +retdummy: + return(0x01000000); // てきとーにメモリが存在しない場所 +} + + +REG8 MEMCALL meml_read8(UINT seg, UINT off) { + + UINT32 addr; + + addr = (seg << 4) + LOW16(off); + if (CPU_STAT_PAGING) { + addr = physicaladdr(addr, FALSE); + } + return(i286_memoryread(addr)); +} + +REG16 MEMCALL meml_read16(UINT seg, UINT off) { + + UINT32 addr; + + addr = (seg << 4) + LOW16(off); + if (!CPU_STAT_PAGING) { + return(i286_memoryread_w(addr)); + } + else if ((addr + 1) & 0xfff) { + return(i286_memoryread_w(physicaladdr(addr, FALSE))); + } + return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8)); +} + +void MEMCALL meml_write8(UINT seg, UINT off, REG8 dat) { + + UINT32 addr; + + addr = (seg << 4) + LOW16(off); + if (CPU_STAT_PAGING) { + addr = physicaladdr(addr, TRUE); + } + i286_memorywrite(addr, dat); +} + +void MEMCALL meml_write16(UINT seg, UINT off, REG16 dat) { + + UINT32 addr; + + addr = (seg << 4) + LOW16(off); + if (!CPU_STAT_PAGING) { + i286_memorywrite_w(addr, dat); + } + else if ((addr + 1) & 0xfff) { + i286_memorywrite_w(physicaladdr(addr, TRUE), dat); + } else { - while(leng--) { - i286_memorywrite(adrs + off, *out++); - off = LOW16(off + 1); - } + meml_write8(seg, off, (REG8)dat); + meml_write8(seg, off + 1, (REG8)(dat >> 8)); } } -void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) { +void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) { - if ((address + leng) < I286_MEMREADMAX) { - CopyMemory(dat, mem + address, leng); + UINT32 addr; + UINT rem; + UINT size; + + while(leng) { + off = LOW16(off); + addr = (seg << 4) + off; + rem = 0x10000 - off; + size = min(leng, rem); + if (CPU_STAT_PAGING) { + rem = 0x1000 - (addr & 0xfff); + size = min(size, rem); + addr = physicaladdr(addr, FALSE); + } + memp_read(addr, dat, size); + off += size; + dat = ((BYTE *)dat) + size; + leng -= size; + } +} + +void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) { + + UINT32 addr; + UINT rem; + UINT size; + + while(leng) { + off = LOW16(off); + addr = (seg << 4) + off; + rem = 0x10000 - off; + size = min(leng, rem); + if (CPU_STAT_PAGING) { + rem = 0x1000 - (addr & 0xfff); + size = min(size, rem); + addr = physicaladdr(addr, TRUE); + } + memp_write(addr, dat, size); + off += size; + dat = ((BYTE *)dat) + size; + leng -= size; + } +} + +void MEMCALL meml_read(UINT32 address, void *dat, UINT leng) { + + UINT size; + + if (!CPU_STAT_PAGING) { + memp_read(address, dat, leng); } else { - BYTE *out = (BYTE *)dat; - if (address < I286_MEMREADMAX) { - CopyMemory(out, mem + address, I286_MEMREADMAX - address); - out += I286_MEMREADMAX - address; - leng -= I286_MEMREADMAX - address; - address = I286_MEMREADMAX; - } - while(leng--) { - *out++ = i286_memoryread(address++); + while(leng) { + size = 0x1000 - (address & 0xfff); + size = min(size, leng); + memp_read(physicaladdr(address, FALSE), dat, size); + address += size; + dat = ((BYTE *)dat) + size; + leng -= size; } } } -void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng) { +void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) { -const BYTE *out; + UINT size; - if ((address + leng) < I286_MEMWRITEMAX) { - CopyMemory(mem + address, dat, leng); + if (!CPU_STAT_PAGING) { + memp_write(address, dat, leng); } else { - out = (BYTE *)dat; - if (address < I286_MEMWRITEMAX) { - CopyMemory(mem + address, out, I286_MEMWRITEMAX - address); - out += I286_MEMWRITEMAX - address; - leng -= I286_MEMWRITEMAX - address; - address = I286_MEMWRITEMAX; - } - while(leng--) { - i286_memorywrite(address++, *out++); + while(leng) { + size = 0x1000 - (address & 0xfff); + size = min(size, leng); + memp_write(physicaladdr(address, TRUE), dat, size); + address += size; + dat = ((BYTE *)dat) + size; + leng -= size; } } } #endif +