--- nono/hd64180/hd64180disasm.cpp 2026/04/29 17:05:34 1.1.1.3 +++ nono/hd64180/hd64180disasm.cpp 2026/04/29 17:06:02 1.1.1.5 @@ -10,6 +10,7 @@ #include "hd64180disasm.h" #include "debugger_memory.h" +#include "mystring.h" #define OP_DEF(name) void __CONCAT(hd64180disasm::op_,name)() #define OP_FUNC(name) __CONCAT(op_,name)() @@ -111,12 +112,12 @@ hd64180disasm::fetch2() std::string hd64180disasm::HL() { - static const char *name[] = { + static const char *hlname[] = { "HL", "IX", "IY", }; - return name[(uint)ixiy]; + return hlname[(uint)ixiy]; } // (HL)/(IX+d)/(IY+d) を出力する。 @@ -231,7 +232,7 @@ hd64180disasm::rrrsss(uint r) std::string hd64180disasm::fff() const { - static const char *name[] = { + static const char *fffname[] = { "NZ", "Z", "NC", @@ -242,7 +243,7 @@ hd64180disasm::fff() const "M", }; uint r = op_fff; - return name[r]; + return fffname[r]; } std::string