ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8187 from lioncash/disasm 

GekkoDisassmbler: Amend erroneous formatting specifiers
This commit is contained in:
Léo Lam 2019-06-16 16:19:30 +02:00 committed by GitHub
parent 2e3478a542 9952dfe293
commit 1550c098d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Common/GekkoDisassembler.cpp
View File

@ -153,10 +153,10 @@ static std::string ldst_offs(u32 val)
if (val & 0x8000) if (val & 0x8000)
{ {
return fmt::format("-0x{:.4X}", ((~val) & 0xffff) + 1); return fmt::format("-0x{:04X}", ((~val) & 0xffff) + 1);
} }
return fmt::format("0x{:.4X}", val); return fmt::format("0x{:04X}", val);
} }
static int SEX12(u32 x) static int SEX12(u32 x)
@ -376,7 +376,7 @@ std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
case 1: case 1:
if (hex) if (hex)
return fmt::format("{}, {}, 0x{:.4X}", regnames[PPCGETA(in)], regnames[PPCGETD(in)], i); return fmt::format("{}, {}, 0x{:04X}", regnames[PPCGETA(in)], regnames[PPCGETD(in)], i);
else else
return fmt::format("{}, {}, {}", regnames[PPCGETA(in)], regnames[PPCGETD(in)], i); return fmt::format("{}, {}, {}", regnames[PPCGETA(in)], regnames[PPCGETD(in)], i);
@ -385,7 +385,7 @@ std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
case 3: case 3:
if (hex) if (hex)
return fmt::format("{}, 0x{:.4X}", regnames[PPCGETD(in)], i); return fmt::format("{}, 0x{:04X}", regnames[PPCGETD(in)], i);
else else
return fmt::format("{}, {}", regnames[PPCGETD(in)], i); return fmt::format("{}, {}", regnames[PPCGETD(in)], i);
@ -569,9 +569,9 @@ void GekkoDisassembler::bc(u32 in)
branch(in, "", (in & 2) ? 1 : 0, d); branch(in, "", (in & 2) ? 1 : 0, d);
if (in & 2) // AA ? if (in & 2) // AA ?
m_operands = fmt::format("{} ->0x{:.8X}", m_operands, d); m_operands = fmt::format("{} ->0x{:08X}", m_operands, d);
else else
m_operands = fmt::format("{} ->0x{:.8X}", m_operands, *m_iaddr + d); m_operands = fmt::format("{} ->0x{:08X}", m_operands, *m_iaddr + d);
m_type = PPCINSTR_BRANCH; m_type = PPCINSTR_BRANCH;
m_displacement = d; m_displacement = d;
@ -587,9 +587,9 @@ void GekkoDisassembler::bli(u32 in)
m_opcode = fmt::format("b{}", b_ext[in & 3]); m_opcode = fmt::format("b{}", b_ext[in & 3]);
if (in & 2) // AA ? if (in & 2) // AA ?
m_operands = fmt::format("->0x{:.8X}", d); m_operands = fmt::format("->0x{:08X}", d);
else else
m_operands = fmt::format("->0x{:.8X}", *m_iaddr + d); m_operands = fmt::format("->0x{:08X}", *m_iaddr + d);
m_type = PPCINSTR_BRANCH; m_type = PPCINSTR_BRANCH;
m_displacement = d; m_displacement = d;