The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 23:41:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

JitIL_Tables: Eliminate usages of the JIT global

Browse Source
This commit is contained in:
Lioncash 2017-01-22 05:17:45 -05:00
parent 3ee31890d3
commit b0605c24d3
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -639,7 +639,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitBloc
ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address));
} }
JitILTables::CompileInstruction(ops[i]); JitILTables::CompileInstruction(*this, ops[i]);
if (jo.memcheck && (opinfo->flags & FL_LOADSTORE)) if (jo.memcheck && (opinfo->flags & FL_LOADSTORE))
{ {

11
Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
View File

@ -378,26 +378,25 @@ static GekkoOPTemplate table63_2[] = {
namespace JitILTables namespace JitILTables
{ {
void CompileInstruction(PPCAnalyst::CodeOp& op) void CompileInstruction(JitIL& jit, PPCAnalyst::CodeOp& op)
{ {
JitIL* jitil = (JitIL*)g_jit; (jit.*dynaOpTable[op.inst.OPCD])(op.inst);
(jitil->*dynaOpTable[op.inst.OPCD])(op.inst);
GekkoOPInfo* info = op.opinfo; GekkoOPInfo* info = op.opinfo;
if (info) if (info)
{ {
#ifdef OPLOG #ifdef OPLOG
if (!strcmp(info->opname, OP_TO_LOG)) // "mcrfs" if (!strcmp(info->opname, OP_TO_LOG)) // "mcrfs"
{ {
rsplocations.push_back(g_jit.js.compilerPC); rsplocations.push_back(jit.js.compilerPC);
} }
#endif #endif
info->compileCount++; info->compileCount++;
info->lastUse = g_jit->js.compilerPC; info->lastUse = jit.js.compilerPC;
} }
else else
{ {
PanicAlert("Tried to compile illegal (or unknown) instruction %08x, at %08x", op.inst.hex, PanicAlert("Tried to compile illegal (or unknown) instruction %08x, at %08x", op.inst.hex,
g_jit->js.compilerPC); jit.js.compilerPC);
} }
} }

4
Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
class JitIL;
namespace PPCAnalyst namespace PPCAnalyst
{ {
struct CodeOp; struct CodeOp;
@ -11,6 +13,6 @@ struct CodeOp;
namespace JitILTables namespace JitILTables
{ {
void CompileInstruction(PPCAnalyst::CodeOp& op); void CompileInstruction(JitIL& jit, PPCAnalyst::CodeOp& op);
void InitTables(); void InitTables();
} }