--- nono/m680x0/testdis.cpp	2026/04/29 17:04:44	1.1.1.5
+++ nono/m680x0/testdis.cpp	2026/04/29 17:05:15	1.1.1.6
@@ -5,6 +5,7 @@
 //
 
 #include "m68030disasm.h"
+#include "debugger_memory.h"
 #include "mystring.h"
 #include <vector>
 
@@ -829,23 +830,10 @@ struct {
 static uint8 ram[1024];
 static int failed;
 
-uint64
-vm_phys_peek_8(uint32 addr)
-{
-	assertmsg(addr < sizeof(ram), "addr=0x%x", addr);
-
-	// XXX endian
-	return ram[addr ^ 1];
-}
+#include "test_debugger_memory.cpp"
 
 // リンカを通すためのダミー
-extern uint64 m68030_mmu_translate_peek(m68kcpu *, uint32, uint);
-uint64
-m68030_mmu_translate_peek(m68kcpu *cpu, uint32 addr, uint fc)
-{
-	return -1;
-}
-Disasm::~Disasm() { }
+DisasmLine::~DisasmLine() { }
 DebuggerMD::~DebuggerMD() { }
 
 int
@@ -876,9 +864,9 @@ main(int ac, char *av[])
 		}
 		// 検査
 		saddr = 0x100;
-		DebuggerMemoryStream mem(md, saddr, MemoryMode::Physical);
-		m680x0disasm dis(mem);
-		dis.Exec();
+		m680x0disasm dis;
+		DebuggerMemoryStream mem(NULL, saddr);
+		dis.Exec(&mem);
 		// 照合
 		if (dis.text != expected) {
 			printf(">%s expects \"%s\" but \"%s\"\n", inst_str.c_str(),