--- np2/i386c/memory.c 2004/01/05 15:47:18 1.7 +++ np2/i386c/memory.c 2004/03/04 15:20:13 1.13 @@ -5,6 +5,7 @@ #include "cpucore.h" #include "memory.h" #include "egcmem.h" +#include "mem9821.h" #include "pccore.h" #include "iocore.h" #include "vram.h" @@ -14,7 +15,7 @@ BYTE mem[0x200000]; -#define USE_HIMEM 0x10fff0 +#define USE_HIMEM 0x110000 // ---- write byte @@ -183,11 +184,6 @@ static void MEMCALL egc_wt(UINT32 addres egc_write(address, value); } -static void MEMCALL emmc_wt(UINT32 address, REG8 value) { - - extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value; -} - static void MEMCALL i286_wb(UINT32 address, REG8 value) { mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; @@ -288,11 +284,6 @@ static REG8 MEMCALL egc_rd(UINT32 addres return(egc_read(address)); } -static REG8 MEMCALL emmc_rd(UINT32 address) { - - return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]); -} - static REG8 MEMCALL i286_rb(UINT32 address) { if (CPU_ITFBANK) { @@ -465,20 +456,6 @@ static void MEMCALL egcw_wt(UINT32 addre } } -static void MEMCALL emmcw_wt(UINT32 address, REG16 value) { - - BYTE *ptr; - - if ((address & 0x3fff) != 0x3fff) { - ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address); - STOREINTELWORD(ptr, value); - } - else { - extmem.pageptr[(address >> 14) & 3][0x3fff] = (BYTE)value; - extmem.pageptr[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8); - } -} - static void MEMCALL i286w_wb(UINT32 address, REG16 value) { mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; @@ -611,22 +588,6 @@ static REG16 MEMCALL egcw_rd(UINT32 addr } } -static REG16 MEMCALL emmcw_rd(UINT32 address) { - -const BYTE *ptr; - REG16 ret; - - if ((address & 0x3fff) != 0x3fff) { - ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address); - return(LOADINTELWORD(ptr)); - } - else { - ret = extmem.pageptr[(address >> 14) & 3][0x3fff]; - ret += extmem.pageptr[((address + 1) >> 14) & 3][0] << 8; - return(ret); - } -} - static REG16 MEMCALL i286w_rb(UINT32 address) { if (CPU_ITFBANK) { @@ -675,8 +636,8 @@ 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 - emmc_rd, emmc_rd, i286_rd, i286_rd, // c0 - vram_r0, i286_rd, i286_rd, i286_rb}, // f0 + i286_rd, i286_rd, i286_rd, i286_rd, // c0 + vram_r0, i286_rd, i286_rd, i286_rb}, // e0 {i286_wt, i286_wt, i286_wt, i286_wt, // 00 i286_wt, i286_wt, i286_wt, i286_wt, // 20 @@ -684,7 +645,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 - emmc_wt, emmc_wt, i286_wn, i286_wn, // c0 + i286_wn, i286_wn, i286_wn, i286_wn, // c0 vram_w0, i286_wn, i286_wn, i286_wn}, // e0 {i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 00 @@ -693,7 +654,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 - emmcw_rd, emmcw_rd, i286w_rd, i286w_rd, // c0 + i286w_rd, i286w_rd, i286w_rd, i286w_rd, // c0 vramw_r0, i286w_rd, i286w_rd, i286w_rb}, // e0 {i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 00 @@ -702,7 +663,7 @@ 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 - emmcw_wt, emmcw_wt, i286w_wn, i286w_wn, // c0 + i286w_wn, i286w_wn, i286w_wn, i286w_wn, // c0 vramw_w0, i286w_wn, i286w_wn, i286w_wn}}; // e0 static const MMAPTBL mmaptbl[2] = { @@ -775,162 +736,246 @@ void MEMCALL i286_vram_dispatch(UINT fun const VACCTBL *vacc; vacc = vacctbl + (func & 0x0f); - - memfn.rd8[0xa8000 >> 15] = vacc->rd8; - memfn.rd8[0xb0000 >> 15] = vacc->rd8; - memfn.rd8[0xb8000 >> 15] = vacc->rd8; - memfn.rd8[0xe0000 >> 15] = vacc->rd8; - - memfn.wr8[0xa8000 >> 15] = vacc->wr8; - memfn.wr8[0xb0000 >> 15] = vacc->wr8; - memfn.wr8[0xb8000 >> 15] = vacc->wr8; - memfn.wr8[0xe0000 >> 15] = vacc->wr8; - - memfn.rd16[0xa8000 >> 15] = vacc->rd16; - memfn.rd16[0xb0000 >> 15] = vacc->rd16; - memfn.rd16[0xb8000 >> 15] = vacc->rd16; - memfn.rd16[0xe0000 >> 15] = vacc->rd16; - - memfn.wr16[0xa8000 >> 15] = vacc->wr16; - memfn.wr16[0xb0000 >> 15] = vacc->wr16; - memfn.wr16[0xb8000 >> 15] = vacc->wr16; - memfn.wr16[0xe0000 >> 15] = vacc->wr16; - - if (!(func & 0x10)) { // degital - memfn.wr8[0xe0000 >> 15] = i286_wn; - memfn.wr16[0xe0000 >> 15] = i286w_wn; - memfn.rd8[0xe0000 >> 15] = i286_nonram_r; - memfn.rd16[0xe0000 >> 15] = i286_nonram_rw; +#if defined(SUPPORT_PC9821) + if (!(func & 0x20)) { +#endif + memfn.rd8[0xa8000 >> 15] = vacc->rd8; + memfn.rd8[0xb0000 >> 15] = vacc->rd8; + memfn.rd8[0xb8000 >> 15] = vacc->rd8; + memfn.rd8[0xe0000 >> 15] = vacc->rd8; + + memfn.wr8[0xa8000 >> 15] = vacc->wr8; + memfn.wr8[0xb0000 >> 15] = vacc->wr8; + memfn.wr8[0xb8000 >> 15] = vacc->wr8; + memfn.wr8[0xe0000 >> 15] = vacc->wr8; + + memfn.rd16[0xa8000 >> 15] = vacc->rd16; + memfn.rd16[0xb0000 >> 15] = vacc->rd16; + memfn.rd16[0xb8000 >> 15] = vacc->rd16; + memfn.rd16[0xe0000 >> 15] = vacc->rd16; + + memfn.wr16[0xa8000 >> 15] = vacc->wr16; + memfn.wr16[0xb0000 >> 15] = vacc->wr16; + memfn.wr16[0xb8000 >> 15] = vacc->wr16; + memfn.wr16[0xe0000 >> 15] = vacc->wr16; + + if (!(func & 0x10)) { // digital + memfn.wr8[0xe0000 >> 15] = i286_wn; + memfn.wr16[0xe0000 >> 15] = i286w_wn; + memfn.rd8[0xe0000 >> 15] = i286_nonram_r; + memfn.rd16[0xe0000 >> 15] = i286_nonram_rw; + } +#if defined(SUPPORT_PC9821) } + else { + memfn.rd8[0xa8000 >> 15] = mem9821_b0r; + memfn.rd8[0xb0000 >> 15] = mem9821_b0r; + memfn.rd8[0xb8000 >> 15] = vacc->rd8; + 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[0xe0000 >> 15] = mem9821_b2w; + + memfn.rd16[0xa8000 >> 15] = mem9821_b0rw; + memfn.rd16[0xb0000 >> 15] = mem9821_b0rw; + memfn.rd16[0xb8000 >> 15] = vacc->rd16; + 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[0xe0000 >> 15] = mem9821_b2ww; + } +#endif } -REG8 MEMCALL __i286_memoryread(UINT32 address) { +REG8 MEMCALL i286_memoryread(UINT32 addr) { - if (address < I286_MEMREADMAX) { - return(mem[address]); + UINT32 pos; + + addr &= CPU_ADRSMASK; + if (addr < I286_MEMREADMAX) { + return(mem[addr]); } -#if defined(USE_HIMEM) - else if (address >= USE_HIMEM) { - address -= 0x100000; - if (address < CPU_EXTMEMSIZE) { - return(CPU_EXTMEM[address]); + else if (addr >= USE_HIMEM) { + pos = addr - 0x100000; + if (pos < CPU_EXTMEMSIZE) { + return(CPU_EXTMEM[pos]); + } + else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) { + return(memfn.rd8[(addr >> 15) & 0x1f](addr - 0x00f00000)); } +#if defined(SUPPORT_PC9821) + else if (addr >= 0xfff00000) { + return(mem9821_r(addr)); + } +#endif else { return(0xff); } } -#endif else { - return(memfn.rd8[(address >> 15) & 0x1f](address)); + return(memfn.rd8[(addr >> 15) & 0x1f](addr)); } } -REG16 MEMCALL __i286_memoryread_w(UINT32 address) { +REG16 MEMCALL i286_memoryread_w(UINT32 addr) { + UINT32 pos; REG16 ret; - if (address < (I286_MEMREADMAX - 1)) { - return(LOADINTELWORD(mem + address)); - } -#if defined(USE_HIMEM) - else if (address >= (USE_HIMEM - 1)) { - address -= 0x100000; - if (address == (USE_HIMEM - 0x100000 - 1)) { - ret = mem[0x100000 + address]; - } - else if (address < CPU_EXTMEMSIZE) { - ret = CPU_EXTMEM[address]; - } - else { - ret = 0xff; - } - address++; - if (address < CPU_EXTMEMSIZE) { - ret += CPU_EXTMEM[address] << 8; - } - else { - ret += 0xff00; - } - return(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; + if (pos < CPU_EXTMEMSIZE) { + return(LOADINTELWORD(CPU_EXTMEM + pos)); + } + else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) { + return(memfn.rd16[(addr >> 15) & 0x1f](addr - 0x00f00000)); + } +#if defined(SUPPORT_PC9821) + else if (addr >= 0xfff00000) { + return(mem9821_rw(addr)); + } #endif - else if ((address & 0x7fff) != 0x7fff) { - return(memfn.rd16[(address >> 15) & 0x1f](address)); + else { + return(0xffff); + } + } + return(memfn.rd16[(addr >> 15) & 0x1f](addr)); } else { - ret = memfn.rd8[(address >> 15) & 0x1f](address); - address++; - ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8; + ret = i286_memoryread(addr); + ret += (REG16)(i286_memoryread(addr + 1) << 8); return(ret); } } -UINT32 MEMCALL __i286_memoryread_d(UINT32 address) { - - UINT32 ret; +UINT32 MEMCALL i286_memoryread_d(UINT32 addr) { - ret = __i286_memoryread_w(address); - ret |= (UINT32)__i286_memoryread_w(address + 2) << 16; + UINT32 pos; + UINT32 ret; - return ret; -} - -void MEMCALL __i286_memorywrite(UINT32 address, REG8 value) { - - if (address < I286_MEMWRITEMAX) { - mem[address] = (BYTE)value; + addr &= CPU_ADRSMASK; + if (addr < (I286_MEMREADMAX - 3)) { + return(LOADINTELDWORD(mem + addr)); } -#if defined(USE_HIMEM) - else if (address >= USE_HIMEM) { - address -= 0x100000; - if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)value; + else if (addr >= USE_HIMEM) { + pos = addr - 0x100000; + if ((pos + 3) < CPU_EXTMEMSIZE) { + return(LOADINTELDWORD(CPU_EXTMEM + pos)); } } -#endif + if (!(addr & 1)) { + ret = i286_memoryread_w(addr); + ret += (UINT32)i286_memoryread_w(addr + 2) << 16; + } else { - memfn.wr8[(address >> 15) & 0x1f](address, value); + ret = i286_memoryread(addr); + ret += (UINT32)i286_memoryread_w(addr + 1) << 8; + ret += (UINT32)i286_memoryread(addr + 3) << 24; } + return(ret); } -void MEMCALL __i286_memorywrite_w(UINT32 address, REG16 value) { +void MEMCALL i286_memorywrite(UINT32 addr, REG8 value) { - if (address < (I286_MEMWRITEMAX - 1)) { - STOREINTELWORD(mem + address, value); + UINT32 pos; + + addr &= CPU_ADRSMASK; + if (addr < I286_MEMWRITEMAX) { + mem[addr] = (BYTE)value; } -#if defined(USE_HIMEM) - else if (address >= (USE_HIMEM - 1)) { - address -= 0x100000; - if (address == (USE_HIMEM - 0x100000 - 1)) { - mem[address] = (BYTE)value; + else if (addr >= USE_HIMEM) { + pos = addr - 0x100000; + if (pos < CPU_EXTMEMSIZE) { + CPU_EXTMEM[pos] = (BYTE)value; } - else if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)value; + else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) { + memfn.wr8[(addr >> 15) & 0x1f](addr - 0x00f00000, value); } - address++; - if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)(value >> 8); +#if defined(SUPPORT_PC9821) + else if (addr >= 0xfff00000) { + mem9821_w(addr, value); + } +#endif + else { + TRACEOUT(("mem_w %x %x", addr, value)); } } + else { + memfn.wr8[(addr >> 15) & 0x1f](addr, value); + } +} + +void MEMCALL i286_memorywrite_w(UINT32 addr, REG16 value) { + + 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; + if (pos < CPU_EXTMEMSIZE) { + STOREINTELWORD(CPU_EXTMEM + pos, value); + } + else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) { + memfn.wr16[(addr >> 15) & 0x1f](addr - 0x00f00000, value); + } +#if defined(SUPPORT_PC9821) + else if (addr >= 0xfff00000) { + mem9821_ww(addr, value); + } #endif - else if ((address & 0x7fff) != 0x7fff) { - memfn.wr16[(address >> 15) & 0x1f](address, value); + } + else { + memfn.wr16[(addr >> 15) & 0x1f](addr, value); + } } else { - memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)value); - address++; - memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)(value >> 8)); + i286_memorywrite(addr, (UINT8)value); + i286_memorywrite(addr + 1, (UINT8)(value >> 8)); } } -void MEMCALL __i286_memorywrite_d(UINT32 address, UINT32 value) { +void MEMCALL i286_memorywrite_d(UINT32 addr, UINT32 value) { - __i286_memorywrite_w(address, value & 0xffff); - __i286_memorywrite_w(address + 2, (WORD)(value >> 16)); + UINT32 pos; + + addr &= CPU_ADRSMASK; + if (addr < (I286_MEMWRITEMAX - 3)) { + STOREINTELDWORD(mem + addr, value); + return; + } + else if (addr >= USE_HIMEM) { + pos = addr - 0x100000; + if ((pos + 3) < CPU_EXTMEMSIZE) { + STOREINTELDWORD(CPU_EXTMEM + pos, value); + return; + } + } + if (!(addr & 1)) { + i286_memorywrite_w(addr, (UINT16)value); + i286_memorywrite_w(addr + 2, (UINT16)(value >> 16)); + } + else { + i286_memorywrite(addr, (UINT8)value); + i286_memorywrite_w(addr + 1, (UINT16)(value >> 8)); + i286_memorywrite(addr + 3, (UINT8)(value >> 24)); + } } -#if 0 +#ifdef NP2_MEMORY_ASM REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) { UINT32 address; @@ -982,84 +1027,7 @@ void MEMCALL i286_memword_write(UINT seg i286_memorywrite_w(address, value); } } -#endif - -void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) { - - BYTE *out; - UINT32 adrs; - UINT size; - - 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; - } - if (leng) { - CopyMemory(out, mem + adrs, leng); - } - } - else { - while(leng--) { - *out++ = i286_memoryread(adrs + off); - off = LOW16(off + 1); - } - } -} - -void MEMCALL i286_memstr_write(UINT seg, UINT off, - const void *dat, UINT leng) { - - BYTE *out; - UINT32 adrs; - UINT size; - - 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; - } - if (leng) { - CopyMemory(mem + adrs, out, leng); - } - } - else { - while(leng--) { - i286_memorywrite(adrs + off, *out++); - off = LOW16(off + 1); - } - } -} +#endif /* NP2_MEMORY_ASM */ void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) { @@ -1100,6 +1068,84 @@ const BYTE *out; } } } +#endif + + +// ---- + +static UINT32 realaddr(UINT32 addr) { + + UINT32 pde; + UINT32 pte; + + if (CPU_STAT_PAGING) { + pde = i286_memoryread_d(CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc)); + if (!(pde & CPU_PDE_PRESENT)) { + goto retdummy; + } + // ページサイズ 4KB固定(ぉ + pte = cpu_memoryread_d((pde & CPU_PDE_BASEADDR_MASK) + + ((addr >> 10) & 0xffc)); + if (!(pte & CPU_PTE_PRESENT)) { + goto retdummy; + } + addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff); + } + return(addr); + +retdummy: + return(0x01000000); // てきとーにメモリが存在しない場所 +} + +void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) { + + UINT32 adrs; + UINT size; + + while(leng) { + off = LOW16(off); + adrs = (seg << 4) + off; + size = 0x1000 - (adrs & 0xfff); + size = min(size, leng); + size = min(size, 0x10000 - off); + i286_memx_read(realaddr(adrs), dat, size); + off += size; + dat = ((BYTE *)dat) + size; + leng -= size; + } +} + +void MEMCALL i286_memstr_write(UINT seg, UINT off, const void *dat, UINT leng) { + UINT32 adrs; + UINT size; + while(leng) { + off = LOW16(off); + adrs = (seg << 4) + off; + size = 0x1000 - (adrs & 0xfff); + size = min(size, leng); + size = min(size, 0x10000 - off); + i286_memx_write(realaddr(adrs), dat, size); + off += size; + dat = ((BYTE *)dat) + size; + leng -= size; + } +} + + +#if 0 // テスト +void MEMCALL cpumem_strread(UINT32 adrs, void *dat, UINT leng) { + + UINT size; + + while(leng) { + size = 0x1000 - (adrs & 0xfff); + size = min(size, leng); + i286_memx_read(realaddr(adrs), dat, size); + adrs += size; + dat = ((BYTE *)dat) + size; + leng -= size; + } +} #endif