ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The r5799 workaround is no longer necessary with r6792 + r6795. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6798 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-09 19:39:43 +00:00
parent 81638396c0
commit 26d0f58aec
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -100,11 +100,6 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void
{ {
// a == 0, which for these instructions imply value = 0 // a == 0, which for these instructions imply value = 0
gpr.SetImmediate32(d, value); gpr.SetImmediate32(d, value);
#ifdef __APPLE__
// XXX soren
// FIXME: Seems to be required on OS X (see r5799)
gpr.StoreFromRegister(d);
#endif
} }
else else
{ {
@ -143,20 +138,12 @@ void Jit64::reg_imm(UGeckoInstruction inst)
if (!js.isLastInstruction) { if (!js.isLastInstruction) {
if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) { // addi if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) { // addi
gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16); gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16);
#ifdef __APPLE__
// FIXME: Seems to be required on OS X (see r5799)
gpr.StoreFromRegister(d);
#endif
js.downcountAmount++; js.downcountAmount++;
js.skipnext = true; js.skipnext = true;
break; break;
} }
else if ((js.next_inst.OPCD == 24) && (js.next_inst.RA == d) && (js.next_inst.RS == d)) { // ori else if ((js.next_inst.OPCD == 24) && (js.next_inst.RA == d) && (js.next_inst.RS == d)) { // ori
gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) | (u32)js.next_inst.UIMM); gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) | (u32)js.next_inst.UIMM);
#ifdef __APPLE__
// FIXME: Seems to be required on OS X (see r5799)
gpr.StoreFromRegister(d);
#endif
js.downcountAmount++; js.downcountAmount++;
js.skipnext = true; js.skipnext = true;
break; break;