Removed one of the extraneous conditions from JIT64 UnsafeLoadToEAX.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6339 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-11-04 11:43:44 +00:00
parent 4b0d4ded98
commit de62a190f1
2 changed files with 1 additions and 10 deletions

View File

@ -54,8 +54,6 @@ void Jit64::lfs(UGeckoInstruction inst)
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(LoadStoreFloating) JITDISABLE(LoadStoreFloating)
Default(inst); return;
int d = inst.RD; int d = inst.RD;
int a = inst.RA; int a = inst.RA;
if (!a) if (!a)
@ -66,10 +64,7 @@ void Jit64::lfs(UGeckoInstruction inst)
s32 offset = (s32)(s16)inst.SIMM_16; s32 offset = (s32)(s16)inst.SIMM_16;
if (jo.assumeFPLoadFromMem) if (jo.assumeFPLoadFromMem)
{ {
gpr.FlushLockX(ABI_PARAM1); UnsafeLoadToEAX(gpr.R(a), 32, offset, false);
MOV(32, R(ABI_PARAM1), gpr.R(a));
UnsafeLoadRegToReg(ABI_PARAM1, EAX, 32, offset, false);
gpr.UnlockAllX();
} }
else else
{ {

View File

@ -78,10 +78,6 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize,
{ {
MOVZX(32, accessSize, EAX, MComplex(RBX, opAddress.GetSimpleReg(), SCALE_1, offset)); MOVZX(32, accessSize, EAX, MComplex(RBX, opAddress.GetSimpleReg(), SCALE_1, offset));
} }
else if (opAddress.IsImm() && (((u32)opAddress.offset + offset) < 0x80000000)) // MDisp can only be used with s32 offsets
{
MOVZX(32, accessSize, EAX, MDisp(RBX, (u32)opAddress.offset + offset));
}
else else
{ {
MOV(32, R(EAX), opAddress); MOV(32, R(EAX), opAddress);