diff options
Diffstat (limited to 'disassembler/disassembler_arm.cc')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 54e77612a3..6f8e08b3ba 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -82,14 +82,14 @@ void DisassemblerArm::DumpCond(std::ostream& os, uint32_t cond) { void DisassemblerArm::DumpMemoryDomain(std::ostream& os, uint32_t domain) { switch (domain) { - case 0b1111: os << "sy"; break; - case 0b1110: os << "st"; break; - case 0b1011: os << "ish"; break; - case 0b1010: os << "ishst"; break; - case 0b0111: os << "nsh"; break; - case 0b0110: os << "nshst"; break; - case 0b0011: os << "osh"; break; - case 0b0010: os << "oshst"; break; + case 15U /* 0b1111 */: os << "sy"; break; + case 14U /* 0b1110 */: os << "st"; break; + case 11U /* 0b1011 */: os << "ish"; break; + case 10U /* 0b1010 */: os << "ishst"; break; + case 7U /* 0b0111 */: os << "nsh"; break; + case 6U /* 0b0110 */: os << "nshst"; break; + case 3U /* 0b0011 */: os << "osh"; break; + case 2U /* 0b0010 */: os << "oshst"; break; } } @@ -269,7 +269,7 @@ void DisassemblerArm::DumpArm(std::ostream& os, const uint8_t* instr_ptr) { uint32_t op = (instruction >> 21) & 0xf; opcode = kDataProcessingOperations[op]; bool implicit_s = ((op & ~3) == 8); // TST, TEQ, CMP, and CMN. - bool is_mov = op == 0b1101 || op == 0b1111; + bool is_mov = op == 13U /* 0b1101 */ || op == 15U /* 0b1111 */; if (is_mov) { // Show only Rd and Rm. if (s) { |