--- nono/debugger/vectortable.h 2026/04/29 17:05:28 1.1.1.4 +++ nono/debugger/vectortable.h 2026/04/29 17:05:45 1.1.1.6 @@ -11,13 +11,13 @@ #pragma once #include "device.h" -#include "monitor.h" #include #include #include class MainbusDevice; class MainMPUDevice; +enum class VMType; class VectorTable : public Device { @@ -29,9 +29,6 @@ class VectorTable : public Device bool Init() override; - // 例外名を返す (ベクタテーブル用) - const char *GetTableName(int vector) const; - // 例外名を返す (例外履歴用) const char *GetExceptionName(int vector) const; @@ -43,7 +40,7 @@ class VectorTable : public Device private: // 初期化 - void InitTableM68030(VMType vmtype); + void InitTableM680x0(VMType vmtype); void InitTableLuna88k(); // ベクタテーブル @@ -53,13 +50,14 @@ class VectorTable : public Device MainMPUDevice *mpu {}; // モニタ - Monitor monitor { this }; + Monitor *monitor {}; // 初期値 - static std::array name_m68030; + static std::array name_m680x0; static std::map name_x68030; static std::map name_luna1; static std::map name_news; + static std::map name_virt68k; static std::array name_luna88k; };