--- nono/vm/prom.h	2026/04/29 17:04:53	1.1.1.4
+++ nono/vm/prom.h	2026/04/29 17:05:17	1.1.1.9
@@ -4,39 +4,68 @@
 // Licensed under nono-license.txt
 //
 
+//
+// PROM (LUNA-I, LUNA-88K 共通)
+//
+
 #pragma once
 
-#include "ethernet.h"
 #include "rom.h"
-#include "stopwatch.h"
 
-class PROMDevice
-	: public ROMDevice
+class PROM0Device : public IODevice
 {
-	using inherited = ROMDevice;
+	using inherited = IODevice;
  public:
-	PROMDevice();
-	virtual ~PROMDevice() override;
+	PROM0Device();
+	virtual ~PROM0Device() override;
 
 	bool Init() override;
-	bool PowerOn() 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 Write8(uint32 addr, uint32 data) override;
 	uint64 Write16(uint32 addr, uint32 data) override;
 	uint64 Write32(uint32 addr, uint32 data) override;
+	uint64 Peek8(uint32 addr) override;
+
+ private:
+	// アドレスデコーダ
+	static uint32 Decoder(uint32 addr);
+
+	// 書き込みの共通部分
+	uint64 Write();
+
+	IODevice *prom {};
+};
+
+class PROMDevice : public ROMDevice
+{
+	using inherited = ROMDevice;
+ public:
+	PROMDevice();
+	virtual ~PROMDevice() override;
+
+	bool Init() override;
+
+	int GetROMVer() const { return romver; }
 
  private:
 	bool InitLuna1();
 	bool InitLuna88k();
-	uint64 Write(uint32 addr);
-
-	// ROM->RAM 切り替え用フラグ。true なら ROM モード
-	bool isrom {};
 
-	// パフォーマンス測定用
-	Stopwatch sw {};
+	// PROM バージョン。
+	// 100倍した整数形式で持つ。0 ならバージョン不明。
+	int romver {};
 };
 
-extern std::unique_ptr<PROMDevice> gPROM;
+static inline PROM0Device *GetPROM0Device() {
+	return Object::GetObject<PROM0Device>(OBJ_PROM_BOOT);
+}
+
+// PROM(現物)と ROMEMU の共通層である ROMDevice を返す。
+// 区別が必要なら呼び出し側でもう一度 dynamic_cast<> すること。
+static inline ROMDevice *GetPROMDevice() {
+	return Object::GetObject<ROMDevice>(OBJ_PROM);
+}