From 2918c8615667da9ba403c8890e304999b171392c Mon Sep 17 00:00:00 2001 From: Oxore Date: Sun, 21 May 2023 13:49:21 +0300 Subject: Prepare for clang-format --- disasm.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/disasm.cpp b/disasm.cpp index b20fd03..6004582 100644 --- a/disasm.cpp +++ b/disasm.cpp @@ -1335,9 +1335,8 @@ static size_t disasm_cmpm(DisasmNode &node, const uint16_t instr) const OpSize opsize = static_cast((instr >> 6) & 3); // Must be already handled by parent call assert(opsize != OpSize::kInvalid); - const int m = (instr >> 3) & 7; - assert(m == 1); - (void) m; + // M has to be set to 0b001 + assert(((instr >> 3) & 7) == 1); const int xn = instr & 7; const int xi = (instr >> 9) & 7; const auto src = Arg::AnAddrIncr(xn); @@ -1917,10 +1916,12 @@ int Op::FPrint( OpcodeSNPrintf(mnemonic_str, kMnemonicBufferSize, opcode, condition, size_spec); if (arg1.type != ArgType::kNone) { char arg1_str[kArgsBufferSize]{}; - arg1.SNPrint(arg1_str, kArgsBufferSize, ref_kinds & (kRef1Mask | kRefPcRelFix2Bytes), self_addr, ref1_addr); + const RefKindMask ref1_kinds = ref_kinds & (kRef1Mask | kRefPcRelFix2Bytes); + arg1.SNPrint(arg1_str, kArgsBufferSize, ref1_kinds, self_addr, ref1_addr); if (arg2.type != ArgType::kNone) { char arg2_str[kArgsBufferSize]{}; - arg2.SNPrint(arg2_str, kArgsBufferSize, ref_kinds & (kRef2Mask | kRefPcRelFix2Bytes), self_addr, ref2_addr); + const RefKindMask ref2_kinds = ref_kinds & (kRef2Mask | kRefPcRelFix2Bytes); + arg2.SNPrint(arg2_str, kArgsBufferSize, ref2_kinds, self_addr, ref2_addr); return fprintf(stream, " %s %s,%s", mnemonic_str, arg1_str, arg2_str); } else { return fprintf(stream, " %s %s", mnemonic_str, arg1_str); -- cgit v1.2.3