--- nono/debugger/debugger_m88xx0.h 2026/04/29 17:04:40 1.1.1.4 +++ nono/debugger/debugger_m88xx0.h 2026/04/29 17:04:43 1.1.1.5 @@ -23,19 +23,20 @@ class DebuggerMD_m88xx0 : public Debugge bool IsSuper() const override { return (cpu->psr & m88100reg::PSR_SUPER); } bool MMUEnabled() const override; - uint64 TranslateAddr(saddr_t laddr) override; + uint64 TranslateAddr(saddr_t laddr, bool lookup) const override; // XXX ? uint32 GetPC() const override { return cpu->GetXIP(); } void SetStepOut() override; bool IsStepOut() const override; - bool IsOpStepIn(uint32 op) override; + bool IsOpStepIn(DebuggerMemoryStream& mem) override; uint64 GetRegAddr(const char *name) const override; void BackupRegs() override; bool ShowRegister(Console *cons, const std::vector& args) override; - const HelpMessages& GetRegisterHelp() const override; + const HelpMessages& GetHelpListReg() const override; + const HelpMessages& GetHelpReg() const override; BranchHistory& GetBrHist() const override { return cpu->brhist; } BranchHistory& GetExHist() const override { return cpu->exhist; } @@ -46,7 +47,7 @@ class DebuggerMD_m88xx0 : public Debugge return rv; } - bool Disassemble(saddr_t laddr, + bool Disassemble(DebuggerMemoryStream& mem, std::string& mnemonic, std::vector& bin) override; std::string FormatDisasm(const std::string& mnemonic, const std::vector& bin) override; @@ -59,11 +60,6 @@ class DebuggerMD_m88xx0 : public Debugge m88kcpu *cpu {}; // CPU コア m88100reg prev {}; // 前回のレジスタセットのコピー - // 前回アクセス時の論理ページ。.addr == 0xffffffff なら無効。 - // [0] が Inst、[1] が Data XXX とりあえず - saddr_t last_lpage[2] {}; - uint32 last_ppage[2] {}; - static bool IsBB0(uint32 op); static bool IsTB0(uint32 op); static bool IsBBTB0(uint32 op); @@ -72,7 +68,8 @@ class DebuggerMD_m88xx0 : public Debugge static bool IsBBTB1(uint32 op); const char *CondStr(uint32 op); - static const HelpMessages HelpMsgRegister; + static const HelpMessages HelpListReg; + static const HelpMessages HelpReg; bool MatchCMMUCmd(const std::string& cmdname, const char *name, int *); void ShowRegMain(Console *cons); void ShowRegCache(Console *cons, const std::vector& args,