--- nono/vm/cmmu.cpp	2026/04/29 17:04:35	1.1.1.1
+++ nono/vm/cmmu.cpp	2026/04/29 17:04:50	1.1.1.2
@@ -9,8 +9,8 @@
 #include "cmmu.h"
 #include "mpu88xx0.h"
 
-// CMMU が確定したらそっちのデバイスログから出力する。
 // CMMU が確定しない場合はこのデバイスのログを使う。
+// CMMU が確定したらそっちのデバイスログから出力する。
 
 std::unique_ptr<CMMUDevice> gCMMU;
 
@@ -72,47 +72,47 @@ CMMUDevice::Read32(uint32 addr)
 	switch (offset) {
 	 case IDR:
 		data = cmmu->GetIDR();
-		cmmu->putlog(2, "IDR  -> $%08x", data);
+		cmmu->putlogf(2, lstr("IDR  -> $%08x", data));
 		return data;
 
 	 case SCR:
 		data = cmmu->GetSCR();
-		cmmu->putlog(2, "SCR  -> $%08x", data);
+		cmmu->putlogf(2, lstr("SCR  -> $%08x", data));
 		return data;
 
 	 case SSR:
 		data = cmmu->GetSSR();
-		cmmu->putlog(2, "SSR  -> $%08x", data);
+		cmmu->putlogf(2, lstr("SSR  -> $%08x", data));
 		return data;
 
 	 case SAR:
 		data = cmmu->GetSAR();
-		cmmu->putlog(2, "SAR  -> $%08x", data);
+		cmmu->putlogf(2, lstr("SAR  -> $%08x", data));
 		return data;
 
 	 case SCTR:
 		data = cmmu->GetSCTR();
-		cmmu->putlog(2, "SCTR -> $%08x", data);
+		cmmu->putlogf(2, lstr("SCTR -> $%08x", data));
 		return data;
 
 	 case PFSR:
 		data = cmmu->GetPFSR();
-		cmmu->putlog(2, "PFSR -> $%08x", data);
+		cmmu->putlogf(2, lstr("PFSR -> $%08x", data));
 		return data;
 
 	 case PFAR:
 		data = cmmu->GetPFAR();
-		cmmu->putlog(2, "PFAR -> $%08x", data);
+		cmmu->putlogf(2, lstr("PFAR -> $%08x", data));
 		return data;
 
 	 case SAPR:
 		data = cmmu->GetSAPR();
-		cmmu->putlog(2, "SAPR -> $%08x", data);
+		cmmu->putlogf(2, lstr("SAPR -> $%08x", data));
 		return data;
 
 	 case UAPR:
 		data = cmmu->GetUAPR();
-		cmmu->putlog(2, "UAPR -> $%08x", data);
+		cmmu->putlogf(2, lstr("UAPR -> $%08x", data));
 		return data;
 
 	 case BWP0 ... BWP7:
@@ -125,7 +125,7 @@ CMMUDevice::Read32(uint32 addr)
 
 	 case CSSP:
 		data = cmmu->GetCSSP();
-		cmmu->putlog(2, "CSSP -> $%08x", data);
+		cmmu->putlogf(2, lstr("CSSP -> $%08x", data));
 		return data;
 
 	 default:
@@ -153,10 +153,11 @@ CMMUDevice::Write32(uint32 addr, uint32
 	 {
 		uint32 newid = data >> 24;
 		if (id != newid) {
-			cmmu->putlog(1, "ID 更新 $%02x", newid);
+			cmmu->putlogf(1, lstr("ID 更新 $%02x", newid));
 			cmmu->SetID(newid);
 		} else {
-			cmmu->putlog(2, "IDR 書き込み(ID変更なし) <- $%08x", data);
+			cmmu->putlogf(2, lstr("IDR 書き込み(ID変更なし) <- $%08x",
+				data));
 		}
 		return 0;
 	 }
@@ -166,12 +167,12 @@ CMMUDevice::Write32(uint32 addr, uint32
 		return 0;
 
 	 case SSR:
-		cmmu->putlog(1, "SSR  <- $%08x", data);
+		cmmu->putlogf(1, lstr("SSR  <- $%08x", data));
 		cmmu->SetSSR(data);
 		return 0;
 
 	 case SAR:
-		cmmu->putlog(2, "SAR  <- $%08x", data);
+		cmmu->putlogf(2, lstr("SAR  <- $%08x", data));
 		cmmu->SetSAR(data);
 		return 0;