From 47c3d945aa63f1167d6954febf6a6d705b1d9fdc Mon Sep 17 00:00:00 2001 From: Eladash Date: Wed, 16 Oct 2019 06:50:09 +0300 Subject: [PATCH] spu/ppu-diasm: Fixup for #6772, #6722 --- rpcs3/Emu/Cell/PPUDisAsm.cpp | 6 ++++++ rpcs3/Emu/Cell/SPUDisAsm.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUDisAsm.cpp b/rpcs3/Emu/Cell/PPUDisAsm.cpp index 96ddc315ec..3675e17e79 100644 --- a/rpcs3/Emu/Cell/PPUDisAsm.cpp +++ b/rpcs3/Emu/Cell/PPUDisAsm.cpp @@ -71,6 +71,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bns"; break; default: ASSUME(0); break; } + break; } case 0b00110: { @@ -83,6 +84,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bns"; break; default: ASSUME(0); break; } + break; } case 0b00111: { @@ -95,6 +97,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bns"; break; default: ASSUME(0); break; } + break; } case 0b01100: { @@ -106,6 +109,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bso"; break; default: ASSUME(0); break; } + break; } case 0b01110: { @@ -118,6 +122,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bso"; break; default: ASSUME(0); break; } + break; } case 0b01111: { @@ -130,6 +135,7 @@ constexpr std::pair get_BC_info(u32 bo, u32 bi) case 0x3: info.first = "bso"; break; default: ASSUME(0); break; } + break; } //case 0b10100: //{ diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/Emu/Cell/SPUDisAsm.h index ae8b2e7e0e..67e8bab172 100644 --- a/rpcs3/Emu/Cell/SPUDisAsm.h +++ b/rpcs3/Emu/Cell/SPUDisAsm.h @@ -148,11 +148,11 @@ private: using field_de_t = decltype(spu_opcode_t{}.de); void DisAsm(std::string op, field_de_t de, const char* a1) { - Write(fmt::format("%s%s %s", FixOp(op).c_str(), BrIndirectSuffix(de), a1)); + Write(fmt::format("%s %s", FixOp(op.append(BrIndirectSuffix(de))).c_str(), a1)); } void DisAsm(std::string op, field_de_t de, const char* a1, const char* a2) { - Write(fmt::format("%s%s %s", FixOp(op).c_str(), BrIndirectSuffix(de), a1, a2)); + Write(fmt::format("%s %s", FixOp(op.append(BrIndirectSuffix(de))).c_str(), a1, a2)); } public: