archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #812 from FioraAeterna/fixundefined

Browse source 
JIT: don't rely on undefined behavior for constant overflow checking
This commit is contained in:
Dolphin Bot 2014-08-16 00:36:08 +02:00
commit 444e47a07a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Core/PowerPC/Jit64/Jit.h
View file

@ -94,6 +94,7 @@ public:
void Cleanup(); void Cleanup();
void GenerateConstantOverflow(bool overflow); void GenerateConstantOverflow(bool overflow);
void GenerateConstantOverflow(s64 val);
void GenerateOverflow(); void GenerateOverflow();
void FinalizeCarryOverflow(bool oe, bool inv = false); void FinalizeCarryOverflow(bool oe, bool inv = false);
void GetCarryEAXAndClear(); void GetCarryEAXAndClear();

12
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <limits>
#include <vector> #include <vector>
#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/Jit.h"
@ -10,6 +11,11 @@
using namespace Gen; using namespace Gen;
void Jit64::GenerateConstantOverflow(s64 val)
{
GenerateConstantOverflow(val > std::numeric_limits<s32>::max() || val < std::numeric_limits<s32>::min());
}
void Jit64::GenerateConstantOverflow(bool overflow) void Jit64::GenerateConstantOverflow(bool overflow)
{ {
if (overflow) if (overflow)
@ -925,7 +931,7 @@ void Jit64::subfx(UGeckoInstruction inst)
} }
if (inst.OE) if (inst.OE)
{ {
GenerateConstantOverflow((s64)(i - j) != (s64)i - (s64)j); GenerateConstantOverflow((s64)i - (s64)j);
} }
} }
else else
@ -1014,7 +1020,7 @@ void Jit64::mullwx(UGeckoInstruction inst)
gpr.SetImmediate32(d, i * j); gpr.SetImmediate32(d, i * j);
if (inst.OE) if (inst.OE)
{ {
GenerateConstantOverflow((s64)(i*j) != (s64)i * (s64)j); GenerateConstantOverflow((s64)i * (s64)j);
} }
} }
else else
@ -1330,7 +1336,7 @@ void Jit64::addx(UGeckoInstruction inst)
} }
if (inst.OE) if (inst.OE)
{ {
GenerateConstantOverflow((s64)(i + j) != (s64)i + (s64)j); GenerateConstantOverflow((s64)i + (s64)j);
} }
} }
else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.Rc && !inst.OE) else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.Rc && !inst.OE)