--- nono/vm/xiospace.h	2026/04/29 17:04:53	1.1.1.7
+++ nono/vm/xiospace.h	2026/04/29 17:05:10	1.1.1.9
@@ -4,13 +4,16 @@
 // Licensed under nono-license.txt
 //
 
+//
+// X68030 のメイン空間 ($000000-$FFFFFF) 担当
+//
+
 #pragma once
 
 #include "device.h"
 #include <array>
 
-class XIOSpaceDevice
-	: public IODevice
+class XIOSpaceDevice : public IODevice
 {
 	using inherited = IODevice;
  public:
@@ -42,7 +45,30 @@ class XIOSpaceDevice
 
 	void AddDevice(IODevice *dev);
 
+	std::unique_ptr<Device> pAreaSet {};
+	std::unique_ptr<Device> pCGROM {};
+	std::unique_ptr<Device> pCRTC {};
+	std::unique_ptr<Device> pDMAC {};
+	std::unique_ptr<Device> pFDC {};
+	std::unique_ptr<Device> pGVRAM {};
+	std::unique_ptr<Device> pPEDEC {};
+	std::unique_ptr<Device> pIPLROM1 {};
+	std::unique_ptr<Device> pIPLROM2 {};
+	std::unique_ptr<Device> pMFP {};
+	std::unique_ptr<Device> pPlaneVRAM {};
+	std::unique_ptr<Device> pPluto {};
+	std::unique_ptr<Device> pPPI {};
+	std::unique_ptr<Device> pPrinter {};
+	std::unique_ptr<Device> pRTC {};
+	std::unique_ptr<Device> pSCC {};
+	std::unique_ptr<Device> pSRAM {};
+	std::unique_ptr<Device> pSPC {};
+	std::unique_ptr<Device> pSprite {};
+	std::unique_ptr<Device> pSysport {};
+	std::unique_ptr<Device> pVideoCtlr {};
+	std::unique_ptr<Device> pOPM {};
+
 	std::array<IODevice*, 2048> table {};
 };
 
-extern std::unique_ptr<XIOSpaceDevice> gXIOSpace;
+extern XIOSpaceDevice *gXIOSpace;