--- nono/debugger/debugger_m680x0.cpp	2026/04/29 17:04:40	1.1.1.4
+++ nono/debugger/debugger_m680x0.cpp	2026/04/29 17:04:43	1.1.1.5
@@ -13,7 +13,7 @@
 
 // コンストラクタ
 DebuggerMD_m680x0::DebuggerMD_m680x0(Debugger *parent_, m68kcpu *cpu_)
-	: inherited(parent_)
+	: inherited(parent_, Debugger::Arch::M680x0)
 {
 	cpu = cpu_;
 
@@ -21,9 +21,6 @@ DebuggerMD_m680x0::DebuggerMD_m680x0(Deb
 	vector_max = 256;
 	inst_bytes = 2;
 	inst_bytes_fixed = 0;
-
-	// 奇数にしておくことで初回に必ずアドレス変換を起こさせる。
-	last_lpage.addr = 0xffffffff;
 }
 
 // デストラクタ
@@ -33,28 +30,16 @@ DebuggerMD_m680x0::~DebuggerMD_m680x0()
 
 // アドレス変換
 uint64
-DebuggerMD_m680x0::TranslateAddr(saddr_t laddr)
+DebuggerMD_m680x0::TranslateAddr(saddr_t laddr, bool lookup) const
 {
-	uint64 paddr;
+	uint fc;
 
-	// ページ境界(と初回)でアドレス変換
-	saddr_t lpage;
-	lpage.addr  = laddr.addr & cpu->mmu_tc.lmask;
-	lpage.super = laddr.super;
-	if (lpage.GetSaddr() != last_lpage.GetSaddr()) {
-		last_lpage = lpage;
-		uint32 fc2 = (lpage.super ? FC_SUPER : 0) | FC_PROG;	// DATAは?
-
-		bool do_search = laddr.IsSearch();
-		paddr = m68030_mmu_translate_peek(cpu, laddr.addr, fc2, do_search);
-		if ((int64)paddr < 0) {
-			last_lpage.addr = 0xffffffff;
-		}
-		last_ppage = paddr & cpu->mmu_tc.lmask;
-	} else {
-		paddr = last_ppage | (laddr.addr & cpu->mmu_tc.pgmask);
+	fc = laddr.IsData() ? FC_DATA : FC_PROG;
+	if (laddr.IsSuper()) {
+		fc |= FC_SUPER;
 	}
-	return paddr;
+
+	return m68030_mmu_translate_peek(cpu, (uint32)laddr, fc, lookup);
 }
 
 // op が 68030 の条件命令 Bcc, Scc, TRAPcc, DBcc なら true を返す。
@@ -190,8 +175,10 @@ DebuggerMD_m680x0::IsStepOut() const
 
 // この命令がステップイン出来るなら true を返す
 bool
-DebuggerMD_m680x0::IsOpStepIn(uint32 op)
+DebuggerMD_m680x0::IsOpStepIn(DebuggerMemoryStream& mem)
 {
+	uint32 op = mem.FetchInst();
+
 	if ((op & 0xfff0) == 0x4e40		// TRAP
 	 || (op == 0x4e76)				// TRAPV
 	 || (op & 0xffc0) == 0x4e80		// JSR
@@ -205,11 +192,7 @@ DebuggerMD_m680x0::IsOpStepIn(uint32 op)
 	// IOCS コール(に逆アセンブラで見えるやつ)も一命令扱いにしておく。
 	// XXX 本当は X68k の時だけだが今の所副作用なさげなので
 	if ((op & 0xff00) == 0x7000) {	// MOVEQ to %d0
-		saddr_t laddr;
-		laddr.addr = GetPC() + 2;
-		laddr.logical = true;
-		laddr.super = IsSuper();
-		uint32 op2 = PeekFetch(laddr);
+		uint32 op2 = mem.FetchInst();
 		if (op2 == 0x4e4f) {		// TRAP #15
 			return true;
 		}
@@ -265,7 +248,7 @@ DebuggerMD_m680x0::GetRegAddr(const char
 
 // レジスタ表示系コマンドのヘルプ
 /*static*/ const HelpMessages
-DebuggerMD_m680x0::HelpMsgRegister = {
+DebuggerMD_m680x0::HelpListReg = {
 	{ "r",		"Show general registers" },
 	{ "ra",		"Show ATC" },
 	{ "rf",		"Show FPU registers" },
@@ -273,10 +256,56 @@ DebuggerMD_m680x0::HelpMsgRegister = {
 	{ "ro",		"Show other registers" },
 };
 
+/*static*/ const HelpMessages
+DebuggerMD_m680x0::HelpReg = {
+	//-----
+	{ "r", R"**(
+	Command: r
+
+	Shows main registers.
+	)**" },
+
+	//-----
+	{ "ra", R"**(
+	Command: ra
+
+	Shows m68030 ATC(Address Translation Cache) information.  Note that
+	nono's ATC implementation is very different from the real one (to
+	improve performance).
+	)**" },
+
+	//-----
+	{ "rf", R"**(
+	Command: rf
+
+	Shows 68881/68882's FPU registers.
+	)**" },
+
+	//-----
+	{ "rm", R"**(
+	Command: rm
+
+	Shows registers related to MMU and cache.
+	)**" },
+
+	//-----
+	{ "ro", R"**(
+	Command: ro
+
+	Shows other registers.
+	)**" },
+};
+
+const HelpMessages&
+DebuggerMD_m680x0::GetHelpListReg() const
+{
+	return HelpListReg;
+}
+
 const HelpMessages&
-DebuggerMD_m680x0::GetRegisterHelp() const
+DebuggerMD_m680x0::GetHelpReg() const
 {
-	return HelpMsgRegister;
+	return HelpReg;
 }
 
 // レジスタ表示系コマンド
@@ -597,11 +626,11 @@ DebuggerMD_m680x0::ShowRegOther(Console
 
 // 逆アセンブル
 bool
-DebuggerMD_m680x0::Disassemble(saddr_t laddr,
+DebuggerMD_m680x0::Disassemble(DebuggerMemoryStream& mem,
 	std::string& mnemonic, std::vector<uint8>& bin)
 {
-	m680x0disasm dis(this);
-	if (dis.Exec(laddr) == false) {
+	m680x0disasm dis(mem);
+	if (dis.Exec() == false) {
 		return false;
 	}
 	mnemonic = dis.text;