diff options
| author | comex <comexk@gmail.com> | 2014-09-06 13:46:17 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2014-09-06 13:46:17 -0400 |
| commit | 30e577fda7e5279469744e23a4ed1dd9f843416b (patch) | |
| tree | 2b9ed6ab64bedbe55729c2971c235ada4744767c /Source/Core | |
| parent | 6c382f66278adcb8f84e0f7280e9d2479330526c (diff) | |
Revert "Merge pull request #993 from phire/fix_getOpInfo"
This reverts commit a8f724e7c2a920549ca1770c083f45abec8e0ec9, reversing
changes made to 7a1eca149fe2cba0ffc874297565a04c4f7f4675.
For why I'm reverting this entirely, see pull request 997.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/PPCTables.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index e4e28e984c..e82754ee19 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -41,22 +41,25 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst) int table = info->type>>24; switch (table) { - case 4: info = m_infoTable4[_inst.SUBOP10]; break; - case 19: info = m_infoTable19[_inst.SUBOP10]; break; - case 31: info = m_infoTable31[_inst.SUBOP10]; break; - case 59: info = m_infoTable59[_inst.SUBOP5]; break; - case 63: info = m_infoTable63[_inst.SUBOP10]; break; + case 4: return m_infoTable4[_inst.SUBOP10]; + case 19: return m_infoTable19[_inst.SUBOP10]; + case 31: return m_infoTable31[_inst.SUBOP10]; + case 59: return m_infoTable59[_inst.SUBOP5]; + case 63: return m_infoTable63[_inst.SUBOP10]; default: _assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC); return nullptr; } } - if ((info->type & 0xFFFFFF) == OPTYPE_INVALID) + else { - _assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC); - return nullptr; + if ((info->type & 0xFFFFFF) == OPTYPE_INVALID) + { + _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) |