--- nono/vm/vm_luna.cpp	2026/04/29 17:04:53	1.1.1.6
+++ nono/vm/vm_luna.cpp	2026/04/29 17:05:07	1.1.1.9
@@ -6,7 +6,6 @@
 
 #include "vm_luna.h"
 #include "aout.h"
-#include "bitmap.h"
 #include "bt454.h"
 #include "busio.h"
 #include "cmmu.h"
@@ -17,6 +16,7 @@
 #include "interrupt.h"
 #include "lance.h"
 #include "lcd.h"
+#include "lunafb.h"
 #include "lunakbd.h"
 #include "mainapp.h"
 #include "mk48t02.h"
@@ -54,7 +54,7 @@ enum {
 	SYSCLK,
 	ZRAM,
 	MROM,
-	BITMAP,
+	LUNAFB,
 	BT454,
 	CRTC2,
 	SCSI,
@@ -74,7 +74,7 @@ VM_LUNA::VM_LUNA()
 	gConfig->Delete("mpu-has-fpu");
 
 	// LUNA 共通だしここで作成しておく
-	gNull.reset(new NullDevice());
+	gNopIO.reset(new NopIODevice());
 }
 
 // デストラクタ
@@ -89,9 +89,9 @@ VM_LUNA::MakeDevtable(const uint8 *mapta
 	for (uint i = 0; i < countof(::devtable); i++) {
 		IODevice *d;
 		switch (maptable[i]) {
-		 case NONE:		d = gNull.get();		break;
+		 case NONE:		d = gNopIO.get();		break;
 		 case BUSERR:	d = gBusErr.get();		break;
-		 case PROM:		d = prom.get();			break;
+		 case PROM:		d = gPROM.get();		break;
 		 case MK48:		d = gRTC.get();			break;
 		 case PIO0:		d = gPIO0.get();		break;
 		 case PIO1:		d = gPIO1.get();		break;
@@ -99,8 +99,8 @@ VM_LUNA::MakeDevtable(const uint8 *mapta
 		 case TAS:		d = gTAS.get();			break;
 		 case SYSCLK:	d = gSysClk.get();		break;
 		 case ZRAM:		d = gZRAM.get();		break;
-		 case MROM:		d = gNull.get();		break;
-		 case BITMAP:	d = gBitmap.get();		break;
+		 case MROM:		d = gNopIO.get();		break;
+		 case LUNAFB:	d = gLunafb.get();		break;
 		 case BT454:	d = gBT454.get();		break;
 		 case CRTC2:	d = gCRTC2.get();		break;
 		 case SCSI:		d = gSPC.get();			break;
@@ -137,6 +137,9 @@ VM_LUNA::Init()
 		::devtable[i] = gPartialRAM.get();
 	}
 
+	// ブートページ切り替え用に覚えておく
+	ram0 = ::devtable[0];
+
 	return true;
 }
 
@@ -164,9 +167,11 @@ VM_LUNA::SwitchBootPage(Device *parent,
 	// 思うけど、具体的にどの範囲が切り替わるのかを知る方法がないのと
 	// 大して副作用もないので、先頭の 1ブロックをまるごと切り替えておく。
 	if (isrom) {
-		::devtable[0] = prom.get();
+		::devtable[0x00] = gPROM0.get();
+		::devtable[0x41] = gPROM0.get();
 	} else {
-		::devtable[0] = gRAM.get();
+		::devtable[0x00] = ram0;
+		::devtable[0x41] = gPROM.get();
 	}
 }
 
@@ -202,7 +207,7 @@ VM_LUNA::SwitchBootPage(Device *parent,
 //              a1,a3,a5,... マスクROM(なければ0xffが読める)
 // b1			ビットマップ
 //              b0,b2,b4,... BUSERR
-//              b1,b3,b5,... ビットマップ (内訳は bitmap.cpp 参照)
+//              b1,b3,b5,... ビットマップ (内訳は lunafb.cpp 参照)
 // c1			パレット
 //              c0,c2,c4,... BUSERR
 //              c1,c3,c5,... パレット (B、N=4でミラー)
@@ -244,8 +249,8 @@ VM_LUNA1::maptable[256] = {
 	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	// 98
 	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	// a0
 	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	// a8
-	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	// b0
-	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	// b8
+	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	// b0
+	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	// b8
 
 	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	// c0
 	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	// c8
@@ -271,7 +276,7 @@ VM_LUNA1::VM_LUNA1()
 	gConfig->Add("!sysclk-period", 16.666667_msec);
 
 	// デバイス (順序に注意)
-	// BusErrDevice, NullDevice は親コンストラクタで作成済み。
+	// BusErrDevice, NopIODevice は親コンストラクタで作成済み。
 
 	gMPU.reset(new MPU680x0Device());				// required by Scheduler
 	gScheduler.reset(new Scheduler());				// required by *
@@ -279,11 +284,12 @@ VM_LUNA1::VM_LUNA1()
 	gRAM.reset(new RAMDevice());					// required by PartialRAM
 	gPartialRAM.reset(new PartialRAMDevice());
 	gEthernet.reset(new BusIO_W<LanceDevice>());	// required by PROM
-	if (gMainApp.host_file || gConfig->Find("prom-image").AsString().empty()) {
-		prom.reset(new Luna1PROMEmuDevice());
+	if (gMainApp.exec_file || gConfig->Find("prom-image").AsString().empty()) {
+		gPROM.reset(new Luna1PROMEmuDevice());
 	} else {
-		prom.reset(new PROMDevice());
+		gPROM.reset(new PROMDevice());
 	}
+	gPROM0.reset(new PROM0Device());
 	gRTC.reset(new BusIO_B<MK48T02Device>());
 	gPIO0.reset(new BusIO_B<PIO0Device>());
 	gPIO1.reset(new BusIO_B<PIO1Device>());
@@ -291,7 +297,7 @@ VM_LUNA1::VM_LUNA1()
 	gSysClk.reset(new BusIO_B<SysClkDevice>());
 	gTAS.reset(new BusIO_B<TASDevice>());
 	gZRAM.reset(new ZRAMDevice());
-	gBitmap.reset(new BitmapDevice());				// required by BT454
+	gLunafb.reset(new LunafbDevice());				// required by BT454
 	gBT454.reset(new BusIO_B<BT454Device>());
 	gCRTC2.reset(new BusIO_B<CRTC2Device>());
 	gSPC.reset(new BusIO_BBBB<SPCDevice>());
@@ -342,8 +348,8 @@ VM_LUNA88K::maptable[256] = {
 	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	// 98
 	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	// a0
 	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	BUSERR,	MROM,	// a8
-	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	// b0
-	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	BUSERR,	BITMAP,	// b8
+	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	// b0
+	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	BUSERR,	LUNAFB,	// b8
 
 	// d0 にボードチェックレジスタ?
 	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	BUSERR,	BT454,	// c0
@@ -374,18 +380,21 @@ VM_LUNA88K::VM_LUNA88K()
 	gConfig->Delete("mpu-has-fpu");
 
 	// デバイス (順序に注意)
-	// BusErrDevice, NullDevice は親コンストラクタで作成済み。
+	// BusErrDevice, NopIODevice は親コンストラクタで作成済み。
 
 	gMPU.reset(new MPU88xx0Device());				// required by Scheduler
 	gScheduler.reset(new Scheduler());				// required by *
 	gInterrupt.reset(new SysCtlrDevice());
 	gRAM.reset(new RAMDevice());					// required by PartialRAM
 	gPartialRAM.reset(new PartialRAMDevice());
-	if (gMainApp.host_file || gConfig->Find("prom-image").AsString().empty()) {
-		prom.reset(new Luna88kPROMEmuDevice());
+	gEthernet.reset(new BusIO_WF<LanceDevice>());	// required by FuseROM
+	gFuseROM.reset(new BusIO_BFFF<FuseROMDevice>());
+	if (gMainApp.exec_file || gConfig->Find("prom-image").AsString().empty()) {
+		gPROM.reset(new Luna88kPROMEmuDevice());
 	} else {
-		prom.reset(new PROMDevice());
+		gPROM.reset(new PROMDevice());
 	}
+	gPROM0.reset(new PROM0Device());
 	gRTC.reset(new BusIO_BFFF<MK48T02Device>());
 	gPIO0.reset(new BusIO_BFFF<PIO0Device>());
 	gPIO1.reset(new BusIO_BFFF<PIO1Device>());
@@ -393,12 +402,10 @@ VM_LUNA88K::VM_LUNA88K()
 	gSysClk.reset(new BusIO_BFFF<SysClkDevice>());
 	gTAS.reset(new BusIO_BFFF<TASDevice>());
 	gZRAM.reset(new ZRAMDevice());
-	gBitmap.reset(new BitmapDevice());				// required by BT454
+	gLunafb.reset(new LunafbDevice());				// required by BT454
 	gBT454.reset(new BusIO_B<BT454Device>());
 	gCRTC2.reset(new BusIO_BFFF<CRTC2Device>());
 	gSPC.reset(new BusIO_BFFF<SPCDevice>());
-	gEthernet.reset(new BusIO_WF<LanceDevice>());	// required by FuseROM
-	gFuseROM.reset(new BusIO_BFFF<FuseROMDevice>());
 	gCMMU.reset(new CMMUDevice());
 
 	gLCD.reset(new LCDDevice());