--- nono/m88xx0/m88100disasm.h 2026/04/29 17:05:11 1.1.1.7 +++ nono/m88xx0/m88100disasm.h 2026/04/29 17:05:15 1.1.1.8 @@ -7,19 +7,16 @@ #pragma once #include "disasm.h" -#include "m88100.h" -class m88100disasm final : public Disasm +class m88100disasm final : public DisasmLine { - using inherited = Disasm; + using inherited = DisasmLine; public: - m88100disasm(DebuggerMemoryStream& mem); + m88100disasm(); ~m88100disasm() override; - bool Exec() override; - - // 別名 - std::string alttext {}; + // 逆アセンブルを実行 + bool Exec(DebuggerMemoryStream *mem_) override; // 別ニーモニックを使うなら true (グローバル) static bool use_altname; @@ -49,13 +46,15 @@ class m88100disasm final : public Disasm std::string fsize(uint32 t); std::string fsize(); std::string wo5(); + uint32 wo5mask(); std::string cio(); std::string b5(); std::string m5(); + std::string alt_m5(); std::string vec9(); void ops_bb(std::string namebase); - void ops_bcnd(std::string namebase); + void ops_bcnd(std::string n); void ops_tb(std::string namebase); void ops_ldst_imm(const std::string& namebase); void ops_ldst_reg(const std::string& namebase, std::string suffix);