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

microVU: minor cleanups 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1631 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2009-08-16 05:24:02 +00:00
parent 1c37a9abf4
commit e0aaf5569a
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pcsx2/x86/microVU_Branch.inl
View File

@ -79,18 +79,35 @@ microVUt(void) mVUendProgram(mV, microFlagCycles* mFC, int isEbit) {
// Recompiles Code for Proper Flags and Q/P regs on Block Linkings // Recompiles Code for Proper Flags and Q/P regs on Block Linkings
microVUt(void) mVUsetupBranch(mV, microFlagCycles& mFC) { microVUt(void) mVUsetupBranch(mV, microFlagCycles& mFC) {
mVUprint("mVUsetupBranch");
// Flush Allocated Regs mVU->regAlloc->flushAll(); // Flush Allocated Regs
mVU->regAlloc->flushAll(); mVUsetupFlags(mVU, mFC); // Shuffle Flag Instances
// Shuffle Flag Instances
mVUsetupFlags(mVU, mFC);
// Shuffle P/Q regs since every block starts at instance #0 // Shuffle P/Q regs since every block starts at instance #0
if (mVU->p || mVU->q) { SSE2_PSHUFD_XMM_to_XMM(xmmPQ, xmmPQ, shufflePQ); } if (mVU->p || mVU->q) { SSE2_PSHUFD_XMM_to_XMM(xmmPQ, xmmPQ, shufflePQ); }
} }
void normBranchCompile(microVU* mVU, u32 branchPC) {
using namespace x86Emitter;
microBlock* pBlock;
blockCreate(branchPC/8);
pBlock = mVUblocks[branchPC/8]->search((microRegInfo*)&mVUregs);
if (pBlock) { xJMP(pBlock->x86ptrStart); }
else { mVUcompile(mVU, branchPC, (uptr)&mVUregs); }
}
void normBranch(mV, microFlagCycles& mFC) {
incPC(-3); // Go back to branch opcode (to get branch imm addr)
// E-bit Branch
if (mVUup.eBit) { iPC = branchAddr/4; mVUendProgram(mVU, &mFC, 1); return; }
// Normal Branch
mVUsetupBranch(mVU, mFC);
normBranchCompile(mVU, branchAddr);
}
void condBranch(mV, microFlagCycles& mFC, microBlock* &pBlock, int JMPcc) { void condBranch(mV, microFlagCycles& mFC, microBlock* &pBlock, int JMPcc) {
using namespace x86Emitter; using namespace x86Emitter;
mVUsetupBranch(mVU, mFC); mVUsetupBranch(mVU, mFC);
@ -115,14 +132,9 @@ void condBranch(mV, microFlagCycles& mFC, microBlock* &pBlock, int JMPcc) {
bBlock = mVUblocks[iPC/2]->search((microRegInfo*)&mVUregs); bBlock = mVUblocks[iPC/2]->search((microRegInfo*)&mVUregs);
incPC2(-1); incPC2(-1);
if (bBlock) { // Branch non-taken has already been compiled if (bBlock) { // Branch non-taken has already been compiled
xJcc( xInvertCond((JccComparisonType)JMPcc), bBlock->x86ptrStart ); xJcc(xInvertCond((JccComparisonType)JMPcc), bBlock->x86ptrStart);
// Check if branch-block has already been compiled
incPC(-3); // Go back to branch opcode (to get branch imm addr) incPC(-3); // Go back to branch opcode (to get branch imm addr)
blockCreate(branchAddr/8); normBranchCompile(mVU, branchAddr);
pBlock = mVUblocks[branchAddr/8]->search((microRegInfo*)&mVUregs);
if (pBlock) { xJMP( pBlock->x86ptrStart ); }
else { mVUblockFetch(mVU, branchAddr, (uptr)&mVUregs); }
} }
else { else {
s32* ajmp = xJcc32((JccComparisonType)JMPcc); s32* ajmp = xJcc32((JccComparisonType)JMPcc);
@ -141,41 +153,20 @@ void condBranch(mV, microFlagCycles& mFC, microBlock* &pBlock, int JMPcc) {
} }
} }
void normBranch(mV, microFlagCycles& mFC) {
using namespace x86Emitter;
microBlock* pBlock;
incPC(-3); // Go back to branch opcode (to get branch imm addr)
// E-bit Branch
if (mVUup.eBit) { iPC = branchAddr/4; mVUendProgram(mVU, &mFC, 1); return; }
mVUsetupBranch(mVU, mFC);
// Check if branch-block has already been compiled
blockCreate(branchAddr/8);
pBlock = mVUblocks[branchAddr/8]->search((microRegInfo*)&mVUregs);
if (pBlock) { xJMP(pBlock->x86ptrStart); }
else { mVUcompile(mVU, branchAddr, (uptr)&mVUregs); }
}
void normJump(mV, microFlagCycles& mFC, microBlock* &pBlock) { void normJump(mV, microFlagCycles& mFC, microBlock* &pBlock) {
using namespace x86Emitter; using namespace x86Emitter;
mVUprint("mVUcompile JR/JALR"); mVUprint("mVUcompile JR/JALR");
incPC(-3); // Go back to jump opcode incPC(-3); // Go back to jump opcode
if (mVUlow.constJump.isValid) { if (mVUlow.constJump.isValid) { // Jump Address is Constant
if (mVUup.eBit) { // E-bit Jump if (mVUup.eBit) { // E-bit Jump
iPC = (mVUlow.constJump.regValue*2)&(mVU->progSize-1); iPC = (mVUlow.constJump.regValue*2)&(mVU->progSize-1);
mVUendProgram(mVU, &mFC, 1); mVUendProgram(mVU, &mFC, 1);
return;
} }
else {
int jumpAddr = (mVUlow.constJump.regValue*8)&(mVU->microMemSize-8); int jumpAddr = (mVUlow.constJump.regValue*8)&(mVU->microMemSize-8);
mVUsetupBranch(mVU, mFC); mVUsetupBranch(mVU, mFC);
// Check if jump-to-block has already been compiled normBranchCompile(mVU, jumpAddr);
blockCreate(jumpAddr/8);
pBlock = mVUblocks[jumpAddr/8]->search((microRegInfo*)&mVUregs);
if (pBlock) { xJMP(pBlock->x86ptrStart); }
else { mVUcompile(mVU, jumpAddr, (uptr)&mVUregs); }
}
return; return;
} }
@ -191,8 +182,8 @@ void normJump(mV, microFlagCycles& mFC, microBlock* &pBlock) {
mVUsetupBranch(mVU, mFC); mVUsetupBranch(mVU, mFC);
mVUbackupRegs(mVU); mVUbackupRegs(mVU);
MOV32MtoR(gprT2, (uptr)&mVU->branch); // Get startPC (ECX first argument for __fastcall) MOV32MtoR(gprT2, (uptr)&mVU->branch); // Get startPC (ECX 1st argument for __fastcall)
MOV32ItoR(gprR, (u32)&pBlock->pStateEnd); // Get pState (EDX second argument for __fastcall) MOV32ItoR(gprR, (u32)&pBlock->pStateEnd); // Get pState (EDX 2nd argument for __fastcall)
if (!mVU->index) xCALL(mVUcompileJIT<0>); //(u32 startPC, uptr pState) if (!mVU->index) xCALL(mVUcompileJIT<0>); //(u32 startPC, uptr pState)
else xCALL(mVUcompileJIT<1>); else xCALL(mVUcompileJIT<1>);