From 4897af4f78f086e8040045855867230d60cac750 Mon Sep 17 00:00:00 2001 From: crueter Date: Thu, 16 Oct 2025 21:00:28 -0400 Subject: [PATCH] delete the formatter again Signed-off-by: crueter --- src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp | 2 +- src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp | 2 +- src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp | 2 +- src/dynarmic/src/dynarmic/ir/opcodes.h | 10 ---------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp index fb306336cf..22eed19be2 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp @@ -145,7 +145,7 @@ A32EmitX64::BlockDescriptor A32EmitX64::Emit(IR::Block& block) { #undef OPCODE #undef A32OPC #undef A64OPC - default: [[unlikely]] ASSERT_FALSE("Invalid opcode: {}", inst->GetOpcode()); + default: [[unlikely]] ASSERT_FALSE("Invalid opcode: {}", std::size_t(inst->GetOpcode())); } reg_alloc.EndOfAllocScope(); func(reg_alloc); diff --git a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp index 1e673338a8..1dc622abd9 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp @@ -130,7 +130,7 @@ A64EmitX64::BlockDescriptor A64EmitX64::Emit(IR::Block& block) noexcept { #undef A32OPC #undef A64OPC default: [[unlikely]] { - ASSERT_MSG(false, "Invalid opcode: {}", opcode); + ASSERT_MSG(false, "Invalid opcode: {}", std::size_t(opcode)); goto finish_this_inst; } } diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp index 3bc93e6fd5..47cf0a8b5c 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp @@ -59,7 +59,7 @@ std::optional EmitX64::GetBasicBlock(IR::LocationDescr } void EmitX64::EmitInvalid(EmitContext&, IR::Inst* inst) { - ASSERT_MSG(false, "Invalid opcode: {}", inst->GetOpcode()); + ASSERT_MSG(false, "Invalid opcode: {:x}", std::size_t(inst->GetOpcode())); } void EmitX64::EmitVoid(EmitContext&, IR::Inst*) { diff --git a/src/dynarmic/src/dynarmic/ir/opcodes.h b/src/dynarmic/src/dynarmic/ir/opcodes.h index e22ccce119..7e41353213 100644 --- a/src/dynarmic/src/dynarmic/ir/opcodes.h +++ b/src/dynarmic/src/dynarmic/ir/opcodes.h @@ -654,13 +654,3 @@ constexpr bool MayGetNZCVFromOp(const Opcode op) noexcept { } } // namespace Dynarmic::IR - -template<> -struct fmt::formatter : fmt::formatter -{ - template - auto format(Dynarmic::IR::Opcode op, FormatContext& ctx) const - { - return formatter::format(Dynarmic::IR::GetNameOf(op), ctx); - } -};