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 #7361 from BhaaLseN/jit-global 

Jit64: get rid of global g_jit accesses
This commit is contained in:
Mat M 2018-08-25 12:29:02 -04:00 committed by GitHub
parent 476037d1f2 5f95ed5263
commit 31b4461ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
View File

@ -72,7 +72,7 @@ void Jit64::psq_stXX(UGeckoInstruction inst)
else else
{ {
// Stash PC in case asm_routine causes exception // Stash PC in case asm_routine causes exception
MOV(32, PPCSTATE(pc), Imm32(g_jit->js.compilerPC)); MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
// We know what GQR is here, so we can load RSCRATCH2 and call into the store method directly // We know what GQR is here, so we can load RSCRATCH2 and call into the store method directly
// with just the scale bits. // with just the scale bits.
MOV(32, R(RSCRATCH2), Imm32(gqrValue & 0x3F00)); MOV(32, R(RSCRATCH2), Imm32(gqrValue & 0x3F00));
@ -86,7 +86,7 @@ void Jit64::psq_stXX(UGeckoInstruction inst)
else else
{ {
// Stash PC incase asm_routine causes exception // Stash PC incase asm_routine causes exception
MOV(32, PPCSTATE(pc), Imm32(g_jit->js.compilerPC)); MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
// Some games (e.g. Dirt 2) incorrectly set the unused bits which breaks the lookup table code. // Some games (e.g. Dirt 2) incorrectly set the unused bits which breaks the lookup table code.
// Hence, we need to mask out the unused bits. The layout of the GQR register is // Hence, we need to mask out the unused bits. The layout of the GQR register is
// UU[SCALE]UUUUU[TYPE] where SCALE is 6 bits and TYPE is 3 bits, so we have to AND with // UU[SCALE]UUUUU[TYPE] where SCALE is 6 bits and TYPE is 3 bits, so we have to AND with
@ -154,7 +154,7 @@ void Jit64::psq_lXX(UGeckoInstruction inst)
else else
{ {
// Stash PC in case asm_routine causes exception // Stash PC in case asm_routine causes exception
MOV(32, PPCSTATE(pc), Imm32(g_jit->js.compilerPC)); MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
// Get the high part of the GQR register // Get the high part of the GQR register
OpArg gqr = PPCSTATE(spr[SPR_GQR0 + i]); OpArg gqr = PPCSTATE(spr[SPR_GQR0 + i]);
gqr.AddMemOffset(2); gqr.AddMemOffset(2);