--- nono/vm/bus.cpp 2026/04/29 17:04:38 1.1.1.4 +++ nono/vm/bus.cpp 2026/04/29 17:04:52 1.1.1.6 @@ -9,6 +9,12 @@ IODevice *devtable[256]; +// RAM へのアクセスは、アクセスアドレスが direct_ram_size 未満なら ram[] を +// 直接アクセスし、そうでなければデバイスクラス経由でアクセスする。 +// 高速モードでは RAM デバイスを経由すること自体とその中でアクセスウェイトを +// 計算する分を回避したい。 +int direct_ram_size; + // // 物理バスアクセス? // addr はそれぞれアラインされていること @@ -19,8 +25,8 @@ vm_phys_read_8(uint32 addr) { uint64 data; - if (addr < ram_size) { - data = ram[HLB(addr)]; + if (addr < direct_ram_size) { + data = mainram[HLB(addr)]; } else { IODevice *dev = ::devtable[addr >> 24]; data = dev->Read8(addr); @@ -36,8 +42,8 @@ vm_phys_read_16(uint32 addr) if (__predict_false(addr & 1)) PANIC("unaligned access $%08x", addr); - if (addr < ram_size) { - data = *(uint16 *)&ram[HLW(addr)]; + if (addr < direct_ram_size) { + data = *(uint16 *)&mainram[HLW(addr)]; } else { IODevice *dev = ::devtable[addr >> 24]; data = dev->Read16(addr); @@ -53,8 +59,8 @@ vm_phys_read_32(uint32 addr) if (__predict_false(addr & 3)) PANIC("unaligned access $%08x", addr); - if (addr < ram_size) { - data = *(uint32 *)&ram[addr]; + if (addr < direct_ram_size) { + data = *(uint32 *)&mainram[addr]; } else { IODevice *dev = ::devtable[addr >> 24]; data = dev->Read32(addr); @@ -65,8 +71,8 @@ vm_phys_read_32(uint32 addr) uint64 vm_phys_write_8(uint32 addr, uint32 data) { - if (addr < ram_size) { - ram[HLB(addr)] = data; + if (addr < direct_ram_size) { + mainram[HLB(addr)] = data; return 0; } else { IODevice *dev = ::devtable[addr >> 24]; @@ -80,8 +86,8 @@ vm_phys_write_16(uint32 addr, uint32 dat if (__predict_false(addr & 1)) PANIC("unaligned access $%08x", addr); - if (addr < ram_size) { - *(uint16 *)&ram[HLW(addr)] = data; + if (addr < direct_ram_size) { + *(uint16 *)&mainram[HLW(addr)] = data; return 0; } else { IODevice *dev = ::devtable[addr >> 24]; @@ -95,8 +101,8 @@ vm_phys_write_32(uint32 addr, uint32 dat if (__predict_false(addr & 3)) PANIC("unaligned access $%08x", addr); - if (addr < ram_size) { - *(uint32 *)&ram[addr] = data; + if (addr < direct_ram_size) { + *(uint32 *)&mainram[addr] = data; return 0; } else { IODevice *dev = ::devtable[addr >> 24]; @@ -109,8 +115,8 @@ vm_phys_peek_8(uint32 addr) { uint64 data; - if (addr < ram_size) { - data = ram[HLB(addr)]; + if (addr < direct_ram_size) { + data = mainram[HLB(addr)]; } else { IODevice *dev = ::devtable[addr >> 24]; data = dev->Peek8(addr);