--- nono/vm/romimg_x68k.h	2026/04/29 17:04:53	1.1.1.5
+++ nono/vm/romimg_x68k.h	2026/04/29 17:06:00	1.1.1.12
@@ -4,66 +4,74 @@
 // Licensed under nono-license.txt
 //
 
+//
+// X680x0 の各種 ROM
+//
+
 #pragma once
 
 #include "rom.h"
 
 class IPLROM1Device;
 
-class IPLROM0Device
-	: public ROMDevice
+class IPLROM0Device : public IODevice
 {
-	using inherited = ROMDevice;
+	using inherited = IODevice;
  public:
 	IPLROM0Device();
-	virtual ~IPLROM0Device() override;
+	~IPLROM0Device() override;
 
 	bool Init() override;
-	void ResetHard() override;
+	void ResetHard(bool poweron) override;
 
-	uint64 Read8(uint32 addr) override;
-	uint64 Read16(uint32 addr) override;
-	uint64 Read32(uint32 addr) override;
-	uint64 Peek8(uint32 addr) override;
+	busdata Read(busaddr addr) override;
+	busdata Peek1(uint32 addr) override;
 
  private:
+	uint32 ReadDecoder(uint32 addr);
+
 	IPLROM1Device *iplrom1 {};
 };
 
-class IPLROM1Device
-	: public ROMDevice
+class IPLROM1Device : public ROMDevice
 {
 	using inherited = ROMDevice;
  public:
 	IPLROM1Device();
-	virtual ~IPLROM1Device() override;
+	~IPLROM1Device() override;
 
 	bool Init() override;
 };
 
-class IPLROM2Device
-	: public ROMDevice
+class IPLROM2Device : public ROMDevice
 {
 	using inherited = ROMDevice;
  public:
 	IPLROM2Device();
-	virtual ~IPLROM2Device() override;
+	~IPLROM2Device() override;
 
 	bool Init() override;
 };
 
-class CGROMDevice
-	: public ROMDevice
+class CGROMDevice : public ROMDevice
 {
 	using inherited = ROMDevice;
  public:
 	CGROMDevice();
-	virtual ~CGROMDevice() override;
+	~CGROMDevice() override;
 
 	bool Init() override;
 };
 
-extern std::unique_ptr<CGROMDevice> gCGROM;
-extern std::unique_ptr<IPLROM0Device> gIPLROM0;
-extern std::unique_ptr<IPLROM1Device> gIPLROM1;
-extern std::unique_ptr<IPLROM2Device> gIPLROM2;
+inline CGROMDevice *GetCGROMDevice() {
+	return Object::GetObject<CGROMDevice>(OBJ_CGROM);
+}
+inline IPLROM0Device *GetIPLROM0Device() {
+	return Object::GetObject<IPLROM0Device>(OBJ_IPLROM_BOOT);
+}
+inline IPLROM1Device *GetIPLROM1Device() {
+	return Object::GetObject<IPLROM1Device>(OBJ_IPLROM1);
+}
+inline ROMDevice *GetIPLROM2Device() {
+	return Object::GetObject<ROMDevice>(OBJ_IPLROM2);
+}