--- nono/debugger/memdump.h 2026/04/29 17:05:28 1.1.1.4 +++ nono/debugger/memdump.h 2026/04/29 17:05:58 1.1.1.6 @@ -10,7 +10,7 @@ #pragma once -#include "monitor.h" +#include "object.h" #include "debugger_memory.h" class DisasmLine; @@ -29,9 +29,11 @@ class Memdump : public Object M68030PageShort, M68030PageLong, + M68040TableDesc, + M68040PageDesc, M88200Page, - M68030Disasm, + M680x0Disasm, M88100Disasm, HD64180Disasm, }; @@ -106,6 +108,8 @@ class Memdump : public Object IODevice *bus {}; static const char * const dtname[4]; + static const char * const udtname[4]; + static const char * const pdtname[4]; }; // メモリダンプ/逆アセンブルモニタ @@ -120,11 +124,13 @@ class MemdumpMonitor : public Memdump int GetPageOffset(int n) const; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); - void MonitorUpdateMemdump(TextScreen&, DebuggerMemoryStream&); - void MonitorUpdateDisasm(TextScreen&, DebuggerMemoryStream&); + void MonitorScreenMemdump(TextScreen&, DebuggerMemoryStream&); + void MonitorScreenDisasm(TextScreen&, DebuggerMemoryStream&); void Update68030PageShort(TextScreen&, int, int, const std::vector&); + void Update68040TableDesc(TextScreen&, int, int, const std::vector&); + void Update68040PageDesc(TextScreen&, int, int, const std::vector&); void Update88200Page(TextScreen&, int, int, const std::vector&); // 命令開始アドレス。 @@ -136,5 +142,5 @@ class MemdumpMonitor : public Memdump // を指している。 std::vector nextaddr {}; - Monitor monitor { this }; + Monitor *monitor {}; };