--- nono/debugger/debugger_m680x0.h	2026/04/29 17:05:09	1.1.1.6
+++ nono/debugger/debugger_m680x0.h	2026/04/29 17:05:28	1.1.1.9
@@ -12,24 +12,21 @@
 
 #include "debugger_private.h"
 #include "mpu680x0.h"
-#include "m68030.h"
 #include "m68030disasm.h"
 
 class DebuggerMD_m680x0 : public DebuggerMD
 {
 	using inherited = DebuggerMD;
  public:
-	DebuggerMD_m680x0(Debugger *parent, m68kcpu *cpu);
+	explicit DebuggerMD_m680x0(Debugger *parent);
 	~DebuggerMD_m680x0() override;
 
-	void ReqSet(uint32 flag) override { /*TODO*/ }
-	void ReqClr(uint32 flag) override { /*TODO*/ }
-
-	bool IsSuper() const override { return cpu->reg.s; }
+	CPUState GetCPUState() const override { return (CPUState)cpu->GetState(); }
+	bool IsSuper() const override { return cpu->IsSuper(); }
 	bool MMUEnabled() const override { return cpu->mmu_enable; }
-	uint64 TranslateAddr(saddr_t laddr, bool lookup) const override;
+	busaddr TranslateAddr(busaddr laddr) const override;
 
-	uint32 GetPC() const override { return RegPC; }
+	uint32 GetPC() const override { return cpu->reg.pc; }
 
 	void SetStepOut() override;
 	bool IsStepOut() const override;
@@ -40,20 +37,12 @@ class DebuggerMD_m680x0 : public Debugge
 	const HelpMessages& GetHelpListReg() const override;
 	const HelpMessages& GetHelpReg() const override;
 
-	BranchHistory& GetBrHist() const override { return cpu->brhist; }
-	BranchHistory& GetExHist() const override { return cpu->exhist; }
-
 	bool CheckLEA(uint32 laddr) override { return false; }
 
-	bool Disassemble(DebuggerMemoryStream& mem,
-		std::string& mnemonic, std::vector<uint8>& bin) override;
-	std::string FormatDisasm(const std::string& mnemonic,
-		const std::vector<uint8>& bin) override;
-	std::string FormatDisasmLive(const std::string& mnemonic,
-		const std::vector<uint8>& bin) override;
+	std::string Disassemble(DebuggerMemoryStream& mem) override;
 
  private:
-	m68kcpu *cpu {};		// CPU コア
+	MPU680x0Device *cpu {};	// MPU デバイス
 	m68kreg prev {};		// 前回のレジスタセットのコピー
 
 	const char *CondStr(const std::vector<uint16>& ir);