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

JitIL: Added code which deal with psq_st/psq_l in the case of inst.W == 1. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6092 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nodchip 2010-08-12 12:31:15 +00:00
parent a26f744c98
commit 0c1977dc45
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
View File

@ -145,6 +145,7 @@ enum Opcode {
StoreDouble, StoreDouble,
StoreFReg, StoreFReg,
FDCmpCR, FDCmpCR,
CFloatOne, // Store 1.0f into the specified floating register
// "Trinary" operators // "Trinary" operators
// FIXME: Need to change representation! // FIXME: Need to change representation!
@ -513,6 +514,9 @@ public:
InstLoc EmitFDCmpCR(InstLoc op1, InstLoc op2) { InstLoc EmitFDCmpCR(InstLoc op1, InstLoc op2) {
return FoldBiOp(FDCmpCR, op1, op2); return FoldBiOp(FDCmpCR, op1, op2);
} }
InstLoc EmitCFloatOne() {
return FoldZeroOp(CFloatOne, 0);
}
InstLoc EmitLoadGQR(unsigned gqr) { InstLoc EmitLoadGQR(unsigned gqr) {
return FoldZeroOp(LoadGQR, gqr); return FoldZeroOp(LoadGQR, gqr);
} }

11
Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
View File

@ -725,6 +725,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak
case LoadDouble: case LoadDouble:
case LoadSingle: case LoadSingle:
case LoadPaired: case LoadPaired:
case CFloatOne:
if (thisUsed) if (thisUsed)
regMarkUse(RI, I, getOp1(I), 1); regMarkUse(RI, I, getOp1(I), 1);
break; break;
@ -1169,6 +1170,16 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak
regNormalRegClear(RI, I); regNormalRegClear(RI, I);
break; break;
} }
case CFloatOne: {
if (!thisUsed) break;
X64Reg reg = fregFindFreeReg(RI);
static const float one = 1.0f;
Jit->MOV(32, R(ECX), Imm32(*(u32*)&one));
Jit->MOVD_xmm(reg, R(ECX));
RI.fregs[reg] = I;
regNormalRegClear(RI, I);
break;
}
case LoadDouble: { case LoadDouble: {
if (!thisUsed) break; if (!thisUsed) break;
X64Reg reg = fregFindFreeReg(RI); X64Reg reg = fregFindFreeReg(RI);

14
Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
View File

@ -38,7 +38,6 @@ void JitIL::psq_st(UGeckoInstruction inst)
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(LoadStorePaired) JITDISABLE(LoadStorePaired)
if (js.memcheck) { Default(inst); return; } if (js.memcheck) { Default(inst); return; }
if (inst.W) {Default(inst); return;}
IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val; IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val;
if (inst.RA) if (inst.RA)
addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA)); addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
@ -46,7 +45,14 @@ void JitIL::psq_st(UGeckoInstruction inst)
ibuild.EmitStoreGReg(addr, inst.RA); ibuild.EmitStoreGReg(addr, inst.RA);
val = ibuild.EmitLoadFReg(inst.RS); val = ibuild.EmitLoadFReg(inst.RS);
val = ibuild.EmitCompactMRegToPacked(val); val = ibuild.EmitCompactMRegToPacked(val);
ibuild.EmitStorePaired(val, addr, inst.I); if (inst.W == 0) {
ibuild.EmitStorePaired(val, addr, inst.I);
} else {
IREmitter::InstLoc addr4 = ibuild.EmitAdd(addr, ibuild.EmitIntConst(4));
IREmitter::InstLoc backup = ibuild.EmitLoad32(addr4);
ibuild.EmitStorePaired(val, addr, inst.I);
ibuild.EmitStore32(backup, addr4);
}
} }
void JitIL::psq_l(UGeckoInstruction inst) void JitIL::psq_l(UGeckoInstruction inst)
@ -54,13 +60,15 @@ void JitIL::psq_l(UGeckoInstruction inst)
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(LoadStorePaired) JITDISABLE(LoadStorePaired)
if (js.memcheck) { Default(inst); return; } if (js.memcheck) { Default(inst); return; }
if (inst.W) {Default(inst); return;}
IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val; IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val;
if (inst.RA) if (inst.RA)
addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA)); addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
if (inst.OPCD == 57) if (inst.OPCD == 57)
ibuild.EmitStoreGReg(addr, inst.RA); ibuild.EmitStoreGReg(addr, inst.RA);
val = ibuild.EmitLoadPaired(addr, inst.I); val = ibuild.EmitLoadPaired(addr, inst.I);
if (inst.W) {
val = ibuild.EmitFPMerge00(val, ibuild.EmitCFloatOne());
}
val = ibuild.EmitExpandPackedToMReg(val); val = ibuild.EmitExpandPackedToMReg(val);
ibuild.EmitStoreFReg(val, inst.RD); ibuild.EmitStoreFReg(val, inst.RD);
} }