--- nono/vm/vm_luna.h	2026/04/29 17:04:45	1.1.1.4
+++ nono/vm/vm_luna.h	2026/04/29 17:05:14	1.1.1.10
@@ -4,46 +4,73 @@
 // Licensed under nono-license.txt
 //
 
+//
+// VM (LUNA)
+//
+
 #pragma once
 
-#include "crtc2.h"
-#include "fuserom.h"
-#include "sysclk.h"
 #include "vm.h"
 
-class VM_LUNA final : public VM
+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<NullDevice> nulldev {};
+ protected:
+	// ブートページを切り替える。
+	void SwitchBootPage(Device *parent, bool isrom) override;
+
+	// デバイスマップから devtable を作成
+	void MakeDevtable(const uint8 *maptable);
+
+	// ブートページ切り替え用 (unique_ptr ではない)
+	IODevice *ram0 {};
+
+	std::unique_ptr<Device> pBT454 {};
+	std::unique_ptr<Device> pCRTC2 {};
+	std::unique_ptr<Device> pEthernet {};
+	std::unique_ptr<Device> pLCD {};
+	std::unique_ptr<Device> pNopIO {};
+	std::unique_ptr<Device> pPartialRAM {};
+	std::unique_ptr<Device> pPlaneVRAM {};
+	std::unique_ptr<Device> pPROM {};
+	std::unique_ptr<Device> pPROM0 {};
+	std::unique_ptr<Device> pPIO0 {};
+	std::unique_ptr<Device> pPIO1 {};
+	std::unique_ptr<Device> pRTC {};
+	std::unique_ptr<Device> pSIO {};
+	std::unique_ptr<Device> pSPC {};
+	std::unique_ptr<Device> pSysClk {};
+	std::unique_ptr<Device> pTAS {};
+	std::unique_ptr<Device> pZRAM {};
+};
 
+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 final : 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<NullDevice> nulldev {};
+	std::unique_ptr<Device> pCMMU {};
+	std::unique_ptr<Device> pFuseROM {};
 
 	static const uint8 maptable[256];
 };