summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorCrystalGamma <dolphin@crystalgamma.de>2018-12-22 23:09:16 +0100
committerCrystalGamma <dolphin@crystalgamma.de>2019-04-11 10:03:36 +0200
commite12cdbefa592a576af85b6da4be82a3cad257559 (patch)
treeba36edaa54f3503226ecf096ae3fb7d582e8d97f /Source/Core
parent5a4700f58987fc6c36799e4f168cb180fdebc09c (diff)
PowerPC: Thread state through PS dequantize helper
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/PowerPC/Interpreter/Interpreter.h1
-rw-r--r--Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp17
2 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
index 61c87e60a7..9561f948e0 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
@@ -292,7 +292,6 @@ private:
static void Helper_UpdateCR0(u32 value);
// paired helper
- static void Helper_Dequantize(u32 addr, u32 instI, u32 instRD, u32 instW);
static void Helper_Quantize(u32 addr, u32 instI, u32 instRS, u32 instW);
static void Helper_FloatCompareOrdered(UGeckoInstruction inst, double a, double b);
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
index af96d59df7..60ded043bb 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -245,9 +245,10 @@ std::pair<float, float> LoadAndDequantize(u32 addr, u32 instW, u32 ldScale)
return {ps0, ps1};
}
-void Interpreter::Helper_Dequantize(u32 addr, u32 instI, u32 instRD, u32 instW)
+static void Helper_Dequantize(PowerPC::PowerPCState* ppcs, u32 addr, u32 instI, u32 instRD,
+ u32 instW)
{
- UGQR gqr(rSPR(SPR_GQR0 + instI));
+ UGQR gqr(ppcs->spr[SPR_GQR0 + instI]);
EQuantizeType ldType = gqr.ld_type;
unsigned int ldScale = gqr.ld_scale;
@@ -296,12 +297,12 @@ void Interpreter::Helper_Dequantize(u32 addr, u32 instI, u32 instRD, u32 instW)
break;
}
- if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+ if (ppcs->Exceptions & EXCEPTION_DSI)
{
return;
}
- rPS(instRD).SetBoth(ps0, ps1);
+ ppcs->ps[instRD].SetBoth(ps0, ps1);
}
void Interpreter::psq_l(UGeckoInstruction inst)
@@ -313,7 +314,7 @@ void Interpreter::psq_l(UGeckoInstruction inst)
}
const u32 EA = inst.RA ? (rGPR[inst.RA] + inst.SIMM_12) : (u32)inst.SIMM_12;
- Helper_Dequantize(EA, inst.I, inst.RD, inst.W);
+ Helper_Dequantize(&PowerPC::ppcState, EA, inst.I, inst.RD, inst.W);
}
void Interpreter::psq_lu(UGeckoInstruction inst)
@@ -325,7 +326,7 @@ void Interpreter::psq_lu(UGeckoInstruction inst)
}
const u32 EA = rGPR[inst.RA] + inst.SIMM_12;
- Helper_Dequantize(EA, inst.I, inst.RD, inst.W);
+ Helper_Dequantize(&PowerPC::ppcState, EA, inst.I, inst.RD, inst.W);
if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
{
@@ -367,7 +368,7 @@ void Interpreter::psq_stu(UGeckoInstruction inst)
void Interpreter::psq_lx(UGeckoInstruction inst)
{
const u32 EA = inst.RA ? (rGPR[inst.RA] + rGPR[inst.RB]) : rGPR[inst.RB];
- Helper_Dequantize(EA, inst.Ix, inst.RD, inst.Wx);
+ Helper_Dequantize(&PowerPC::ppcState, EA, inst.Ix, inst.RD, inst.Wx);
}
void Interpreter::psq_stx(UGeckoInstruction inst)
@@ -379,7 +380,7 @@ void Interpreter::psq_stx(UGeckoInstruction inst)
void Interpreter::psq_lux(UGeckoInstruction inst)
{
const u32 EA = rGPR[inst.RA] + rGPR[inst.RB];
- Helper_Dequantize(EA, inst.Ix, inst.RD, inst.Wx);
+ Helper_Dequantize(&PowerPC::ppcState, EA, inst.Ix, inst.RD, inst.Wx);
if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
{