--- nono/vm/device.cpp	2026/04/29 17:05:11	1.1.1.8
+++ nono/vm/device.cpp	2026/04/29 17:05:29	1.1.1.11
@@ -17,8 +17,8 @@
 //
 
 // コンストラクタ
-Device::Device(const std::string& objname_)
-	: inherited(objname_)
+Device::Device(uint objid_)
+	: inherited(objid_)
 {
 }
 
@@ -36,6 +36,9 @@ Device::Create()
 bool
 Device::Init()
 {
+	mpu = GetMPUDevice();
+	scheduler = GetScheduler();
+
 	return true;
 }
 
@@ -65,13 +68,13 @@ Device::putlogn(const char *fmt, ...) co
 	uint64 vt;
 	int len;
 
-	vt = gScheduler->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),
-		gMPU->GetPPC(),
+	vt = scheduler->GetVirtTime();
+	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());
 
 	va_start(ap, fmt);
@@ -87,11 +90,9 @@ Device::putlogn(const char *fmt, ...) co
 //
 
 // コンストラクタ
-IODevice::IODevice(const std::string& objname_)
-	: inherited(objname_)
+IODevice::IODevice(uint objid_)
+	: inherited(objid_)
 {
-	devaddr = 0;
-	devlen  = 0;
 }
 
 // デストラクタ
@@ -99,134 +100,109 @@ IODevice::~IODevice()
 {
 }
 
-uint64
-IODevice::Read8(uint32 addr)
+// 初期化
+bool
+IODevice::Init()
 {
-	return 0xff;
-}
+	if (inherited::Init() == false) {
+		return false;
+	}
 
-uint64
-IODevice::Read16(uint32 addr)
-{
-	return (Read8(addr) << 8) | Read8(addr + 1);
+	return true;
 }
 
-uint64
-IODevice::Read32(uint32 addr)
+busdata
+IODevice::Read(busaddr addr)
 {
-	return (Read16(addr) << 16) | Read16(addr + 2);
+	return 0;
 }
 
-uint64
-IODevice::Write8(uint32 addr, uint32 data)
+busdata
+IODevice::Write(busaddr addr, uint32 data)
 {
 	return 0;
 }
 
-uint64
-IODevice::Write16(uint32 addr, uint32 data)
+busdata
+IODevice::ReadBurst16(busaddr addr, uint32 *dst)
 {
-	int64 berr;
+	return BusData::BusErr;
+}
 
-	berr = Write8(addr, data >> 8);
-	if (berr < 0)
-		return berr;
-	berr = Write8(addr + 1, data & 0xff);
-	if (berr < 0)
-		return berr;
-	return 0;
+busdata
+IODevice::WriteBurst16(busaddr addr, const uint32 *src)
+{
+	return BusData::BusErr;
 }
 
-uint64
-IODevice::Write32(uint32 addr, uint32 data)
+busdata
+IODevice::Read1(uint32 addr)
 {
-	int64 berr;
+	return 0xff;
+}
 
-	berr = Write16(addr, data >> 16);
-	if (berr < 0)
-		return berr;
-	berr = Write16(addr + 2, data & 0xffff);
-	if (berr < 0)
-		return berr;
+busdata
+IODevice::Write1(uint32 addr, uint32 data)
+{
 	return 0;
 }
 
-uint64
-IODevice::Peek8(uint32 addr)
+busdata
+IODevice::Peek1(uint32 addr)
 {
 	return 0xff;
 }
 
+bool
+IODevice::Poke1(uint32 addr, uint32 data)
+{
+	return false;
+}
+
 
 //
 // バスエラー
 //
 
-// グローバル参照用
-BusErrDevice *gBusErr;
-
 // コンストラクタ
 BusErrDevice::BusErrDevice()
-	: inherited("(BusErr)")
+	: inherited(OBJ_BUSERR)
 {
 	ClearAlias();
 	AddAlias("BusErr");
-
-	devaddr = -1;	// XXX どうしたもんか
 }
 
 // デストラクタ
 BusErrDevice::~BusErrDevice()
 {
-	gBusErr = NULL;
 }
 
-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;
-}
-
-uint64
-BusErrDevice::Write8(uint32 addr, uint32 data)
-{
-	putlog(1, "$%08x.b <- %02X", addr, data);
-	return (uint64)-1;
-}
-
-uint64
-BusErrDevice::Write16(uint32 addr, uint32 data)
-{
-	putlog(1, "$%08x.w <- %04X", addr, data);
-	return (uint64)-1;
-}
+	uint32 datasize = addr.GetSize();
 
-uint64
-BusErrDevice::Write32(uint32 addr, uint32 data)
-{
-	putlog(1, "$%08x.l <- %08X", 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::Peek8(uint32 addr)
+busdata
+BusErrDevice::Peek1(uint32 addr)
 {
-	return (uint64)-1;
+	return BusData::BusErr;
 }
 
 
@@ -234,12 +210,9 @@ BusErrDevice::Peek8(uint32 addr)
 // 何もしないデバイス
 //
 
-// グローバル参照用
-NopIODevice *gNopIO;
-
 // コンストラクタ
 NopIODevice::NopIODevice()
-	: inherited("(NopIO)")
+	: inherited(OBJ_NOPIO)
 {
 	ClearAlias();
 	AddAlias("NopIO");
@@ -248,53 +221,46 @@ NopIODevice::NopIODevice()
 // デストラクタ
 NopIODevice::~NopIODevice()
 {
-	gNopIO = NULL;
 }
 
-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;
 }