--- nono/vm/spc.h	2026/04/29 17:05:14	1.1.1.13
+++ nono/vm/spc.h	2026/04/29 17:05:33	1.1.1.17
@@ -13,50 +13,52 @@
 #include "device.h"
 #include "event.h"
 #include "fixedqueue.h"
-#include "monitor.h"
-#include "scsidev.h"
+#include "mainapp.h"
+
+class InterruptDevice;
+class SCSIHostDevice;
 
 struct SPC
 {
-	static const int BDID = 0x0;	// $E96021 RW  $E100_0000
-	static const int SCTL = 0x1;	// $E96023 RW  $E100_0004
-	static const int SCMD = 0x2;	// $E96025 RW  $E100_0008
-	static const int TMOD = 0x3;	// (MB89352 にはない)
-	static const int INTS = 0x4;	// $E96029 RW  $E100_0010
-	static const int PSNS = 0x5;	// $E9602B R-  $E100_0014
-	static const int SDGC = 0x5;	// $E9602B -W  $E100_0014
-	static const int SSTS = 0x6;	// $E9602D R-  $E100_0018
-	static const int SERR = 0x7;	// $E9602F R-  $E100_001C
-	static const int PCTL = 0x8;	// $E96031 RW  $E100_0020
-	static const int MBC  = 0x9;	// $E96033 R-  $E100_0024
-	static const int DREG = 0xa;	// $E96035 RW  $E100_0028
-	static const int TEMP = 0xb;	// $E96037 RW  $E100_002C
-	static const int TCH  = 0xc;	// $E96039 RW  $E100_0030
-	static const int TCM  = 0xd;	// $E9603B RW  $E100_0034
-	static const int TCL  = 0xe;	// $E9603D RW  $E100_0038
-	static const int EXBF = 0xf;	// (MB89352 にはない)
+	static const uint BDID = 0x0;	// $E96021 RW  $E100_0000
+	static const uint SCTL = 0x1;	// $E96023 RW  $E100_0004
+	static const uint SCMD = 0x2;	// $E96025 RW  $E100_0008
+	static const uint TMOD = 0x3;	// (MB89352 にはない)
+	static const uint INTS = 0x4;	// $E96029 RW  $E100_0010
+	static const uint PSNS = 0x5;	// $E9602B R-  $E100_0014
+	static const uint SDGC = 0x5;	// $E9602B -W  $E100_0014
+	static const uint SSTS = 0x6;	// $E9602D R-  $E100_0018
+	static const uint SERR = 0x7;	// $E9602F R-  $E100_001C
+	static const uint PCTL = 0x8;	// $E96031 RW  $E100_0020
+	static const uint MBC  = 0x9;	// $E96033 R-  $E100_0024
+	static const uint DREG = 0xa;	// $E96035 RW  $E100_0028
+	static const uint TEMP = 0xb;	// $E96037 RW  $E100_002C
+	static const uint TCH  = 0xc;	// $E96039 RW  $E100_0030
+	static const uint TCM  = 0xd;	// $E9603B RW  $E100_0034
+	static const uint TCL  = 0xe;	// $E9603D RW  $E100_0038
+	static const uint EXBF = 0xf;	// (MB89352 にはない)
 
 
 	// SCTL レジスタ
 	// 全ビットを保持。
 	uint8 sctl;
-	static const int SCTL_RESET			= 0x80;	// Reset & Disable
-	static const int SCTL_CTL_RESET		= 0x40;	// Control Reset
-	static const int SCTL_DIAG_MODE		= 0x20;	// Diag Mode
-	static const int SCTL_ARBIT_EN		= 0x10;	// Arbitration Enable
-	static const int SCTL_PARITY_EN		= 0x08;	// Parity Enable
-	static const int SCTL_SEL_EN		= 0x04;	// Select Enable
-	static const int SCTL_RESEL_EN		= 0x02;	// Reselect Enable
-	static const int SCTL_INTR_EN		= 0x01;	// Interrupt Enable
+	static const uint SCTL_RESET		= 0x80;	// Reset & Disable
+	static const uint SCTL_CTL_RESET	= 0x40;	// Control Reset
+	static const uint SCTL_DIAG_MODE	= 0x20;	// Diag Mode
+	static const uint SCTL_ARBIT_EN		= 0x10;	// Arbitration Enable
+	static const uint SCTL_PARITY_EN	= 0x08;	// Parity Enable
+	static const uint SCTL_SEL_EN		= 0x04;	// Select Enable
+	static const uint SCTL_RESEL_EN		= 0x02;	// Reselect Enable
+	static const uint SCTL_INTR_EN		= 0x01;	// Interrupt Enable
 
 	// SCMD レジスタ
 	// 全ビットを保持。
 	uint8 scmd;
-	static const int SCMD_CMD_MASK		= 0xe0;	// Command code
-	static const int SCMD_RST_OUT		= 0x10;	// RST Out
-	static const int SCMD_INTERCEPT		= 0x08;	// Intersept Transfer
-	static const int SCMD_PROGRAM		= 0x04;	// Program Transfer
-	static const int SCMD_TERM_MODE		= 0x01;	// Termination Mode
+	static const uint SCMD_CMD_MASK		= 0xe0;	// Command code
+	static const uint SCMD_RST_OUT		= 0x10;	// RST Out
+	static const uint SCMD_INTERCEPT	= 0x08;	// Intersept Transfer
+	static const uint SCMD_PROGRAM		= 0x04;	// Program Transfer
+	static const uint SCMD_TERM_MODE	= 0x01;	// Termination Mode
 
 	// INTS レジスタ
 	//
@@ -70,69 +72,69 @@ struct SPC
 	// ints変数 |xfer|SEL |RESL|DIS |CMPL|SERV|TOUT|HERR|REST|
 	//
 	uint16 ints;
-	static const int INTS_SELECTED		= 0x80;	// Selected
-	static const int INTS_RESELECTED	= 0x40;	// Reselected
-	static const int INTS_DISCONNECTED	= 0x20;	// Disconnected
-	static const int INTS_COMPLETE		= 0x10;	// Command Complete
-	static const int INTS_SERV_REQ		= 0x08;	// Service Required
-	static const int INTS_TIMEOUT		= 0x04;	// Time Out
-	static const int INTS_HARD_ERR		= 0x02;	// SPC Hard Error
-	static const int INTS_RESET_COND	= 0x01;	// Reset Condition
+	static const uint INTS_SELECTED		= 0x80;	// Selected
+	static const uint INTS_RESELECTED	= 0x40;	// Reselected
+	static const uint INTS_DISCONNECTED	= 0x20;	// Disconnected
+	static const uint INTS_COMPLETE		= 0x10;	// Command Complete
+	static const uint INTS_SERV_REQ		= 0x08;	// Service Required
+	static const uint INTS_TIMEOUT		= 0x04;	// Time Out
+	static const uint INTS_HARD_ERR		= 0x02;	// SPC Hard Error
+	static const uint INTS_RESET_COND	= 0x01;	// Reset Condition
 
-	static const int INTS_XFER_OUT		= 0x100;	// SERR_XFER_OUT
+	static const uint INTS_XFER_OUT		= 0x100;	// SERR_XFER_OUT
 
 	// 割り込みマスク (INTS_RESET_COND はノンマスカブル割り込み)
 	uint16 ints_mask;
-	static const int INTS_ENABLE_MASK	= 0x01ff;
-	static const int INTS_DISABLE_MASK	= 0x0001;
+	static const uint INTS_ENABLE_MASK	= 0x01ff;
+	static const uint INTS_DISABLE_MASK	= 0x0001;
 
 	// PSNS レジスタ
 	uint8 psns;
-	static const int PSNS_REQ			= 0x80;
-	static const int PSNS_ACK			= 0x40;
-	static const int PSNS_ATN			= 0x20;
-	static const int PSNS_SEL			= 0x10;
-	static const int PSNS_BSY			= 0x08;
-	static const int PSNS_MSG			= 0x04;
-	static const int PSNS_CD			= 0x02;
-	static const int PSNS_IO			= 0x01;
+	static const uint PSNS_REQ			= 0x80;
+	static const uint PSNS_ACK			= 0x40;
+	static const uint PSNS_ATN			= 0x20;
+	static const uint PSNS_SEL			= 0x10;
+	static const uint PSNS_BSY			= 0x08;
+	static const uint PSNS_MSG			= 0x04;
+	static const uint PSNS_CD			= 0x02;
+	static const uint PSNS_IO			= 0x01;
 
 	// SDGC レジスタ
 	uint8 sdgc;
-	static const int SDGC_XFER_ENABLE	= 0x20;
+	static const uint SDGC_XFER_ENABLE	= 0x20;
 
 	// SSTS レジスタ
 	// 上位4ビットを保持。下位4ビットは読み出し時に生成。
 	uint8 ssts;
-	static const int SSTS_CONN_INIT		= 0x80;	// Connected (Initiator)
-	static const int SSTS_CONN_TARG		= 0x40;	// Connected (Target)
-	static const int SSTS_SPC_BUSY		= 0x20;	// SPC Busy
-	static const int SSTS_IN_PROGRESS	= 0x10;	// Transfer in Progress
-	static const int SSTS_RST_IN		= 0x08;	// SCSI RST In
-	static const int SSTS_TC_ZERO		= 0x04;	// TC=0
-	static const int SSTS_DREG_FULL		= 0x02;	// DREG Status (Full)
-	static const int SSTS_DREG_EMPTY	= 0x01;	// DREG Status (Empty)
+	static const uint SSTS_CONN_INIT	= 0x80;	// Connected (Initiator)
+	static const uint SSTS_CONN_TARG	= 0x40;	// Connected (Target)
+	static const uint SSTS_SPC_BUSY		= 0x20;	// SPC Busy
+	static const uint SSTS_IN_PROGRESS	= 0x10;	// Transfer in Progress
+	static const uint SSTS_RST_IN		= 0x08;	// SCSI RST In
+	static const uint SSTS_TC_ZERO		= 0x04;	// TC=0
+	static const uint SSTS_DREG_FULL	= 0x02;	// DREG Status (Full)
+	static const uint SSTS_DREG_EMPTY	= 0x01;	// DREG Status (Empty)
 
 	// SERR レジスタ
 	// XFER_OUT 以外の4つの有効ビットを保持。
 	// XFER_OUT は ints が担当している。
 	uint8 serr;
-	static const int SERR_DATAERR_SCSI	= 0x80;	// Data Error: SCSI
-	static const int SERR_DATAERR_SPC	= 0x40;	// Data Error: SPC
-	static const int SERR_XFER_OUT		= 0x20;	// Xfer Out
-	static const int SERR_TC_PARITY_ERR	= 0x08;	// TC Parity Error
-	static const int SERR_SHORT_XFER	= 0x02;	// Short Transfer Period
+	static const uint SERR_DATAERR_SCSI	= 0x80;	// Data Error: SCSI
+	static const uint SERR_DATAERR_SPC	= 0x40;	// Data Error: SPC
+	static const uint SERR_XFER_OUT		= 0x20;	// Xfer Out
+	static const uint SERR_TC_PARITY_ERR= 0x08;	// TC Parity Error
+	static const uint SERR_SHORT_XFER	= 0x02;	// Short Transfer Period
 
 	// PCTL レジスタ
 	// BusFree INT Enable は独立して保持。
 	// MSG, CD, IO の3ビットは pctl_out で保持。
 	bool busfree_intr_enable;
 	uint8 pctl_out;
-	static const int PCTL_MASK			= 0x87;	// 書き込みマスク
-	static const int PCTL_BFINT_EN		= 0x80;	// BusFree INT Enable
-	static const int PCTL_MSG			= 0x04;
-	static const int PCTL_CD			= 0x02;
-	static const int PCTL_IO			= 0x01;
+	static const uint PCTL_MASK			= 0x87;	// 書き込みマスク
+	static const uint PCTL_BFINT_EN		= 0x80;	// BusFree INT Enable
+	static const uint PCTL_MSG			= 0x04;
+	static const uint PCTL_CD			= 0x02;
+	static const uint PCTL_IO			= 0x01;
 
 	FixedQueue<uint8, 8> dreg;	// DREG レジスタ
 
@@ -149,36 +151,27 @@ struct SPC
 	}
 };
 
-class SPCDevice : public SCSIHostDevice
+class SPCDevice : public IODevice
 {
-	using inherited = SCSIHostDevice;
+	using inherited = IODevice;
  public:
 	SPCDevice();
-	virtual ~SPCDevice() override;
+	~SPCDevice() override;
 
+	bool Create() override;
 	bool Init() override;
 	void ResetHard(bool poweron) override;
 
-	// SCSIBus コールバック
-
-	// バスフリーになった (全員に通知される)
-	void BusFreeCB(int id) override;
-
-	// ターゲットがセレクションに応答した (イニシエータのみ通知される)
-	void SelectionAckCB() override;
-
-	// 情報転送フェーズで REQ を立てた (イニシエータのみ通知される)
-	void TransferReqCB() override;
+	SCSIHostDevice *GetSCSI() const { return scsi.get(); }
 
 	// BusIO インタフェース
 	// (内蔵 ROM からのアクセス用に特別に public にしてある)
-	uint64 Write(uint32 offset, uint32 data);
-
+	busdata WritePort(uint32 offset, uint32 data);
  protected:
-	// BusIO インタフェース
 	static const uint32 NPORT = 16;
-	uint64 Read(uint32 offset);
-	uint64 Peek(uint32 offset);
+	busdata ReadPort(uint32 offset);
+	busdata PeekPort(uint32 offset);
+	bool PokePort(uint32 offset, uint32 data);
 
  private:
 	DECLARE_MONITOR_CALLBACK(MonitorUpdate);
@@ -186,6 +179,15 @@ class SPCDevice : public SCSIHostDevice
 	void MonitorReg(TextScreen&,
 		int x, int y, uint32 reg, const char * const *names);
 
+	// バスフリーになった (SCSIHostDevice からのコールバック)
+	void BusFreeCallback(uint id);
+
+	// ターゲットがセレクションに応答した (SCSIHostDevice からのコールバック)
+	void SelectionAckCallback();
+
+	// 情報転送フェーズで REQ を立てた (SCSIHostDevice からのコールバック)
+	void TransferReqCallback();
+
 	// SCTL レジスタへの書き込み
 	void WriteSCTL(uint32);
 	// 割り込みマスクの再構成
@@ -223,8 +225,8 @@ class SPCDevice : public SCSIHostDevice
 	uint32 GetPCTL() const;
 
 	// DREG レジスタアクセス
-	uint64 ReadDREG();
-	uint64 WriteDREG(uint32 data);
+	busdata ReadDREG();
+	busdata WriteDREG(uint32 data);
 
 	// バスフリーフェーズに移行する
 	void BusFree();
@@ -262,21 +264,32 @@ class SPCDevice : public SCSIHostDevice
 	// VM 種別
 	VMType vmtype {};
 
+	// イニシエータの SCSI ID (参照箇所が多いのでコピー)
+	uint myid {};
+
 	// SPC に入力されるクロック周期 [nsec]
-	int t_CLF {};
+	uint64 t_CLF {};
 
 	// アクセスウェイト
-	uint32 read_wait {};
-	uint32 write_wait {};
+	busdata read_wait {};
+	busdata write_wait {};
+
+	// モニタ表示用
+	uint32 baseaddr {};
+	uint32 regoffset {};
 
 	// 割り込み信号線の接続先デバイス
 	InterruptDevice *interrupt {};
 
 	// イベント
-	Event event { this };
-	Event event_tc { this };
+	Event phase_event { this };
+	Event timer_event { this };
+
+	std::unique_ptr<SCSIHostDevice> scsi /*{}*/;
 
-	Monitor monitor { this };
+	Monitor *monitor {};
 };
 
-extern SPCDevice *gSPC;
+static inline SPCDevice *GetSPCDevice() {
+	return Object::GetObject<SPCDevice>(OBJ_SPC);
+}