--- nono/vm/partialram.cpp 2026/04/29 17:05:24 1.1.1.2 +++ nono/vm/partialram.cpp 2026/04/29 17:05:42 1.1.1.5 @@ -43,10 +43,6 @@ PartialRAMDevice::~PartialRAMDevice() bool PartialRAMDevice::Init() { - if (inherited::Init() == false) { - return false; - } - ramdev = GetMainRAMDevice(); nopdev = GetNopIODevice(); @@ -54,7 +50,7 @@ PartialRAMDevice::Init() // ただしこのデバイスがどこに割り当てられるか (或いは割り当てられないか) // はこの後の VM_LUNA*::Init() で判断するため、ここではチェックなどは // 行わない。 - ram_size = ramdev->GetSize(); + ram_size = (uint32)ramdev->GetSize(); return true; } @@ -71,57 +67,29 @@ PartialRAMDevice::SearchDevice(uint32 ad } busdata -PartialRAMDevice::Read8(uint32 addr) -{ - IODevice *d = SearchDevice(addr); - return d->Read8(addr); -} - -busdata -PartialRAMDevice::Read16(uint32 addr) -{ - IODevice *d = SearchDevice(addr); - return d->Read16(addr); -} - -busdata -PartialRAMDevice::Read32(uint32 addr) +PartialRAMDevice::Read(busaddr addr) { - IODevice *d = SearchDevice(addr); - return d->Read32(addr); -} - -busdata -PartialRAMDevice::Write8(uint32 addr, uint32 data) -{ - IODevice *d = SearchDevice(addr); - return d->Write8(addr, data); + IODevice *d = SearchDevice(addr.Addr()); + return d->Read(addr); } busdata -PartialRAMDevice::Write16(uint32 addr, uint32 data) +PartialRAMDevice::Write(busaddr addr, uint32 data) { - IODevice *d = SearchDevice(addr); - return d->Write16(addr, data); -} - -busdata -PartialRAMDevice::Write32(uint32 addr, uint32 data) -{ - IODevice *d = SearchDevice(addr); - return d->Write32(addr, data); + IODevice *d = SearchDevice(addr.Addr()); + return d->Write(addr, data); } busdata -PartialRAMDevice::Peek8(uint32 addr) +PartialRAMDevice::Peek1(uint32 addr) { IODevice *d = SearchDevice(addr); - return d->Peek8(addr); + return d->Peek1(addr); } bool -PartialRAMDevice::Poke8(uint32 addr, uint32 data) +PartialRAMDevice::Poke1(uint32 addr, uint32 data) { IODevice *d = SearchDevice(addr); - return d->Poke8(addr, data); + return d->Poke1(addr, data); }