diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-04-12 13:43:12 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-04-12 13:43:12 +0000 |
| commit | d4055b971b9a6a04c8a07fa8cbbdb49c1e2a6c6f (patch) | |
| tree | a62c879bfaa7af88a236bfd72d9a96f542327249 /Source/Core/DSPCore/Src/disassemble.cpp | |
| parent | f6474b98a85877aae2b7c0c8485e280bbf68053a (diff) | |
DSP asm/disasm: improve the shift instructions so they at least round-trip. not 100% sure it's correct though.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2957 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/disassemble.cpp')
| -rw-r--r-- | Source/Core/DSPCore/Src/disassemble.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/DSPCore/Src/disassemble.cpp b/Source/Core/DSPCore/Src/disassemble.cpp index 3c5e14ffb8..3a3cb298cb 100644 --- a/Source/Core/DSPCore/Src/disassemble.cpp +++ b/Source/Core/DSPCore/Src/disassemble.cpp @@ -46,10 +46,7 @@ char* gd_dis_params(gd_globals_t* gdg, const DSPOPCTemplate* opc, u16 op1, u16 o for (int j = 0; j < opc->param_count; j++) { if (j > 0) - { - sprintf(buf, ", "); - buf += strlen(buf); - } + buf += sprintf(buf, ", "); if (opc->params[j].loc >= 1) val = op2; @@ -63,8 +60,7 @@ char* gd_dis_params(gd_globals_t* gdg, const DSPOPCTemplate* opc, u16 op1, u16 o else val = val >> opc->params[j].lshift; - u32 type; - type = opc->params[j].type; + u32 type = opc->params[j].type; if ((type & 0xff) == 0x10) type &= 0xff00; @@ -106,7 +102,7 @@ char* gd_dis_params(gd_globals_t* gdg, const DSPOPCTemplate* opc, u16 op1, u16 o if (opc->params[j].size != 2) { if (opc->params[j].mask == 0x007f) // LSL, LSR, ASL, ASR - sprintf(buf, "#%d", val < 64 ? val : -(0x80 - (s32)val)); + sprintf(buf, "#%d", (val & 0x40) ? (val | 0xFFFFFFC0) : val); else sprintf(buf, "#0x%02x", val); } |