--- nono/vm/pio.cpp	2026/04/29 17:04:42	1.1.1.4
+++ nono/vm/pio.cpp	2026/04/29 17:04:50	1.1.1.6
@@ -8,7 +8,6 @@
 #include "config.h"
 #include "lcd.h"
 #include "mainapp.h"
-#include "mystring.h"
 #include "scheduler.h"
 
 //           IODevice
@@ -21,6 +20,7 @@
 // PPIDevice  PIO0Device PIO1Device
 // (X68030)   (LUNA)     (LUNA)
 
+std::unique_ptr<PPIDevice> gPPI;
 std::unique_ptr<PIO0Device> gPIO0;
 std::unique_ptr<PIO1Device> gPIO1;
 
@@ -108,19 +108,19 @@ PPIDevice::~PPIDevice()
 }
 
 uint64
-PPIDevice::Read(uint32 addr)
+PPIDevice::Read(uint32 offset)
 {
 	gMPU->AddCycle(19);	// InsideOut p.135
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 	 case 1:
 		return 0xff;
 	 case 2:
-		PANIC("PPI $E9A005 未サポート読み込み");
-		break;
+		putlog(0, "$e9a005 PortC 未実装読み込み");
+		return 0xff;
 	 case 3:
-		PANIC("PPI $E9A007 未サポート読み込み");
+		PANIC("PPI $e9a007 未サポート読み込み");
 		break;
 	 default:
 		__unreachable();
@@ -129,22 +129,22 @@ PPIDevice::Read(uint32 addr)
 }
 
 uint64
-PPIDevice::Write(uint32 addr, uint32 data)
+PPIDevice::Write(uint32 offset, uint32 data)
 {
 	gMPU->AddCycle(19);	// InsideOut p.135
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 	 case 1:
 		break;
 	 case 2:
-		putlog(0, "$E9A005 未実装書き込み $%02X (無視)", data);
+		putlog(0, "$e9a005 未実装書き込み $%02X (無視)", data);
 		break;
 	 case 3:
 		if (data != 0x92) {
-			PANIC("PPI $E9A007 未実装書き込み $%02X", data);
+			PANIC("PPI $e9a007 未実装書き込み $%02X", data);
 		} else {
-			putlog(0, "$E9A007 未実装書き込み $%02x (無視)", data);
+			putlog(0, "$e9a007 未実装書き込み $%02x (無視)", data);
 		}
 		break;
 	 default:
@@ -154,7 +154,7 @@ PPIDevice::Write(uint32 addr, uint32 dat
 }
 
 uint64
-PPIDevice::Peek(uint32 addr)
+PPIDevice::Peek(uint32 offset)
 {
 	// XXX
 	return 0xff;
@@ -257,11 +257,11 @@ PIO0Device::Init()
 }
 
 uint64
-PIO0Device::Read(uint32 addr)
+PIO0Device::Read(uint32 offset)
 {
 	uint32 data;
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		// PortA
 		putlog(1, "DIP-SW 1 読み込み");
@@ -275,7 +275,7 @@ PIO0Device::Read(uint32 addr)
 	 case 2:
 		// PortC
 		data = GetPC();
-		putlog(1, "PC 読み込み -> $%02x", data); 
+		putlog(1, "PC 読み込み -> $%02x", data);
 		return data;
 
 	 case 3:
@@ -289,9 +289,9 @@ PIO0Device::Read(uint32 addr)
 }
 
 uint64
-PIO0Device::Write(uint32 addr, uint32 data)
+PIO0Device::Write(uint32 offset, uint32 data)
 {
-	switch (addr) {
+	switch (offset) {
 	 case 0:	// PIO0 PortA: DIPSW1 (入力のみ)
 	 case 1:	// PIO0 PortB: DIPSW2 (入力のみ)
 		return 0;
@@ -313,9 +313,9 @@ PIO0Device::Write(uint32 addr, uint32 da
 }
 
 uint64
-PIO0Device::Peek(uint32 addr)
+PIO0Device::Peek(uint32 offset)
 {
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		return GetPA();
 
@@ -495,11 +495,11 @@ PIO1Device::ResetHard()
 }
 
 uint64
-PIO1Device::Read(uint32 addr)
+PIO1Device::Read(uint32 offset)
 {
 	uint32 data;
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		// PIO1 PortA: LCD データ
 		return gLCD->Read();
@@ -528,9 +528,9 @@ PIO1Device::Read(uint32 addr)
 }
 
 uint64
-PIO1Device::Write(uint32 addr, uint32 data)
+PIO1Device::Write(uint32 offset, uint32 data)
 {
-	switch (addr) {
+	switch (offset) {
 	 case 0:	// PIO1 PortA: LCD データ
 		gLCD->Write(data);
 		return 0;
@@ -552,16 +552,16 @@ PIO1Device::Write(uint32 addr, uint32 da
 	 default:
 		__unreachable();
 	}
-	PANIC("$%08X <- $%02X 未サポート書き込み", addr, data);
+	PANIC("$%08X <- $%02X 未サポート書き込み", gMPU->GetPaddr(), data);
 	return 0;
 }
 
 uint64
-PIO1Device::Peek(uint32 addr)
+PIO1Device::Peek(uint32 offset)
 {
 	uint32 data;
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:	// PIO1 PortA LCD データ
 		return gLCD->Peek();