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 #1005 from comex/revert-993 

Revert "Merge pull request #993 from phire/fix_getOpInfo"
This commit is contained in:
comex 2014-09-06 14:02:40 -04:00
parent 6c382f6627 30e577fda7
commit e8aa1fe052
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/PowerPC/PPCTables.cpp
View File

@ -41,22 +41,25 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
int table = info->type>>24; int table = info->type>>24;
switch (table) switch (table)
{ {
case 4: info = m_infoTable4[_inst.SUBOP10]; break; case 4: return m_infoTable4[_inst.SUBOP10];
case 19: info = m_infoTable19[_inst.SUBOP10]; break; case 19: return m_infoTable19[_inst.SUBOP10];
case 31: info = m_infoTable31[_inst.SUBOP10]; break; case 31: return m_infoTable31[_inst.SUBOP10];
case 59: info = m_infoTable59[_inst.SUBOP5]; break; case 59: return m_infoTable59[_inst.SUBOP5];
case 63: info = m_infoTable63[_inst.SUBOP10]; break; case 63: return m_infoTable63[_inst.SUBOP10];
default: default:
_assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC); _assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC);
return nullptr; return nullptr;
} }
} }
if ((info->type & 0xFFFFFF) == OPTYPE_INVALID) else
{ {
_assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC); if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
return nullptr; {
_assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC);
return nullptr;
}
return m_infoTable[_inst.OPCD];
} }
return info;
} }
Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst) Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst)