--- nono/debugger/vectortable.h 2026/04/29 17:05:16 1.1.1.3 +++ nono/debugger/vectortable.h 2026/04/29 17:05:45 1.1.1.6 @@ -11,27 +11,24 @@ #pragma once #include "device.h" -#include "monitor.h" #include #include #include class MainbusDevice; -class MPUDevice; +class MainMPUDevice; +enum class VMType; class VectorTable : public Device { using inherited = Device; public: - VectorTable(VMType vmtype); + explicit VectorTable(VMType vmtype); ~VectorTable() override; bool Init() override; - // 例外名を返す (ベクタテーブル用) - const char *GetTableName(int vector) const; - // 例外名を返す (例外履歴用) const char *GetExceptionName(int vector) const; @@ -43,23 +40,24 @@ class VectorTable : public Device private: // 初期化 - void InitTableM68030(VMType vmtype); + void InitTableM680x0(VMType vmtype); void InitTableLuna88k(); // ベクタテーブル std::vector nametable {}; MainbusDevice *mainbus {}; - MPUDevice *mpu {}; + 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; };