From 40afbe19279820e59382b7460643c62398ba0fb8 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Wed, 5 Jan 2022 21:49:22 -0700 Subject: [PATCH] disassembler_thumb: fix formatting issues with fmt 8.1.x ... ... fmt 8.1.0 added more formatting checks and Cond can't be formatted directly now --- src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp index d5f43cb8..ec05b0dd 100644 --- a/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp +++ b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp @@ -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) {