Merge pull request #658 from liushuyu/master

disassembler_thumb: fix formatting issues with fmt 8.1.x
This commit is contained in:
Mai M 2022-01-06 00:17:16 -05:00 committed by GitHub
commit 1635958d06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -285,7 +285,7 @@ public:
// Sanity note: Here imm8.Bit<0>() is guaranteed to be == 1. (imm8 can never be 0bxxxx0000)
return std::make_tuple(imm8.Bit<3>() == firstcond0 ? "t" : "e", imm8.Bit<2>() == firstcond0 ? "t" : "e", imm8.Bit<1>() == firstcond0 ? "t" : "e");
}();
return fmt::format("it{}{}{} {}", x, y, z, firstcond);
return fmt::format("it{}{}{} {}", x, y, z, CondToString(firstcond));
}
std::string thumb16_SXTH(Reg m, Reg d) {