diff options
-rw-r--r-- | common.h | 4 | ||||
-rw-r--r-- | disasm.cpp | 6 | ||||
-rw-r--r-- | main.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -12,8 +12,8 @@ struct Settings { bool raw_data_comment{}; }; -constexpr unsigned kRelocRelMask = 1; -constexpr unsigned kRelocAbsMask = 2; +constexpr unsigned kRefRelMask = 1; +constexpr unsigned kRefAbsMask = 2; constexpr size_t kInstructionSizeStepBytes = 2; constexpr size_t kRomSizeBytes = 4 * 1024 * 1024; constexpr size_t kDisasmMapSizeElements = kRomSizeBytes / kInstructionSizeStepBytes; @@ -1769,7 +1769,7 @@ int Arg::SNPrint( case ArgType::kLong: { const char c = type == ArgType::kLong ? 'l' : 'w'; - if (ref_kinds & kRelocAbsMask) { + if (ref_kinds & kRefAbsMask) { if (static_cast<uint32_t>(lword) == ref_addr) { return snprintf(buf, bufsz, ".L%08x:%c", ref_addr, c); } else { @@ -1782,7 +1782,7 @@ int Arg::SNPrint( } } case ArgType::kD16PCAddr: - if (ref_kinds & kRelocRelMask) { + if (ref_kinds & kRefRelMask) { if (static_cast<uint32_t>(self_addr + d16_pc.d16 + kInstructionSizeStepBytes) == ref_addr) { return snprintf(buf, bufsz, "%%pc@(.L%08x:w)", ref_addr); } else { @@ -1805,7 +1805,7 @@ int Arg::SNPrint( case ArgType::kRegMaskPredecrement: return snprint_reg_mask(buf, bufsz, uword, type); case ArgType::kDisplacement: - if (ref_kinds & kRelocRelMask) { + if (ref_kinds & kRefRelMask) { if (static_cast<uint32_t>(self_addr + lword) == ref_addr) { return snprintf(buf, bufsz, ".L%08x", ref_addr); } else { @@ -230,8 +230,8 @@ static void RenderDisassembly( const auto *referenced = disasm_map.FindNodeByOffset(node->ref_addr); if (with_reference && referenced) { const uint32_t ref_addr = referenced->offset; - const unsigned ref_kinds = ((s.abs_marks ? kRelocAbsMask : 0) | - (s.rel_marks ? kRelocRelMask : 0)); + const unsigned ref_kinds = ((s.abs_marks ? kRefAbsMask : 0) | + (s.rel_marks ? kRefRelMask : 0)); node->op.FPrint(output, ref_kinds, node->offset, ref_addr); } else { node->op.FPrint(output); |