--- nono/vm/vm_luna.h	2026/04/29 17:04:36	1.1.1.2
+++ nono/vm/vm_luna.h	2026/04/29 17:05:18	1.1.1.11
@@ -4,6 +4,10 @@
 // Licensed under nono-license.txt
 //
 
+//
+// VM (LUNA)
+//
+
 #pragma once
 
 #include "vm.h"
@@ -13,36 +17,63 @@ class VM_LUNA : public VM
 	using inherited = VM;
  public:
 	VM_LUNA();
-	~VM_LUNA() override;
+	virtual ~VM_LUNA() override;
 
-	// 電源ボタンを押す。
-	void PowerButton() override;
+	bool Init() override;
 
- private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
+ protected:
+	// ブートページを切り替える。
+	void SwitchBootPage(Device *parent, bool isrom) override;
+
+	// デバイスマップから devtable を作成
+	void MakeDevtable(const uint8 *maptable);
+
+	// ブートページ切り替え用 (unique_ptr ではない)
+	IODevice *ram0 {};
+
+	std::unique_ptr<IODevice> pBT45x {};
+	std::unique_ptr<IODevice> pCRTC2 {};
+	std::unique_ptr<Device>   pDipsw {};
+	std::unique_ptr<IODevice> pEthernet {};
+	std::unique_ptr<Device>   pLCD {};
+	std::unique_ptr<Device>   pMPU64180 {};
+	std::unique_ptr<IODevice> pNopIO {};
+	std::unique_ptr<IODevice> pPartialRAM {};
+	std::unique_ptr<IODevice> pPlaneVRAM {};
+	std::unique_ptr<IODevice> pPROM {};
+	std::unique_ptr<IODevice> pPROM0 {};
+	std::unique_ptr<IODevice> pPIO0 {};
+	std::unique_ptr<IODevice> pPIO1 {};
+	std::unique_ptr<IODevice> pRTC {};
+	std::unique_ptr<IODevice> pSIO {};
+	std::unique_ptr<IODevice> pSPC {};
+	std::unique_ptr<IODevice> pSubRAM {};
+	std::unique_ptr<IODevice> pSysClk {};
+	std::unique_ptr<IODevice> pTAS {};
+	std::unique_ptr<IODevice> pXPbus {};
+};
 
+class VM_LUNA1 final : public VM_LUNA
+{
+	using inherited = VM_LUNA;
+ public:
+	VM_LUNA1();
+	~VM_LUNA1() override;
+
+ private:
 	static const uint8 maptable[256];
 };
 
-class VM_LUNA88K : public VM
+class VM_LUNA88K final : public VM_LUNA
 {
-	using inherited = VM;
+	using inherited = VM_LUNA;
  public:
 	VM_LUNA88K();
 	~VM_LUNA88K() override;
 
-	// 電源ボタンを押す。
-	void PowerButton() override;
-
  private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<FuseROMDevice> fuserom;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
+	std::unique_ptr<IODevice> pCMMU {};
+	std::unique_ptr<IODevice> pFuseROM {};
 
 	static const uint8 maptable[256];
 };