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

GekkoDisassembler: Correct disassembly of fabs, fnabs, and fneg 

These three instructions use the B field (bits 16-20 of the opcode)
to determine what the operand register is. However, the code was
using the path that uses the C field (bits 21-25).

This amends the code to use the B field (and also fixes the 64-bit PPC
opcodes, because why not?).

Fixes issue 10683.
This commit is contained in:
Lioncash 2017-12-03 23:51:08 -05:00
parent 8bcc392d5d
commit de82330a74
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

@ -907,12 +907,12 @@ void GekkoDisassembler::fdabc(u32 in, const char* name, int mask, unsigned char
if (mask & 4)
m_operands += StringFromFormat("f%d,", (int)PPCGETA(in));
else
else if ((mask & 8) == 0)
err |= (int)PPCGETA(in);
if (mask & 2)
m_operands += StringFromFormat("f%d,", (int)PPCGETC(in));
else if (PPCGETC(in))
else if (PPCGETC(in) && (mask & 8) == 0)
err |= (int)PPCGETC(in);
if (mask & 1)
@ -2193,7 +2193,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
break;
case 40:
fdabc(in, "neg", 10, 0);
fdabc(in, "neg", 9, 0);
break;
case 64:
@ -2221,11 +2221,11 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
break;
case 136:
fdabc(in, "nabs", 10, 0);
fdabc(in, "nabs", 9, 0);
break;
case 264:
fdabc(in, "abs", 10, 0);
fdabc(in, "abs", 9, 0);
break;
case 583:
@ -2249,15 +2249,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
break;
case 814:
fdabc(in, "fctid", 10, PPCF_64);
fdabc(in, "fctid", 9, PPCF_64);
break;
case 815:
fdabc(in, "fctidz", 10, PPCF_64);
fdabc(in, "fctidz", 9, PPCF_64);
break;
case 846:
fdabc(in, "fcfid", 10, PPCF_64);
fdabc(in, "fcfid", 9, PPCF_64);
break;
default: