--- nono/vm/sysclk.cpp	2026/04/29 17:05:17	1.1.1.12
+++ nono/vm/sysclk.cpp	2026/04/29 17:05:28	1.1.1.15
@@ -24,15 +24,9 @@
 SysClkDevice::SysClkDevice()
 	: inherited(OBJ_SYSCLK)
 {
-	AddAlias("SysClk");
-
 	monitor.func = ToMonitorCallback(&SysClkDevice::MonitorUpdate);
-	monitor.SetSize(31, 2);
+	monitor.SetSize(31, 3);
 	monitor.Regist(ID_MONITOR_SYSCLK);
-
-	event.func = ToEventCallback(&SysClkDevice::Callback);
-	event.code = 0;
-	event.Regist("System Clock");
 }
 
 // デストラクタ
@@ -51,13 +45,19 @@ SysClkDevice::Init()
 	interrupt = GetInterruptDevice();
 
 	// クロックは機種ごとに異なる
-	const ConfigItem& item = gConfig->Find("!sysclk-period");
-	period = item.AsInt();
+	const ConfigItem& item = gConfig->Find("!sysclk-freq");
+	freq = item.AsInt();
+	period = 1_sec / freq;
 	event.time = period;
 
 	// クロックの同期方法
 	sync_rt = GetRTCDevice()->GetSyncRealtime();
 
+	event.func = ToEventCallback(&SysClkDevice::Callback);
+	event.code = 0;
+	event.SetName("System Clock");
+	scheduler->RegistEvent(event);
+
 	return true;
 }
 
@@ -72,34 +72,47 @@ SysClkDevice::ResetHard(bool poweron)
 		}
 
 		// 電源オンですぐ起動
-		sysint = false;
 		scheduler->RestartEvent(event);
 	}
+
+	// さすがに割り込みネゲートくらいするよな?
+	sysint = false;
+	ChangeInterrupt();
 }
 
-uint64
-SysClkDevice::Read(uint32 offset)
+busdata
+SysClkDevice::ReadPort(uint32 offset)
 {
 	// 1 ポートしかない
-	return GetInt();
+	busdata data = GetInt();
+	data |= BusData::Size1;
+	return data;
 }
 
-uint64
-SysClkDevice::Write(uint32 offset, uint32 data)
+busdata
+SysClkDevice::WritePort(uint32 offset, uint32 data)
 {
 	// 何か書き込まれたら、フラグをクリア
 	putlog(3, "Clear system clock interrupt");
 	sysint = false;
-	interrupt->NegateINT(this);
-	return 0;
+	ChangeInterrupt();
+
+	busdata r = BusData::Size1;
+	return r;
 }
 
-uint64
-SysClkDevice::Peek(uint32 offset)
+busdata
+SysClkDevice::PeekPort(uint32 offset)
 {
 	return GetInt();
 }
 
+bool
+SysClkDevice::PokePort(uint32 offset, uint32 data)
+{
+	return false;
+}
+
 void
 SysClkDevice::MonitorUpdate(Monitor *, TextScreen& screen)
 {
@@ -109,6 +122,7 @@ SysClkDevice::MonitorUpdate(Monitor *, T
 	y = 0;
 
 	int width = stime < 86400_sec ? 20 : 25;
+	screen.Print(0, y++, "Freq: %u Hz", freq);
 	screen.Print(0, y++, "Sync: %s", sync_rt ? "Real Time" : "Virtual Time");
 	screen.Print(0, y++, "Time: %*s", width, TimeToStr(stime).c_str());
 }
@@ -136,7 +150,7 @@ SysClkDevice::Callback(Event& ev)
 	stime += period;
 
 	sysint = true;
-	interrupt->AssertINT(this);
+	ChangeInterrupt();
 
 	if (sync_rt) {
 		scheduler->StartRealtimeEvent(ev, stime, period);
@@ -144,3 +158,10 @@ SysClkDevice::Callback(Event& ev)
 		scheduler->StartEvent(ev);
 	}
 }
+
+// 割り込み信号線の状態を変える。
+void
+SysClkDevice::ChangeInterrupt()
+{
+	interrupt->ChangeINT(this, sysint);
+}