--- nono/vm/device.cpp 2026/04/29 17:05:18 1.1.1.9 +++ nono/vm/device.cpp 2026/04/29 17:05:38 1.1.1.12 @@ -17,7 +17,7 @@ // // コンストラクタ -Device::Device(int objid_) +Device::Device(uint objid_) : inherited(objid_) { } @@ -34,11 +34,21 @@ Device::Create() } bool -Device::Init() +Device::Create2() +{ + return true; +} + +void +Device::EarlyInit() { mpu = GetMPUDevice(); scheduler = GetScheduler(); +} +bool +Device::Init() +{ return true; } @@ -69,11 +79,11 @@ Device::putlogn(const char *fmt, ...) co int len; vt = scheduler->GetVirtTime(); - len = snprintf(buf, sizeof(buf), "%4d.%03d'%03d'%03d %08x %s ", - (int)(vt / 1000 / 1000 / 1000), - (int)((vt / 1000 / 1000) % 1000), - (int)((vt / 1000) % 1000), - (int)(vt % 1000), + len = snprintf(buf, sizeof(buf), "%4u.%03u'%03u'%03u %08x %s ", + (uint)(vt / 1000 / 1000 / 1000), + (uint)((vt / 1000 / 1000) % 1000), + (uint)((vt / 1000) % 1000), + (uint)(vt % 1000), mpu->GetPPC(), GetName().c_str()); @@ -90,7 +100,7 @@ Device::putlogn(const char *fmt, ...) co // // コンストラクタ -IODevice::IODevice(int objid_) +IODevice::IODevice(uint objid_) : inherited(objid_) { } @@ -100,117 +110,52 @@ IODevice::~IODevice() { } -// 初期化 -bool -IODevice::Init() -{ - if (inherited::Init() == false) { - return false; - } - - return true; -} - -uint64 -IODevice::Read8(uint32 addr) +busdata +IODevice::Read(busaddr addr) { - return 0xff; -} - -uint64 -IODevice::Read16(uint32 addr) -{ - return (Read8(addr) << 8) | Read8(addr + 1); -} - -uint64 -IODevice::Read32(uint32 addr) -{ - return (Read16(addr) << 16) | Read16(addr + 2); -} - -uint64 -IODevice::Write8(uint32 addr, uint32 data) -{ - return 0; -} - -uint64 -IODevice::Write16(uint32 addr, uint32 data) -{ - int64 berr; - - berr = Write8(addr, data >> 8); - if (berr < 0) - return berr; - berr = Write8(addr + 1, data & 0xff); - if (berr < 0) - return berr; return 0; } -uint64 -IODevice::Write32(uint32 addr, uint32 data) +busdata +IODevice::Write(busaddr addr, uint32 data) { - int64 berr; - - berr = Write16(addr, data >> 16); - if (berr < 0) - return berr; - berr = Write16(addr + 2, data & 0xffff); - if (berr < 0) - return berr; return 0; } -uint64 -IODevice::Peek8(uint32 addr) +busdata +IODevice::ReadBurst16(busaddr addr, uint32 *dst) { - return 0xff; + return BusData::BusErr; } -uint64 -IODevice::Poke8(uint32 addr, uint32 data) +busdata +IODevice::WriteBurst16(busaddr addr, const uint32 *src) { - return (uint64)-1; + return BusData::BusErr; } -uint64 -IODevice::Poke(uint32 addr, uint32 data) +busdata +IODevice::Read1(uint32 addr) { - return (uint64)-1; + return 0xff; } - -// -// IOContainerDevice -// - -// コンストラクタ -IOContainerDevice::IOContainerDevice(int objid_) - : inherited(objid_) +busdata +IODevice::Write1(uint32 addr, uint32 data) { + return 0; } -// デストラクタ -IOContainerDevice::~IOContainerDevice() +busdata +IODevice::Peek1(uint32 addr) { + return 0xff; } -// このアドレスを担当する IODevice を再帰的に探して返す。 -IODevice * -IOContainerDevice::FindDevice(uint32 addr) const +bool +IODevice::Poke1(uint32 addr, uint32 data) { - IODevice *d = GetDevice(addr); - IOContainerDevice *cd = dynamic_cast(d); - - if (cd) { - // 次段はコンテナデバイス - return cd->FindDevice(addr); - } else { - // 次段は終端のデバイス - return d; - } + return false; } @@ -231,52 +176,32 @@ BusErrDevice::~BusErrDevice() { } -uint64 -BusErrDevice::Read8(uint32 addr) +busdata +BusErrDevice::Read(busaddr addr) { - putlog(1, "$%08x.b", addr); - return (uint64)-1; -} + uint32 datasize = addr.GetSize(); -uint64 -BusErrDevice::Read16(uint32 addr) -{ - putlog(1, "$%08x.w", addr); - return (uint64)-1; + putlog(1, "$%08x.%u", addr.Addr(), datasize); + busdata data = BusData::BusErr; + data |= busdata::Size(datasize); + return data; } -uint64 -BusErrDevice::Read32(uint32 addr) +busdata +BusErrDevice::Write(busaddr addr, uint32 data) { - putlog(1, "$%08x.l", addr); - return (uint64)-1; -} + uint32 datasize = addr.GetSize(); -uint64 -BusErrDevice::Write8(uint32 addr, uint32 data) -{ - putlog(1, "$%08x.b <- %02X", addr, data); - return (uint64)-1; + putlog(1, "$%08x.%u <- %0*X", addr.Addr(), datasize, datasize * 2, data); + busdata r = BusData::BusErr; + r |= busdata::Size(datasize); + return r; } -uint64 -BusErrDevice::Write16(uint32 addr, uint32 data) +busdata +BusErrDevice::Peek1(uint32 addr) { - putlog(1, "$%08x.w <- %04X", addr, data); - return (uint64)-1; -} - -uint64 -BusErrDevice::Write32(uint32 addr, uint32 data) -{ - putlog(1, "$%08x.l <- %08X", addr, data); - return (uint64)-1; -} - -uint64 -BusErrDevice::Peek8(uint32 addr) -{ - return (uint64)-1; + return BusData::BusErr; } @@ -297,50 +222,44 @@ NopIODevice::~NopIODevice() { } -uint64 -NopIODevice::Read8(uint32 addr) +busdata +NopIODevice::Read(busaddr addr) { - putlog(1, "$%08x.b", addr); - return 0xff; -} + uint32 datasize = addr.GetSize(); -uint64 -NopIODevice::Read16(uint32 addr) -{ - putlog(1, "$%08x.w", addr); - return 0xffff; + putlog(1, "$%08x.%u", addr.Addr(), datasize); + busdata data = (1ULL << (datasize * 8)) - 1; + data |= busdata::Size(datasize); + return data; } -uint64 -NopIODevice::Read32(uint32 addr) +busdata +NopIODevice::Write(busaddr addr, uint32 data) { - putlog(1, "$%08x.l", addr); - return 0xffffffff; -} + uint32 datasize = addr.GetSize(); -uint64 -NopIODevice::Write8(uint32 addr, uint32 data) -{ - putlog(1, "$%08x.b <- $%02x", addr, data); - return 0; + putlog(1, "$%08x.%u <- $%0*x", addr.Addr(), datasize, datasize * 2, data); + busdata r = busdata::Size(datasize); + return r; } -uint64 -NopIODevice::Write16(uint32 addr, uint32 data) +busdata +NopIODevice::Peek1(uint32 addr) { - putlog(1, "$%08x.w <- $%04x", addr, data); - return 0; + return 0xff; } -uint64 -NopIODevice::Write32(uint32 addr, uint32 data) +busdata +NopIODevice::Read1(uint32 addr) { - putlog(1, "$%08x.l <- $%08x", addr, data); - return 0; + putlog(1, "XP $%05x", addr); + busdata data = 0xff; + return data; } -uint64 -NopIODevice::Peek8(uint32 addr) +busdata +NopIODevice::Write1(uint32 addr, uint32 data) { - return 0xff; + putlog(1, "XP $%05x <- $%02x", addr, data); + return 0; }