--- nono/m88xx0/m88100disasm.cpp	2026/04/29 17:05:15	1.1.1.9
+++ nono/m88xx0/m88100disasm.cpp	2026/04/29 17:05:47	1.1.1.11
@@ -41,7 +41,7 @@ m88100disasm::Exec(DebuggerMemoryStream
 	altarg1.clear();
 	altarg2.clear();
 
-	xip = (uint32)mem->laddr;
+	xip = mem->laddr.Addr();
 
 	opX = mem->Read(4);
 	uint32 op12 = M88100::op32_to_12(opX);
@@ -50,7 +50,6 @@ m88100disasm::Exec(DebuggerMemoryStream
 	 default:
 		name = "illegal";
 		break;
-		//OP_FUNC(illegal);
 	}
 
 	// 出力文字列(ダンプ)
@@ -176,19 +175,19 @@ m88100disasm::Exec(DebuggerMemoryStream
 std::string
 m88100disasm::rd()
 {
-	return string_format("r%d", (opX >> 21) & 0x1f);
+	return string_format("r%u", (opX >> 21) & 0x1f);
 }
 
 std::string
 m88100disasm::rs1()
 {
-	return string_format("r%d", (opX >> 16) & 0x1f);
+	return string_format("r%u", (opX >> 16) & 0x1f);
 }
 
 std::string
 m88100disasm::rs2()
 {
-	return string_format("r%d", (opX      ) & 0x1f);
+	return string_format("r%u", (opX      ) & 0x1f);
 }
 
 std::string
@@ -227,7 +226,7 @@ m88100disasm::crs()
 	if (cr < countof(crnames)) {
 		return std::string(crnames[cr]);
 	} else {
-		return string_format("cr%d", cr);	// こうなのか?
+		return string_format("cr%u", cr);	// こうなのか?
 	}
 }
 
@@ -254,7 +253,7 @@ m88100disasm::fcrs()
 	} else if (cr == 63) {
 		return "fpcr";
 	} else {
-		return string_format("fcr%d", cr);
+		return string_format("fcr%u", cr);
 	}
 }
 
@@ -283,7 +282,7 @@ m88100disasm::wo5()
 {
 	uint32 w5 = W5 ?: 32;
 	uint32 o5 = O5;
-	return string_format("%d<%d>", w5, o5);
+	return string_format("%u<%u>", w5, o5);
 }
 
 // "Width<Offset>" 形式をビットマスク形式(数値)にして返す
@@ -315,7 +314,7 @@ m88100disasm::cio()
 std::string
 m88100disasm::b5()
 {
-	return string_format("#%d", B5);
+	return string_format("#%u", B5);
 }
 
 std::string
@@ -332,7 +331,7 @@ m88100disasm::m5()
 	 default:
 		break;
 	}
-	return string_format("#%d", m);
+	return string_format("#%u", m);
 }
 
 // M5(,rS1) に対する代替ニーモニックを返す。empty なら代替ニーモニックなし。
@@ -1276,7 +1275,7 @@ OP_DEF(ext_1)
 		if (DD != S1) {
 			altarg1 = rs1();
 		}
-		altarg2 = string_format("#%d", O5);
+		altarg2 = string_format("#%u", O5);
 	} else {
 		altname = "bfexts";
 		altarg0 = rd();
@@ -1316,7 +1315,7 @@ OP_DEF(extu_1)
 		if (DD != S1) {
 			altarg1 = rs1();
 		}
-		altarg2 = string_format("#%d", O5);
+		altarg2 = string_format("#%u", O5);
 	} else {
 		altname = "bfextu";
 		altarg0 = rd();
@@ -1356,7 +1355,7 @@ OP_DEF(mak_1)
 		if (DD != S1) {
 			altarg1 = rs1();
 		}
-		altarg2 = string_format("#%d", O5);
+		altarg2 = string_format("#%u", O5);
 	} else {
 		// XXX 名前から動作が想像しづらいのがつらいのだが、とりあえず後回し
 		altname = "bfmak";
@@ -1374,7 +1373,7 @@ OP_DEF(rot_1)
 	name = "rot";
 	arg0 = rd();
 	arg1 = rs1();
-	arg2 = string_format("<%d>", O5);
+	arg2 = string_format("<%u>", O5);
 
 	// rd s1 offset
 	// ----------
@@ -1413,7 +1412,7 @@ OP_DEF(rot_1)
 		if (DD != S1) {
 			altarg1 = rs1();
 		}
-		altarg2 = string_format("#%d", offset);
+		altarg2 = string_format("#%u", offset);
 	}
 }