Revert much of the last commit.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3455 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-06-15 20:07:09 +00:00
parent a83a4fbc0a
commit f2a26f550e

View File

@ -221,47 +221,47 @@ void Jit64::bcctrx(UGeckoInstruction inst)
// JIT needs currently does not implement this opcode,
// so we will fall back to the interpretor
Default(inst);
// Default(inst);
//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITBranchOff)
// {Default(inst); return;} // turn off from debugger
if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITBranchOff)
{Default(inst); return;} // turn off from debugger
//INSTRUCTION_START;
INSTRUCTION_START;
//gpr.Flush(FLUSH_ALL);
//fpr.Flush(FLUSH_ALL);
gpr.Flush(FLUSH_ALL);
fpr.Flush(FLUSH_ALL);
//// bool fastway = true;
// bool fastway = true;
//if ((inst.BO & 16) == 0)
//{
// PanicAlert("Bizarro bcctrx %08x, not supported.", inst.hex);
// _assert_msg_(DYNA_REC, 0, "Bizarro bcctrx");
// /*
// fastway = false;
// MOV(32, M(&PC), Imm32(js.compilerPC+4));
// MOV(32, R(EAX), M(&CR));
// XOR(32, R(ECX), R(ECX));
// AND(32, R(EAX), Imm32(0x80000000 >> inst.BI));
if ((inst.BO & 16) == 0)
{
PanicAlert("Bizarro bcctrx %08x, not supported.", inst.hex);
_assert_msg_(DYNA_REC, 0, "Bizarro bcctrx");
/*
fastway = false;
MOV(32, M(&PC), Imm32(js.compilerPC+4));
MOV(32, R(EAX), M(&CR));
XOR(32, R(ECX), R(ECX));
AND(32, R(EAX), Imm32(0x80000000 >> inst.BI));
// CCFlags branch;
// if(inst.BO & 8)
// branch = CC_NZ;
// else
// branch = CC_Z;
// */
// // TODO(ector): Why is this commented out?
// //SETcc(branch, R(ECX));
// // check for EBX
// //TEST(32, R(ECX), R(ECX));
// //linkEnd = J_CC(branch);
//}
//// NPC = CTR & 0xfffffffc;
//MOV(32, R(EAX), M(&CTR));
//if (inst.LK)
// MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4;
//AND(32, R(EAX), Imm32(0xFFFFFFFC));
//WriteExitDestInEAX(0);
CCFlags branch;
if(inst.BO & 8)
branch = CC_NZ;
else
branch = CC_Z;
*/
// TODO(ector): Why is this commented out?
//SETcc(branch, R(ECX));
// check for EBX
//TEST(32, R(ECX), R(ECX));
//linkEnd = J_CC(branch);
}
// NPC = CTR & 0xfffffffc;
MOV(32, R(EAX), M(&CTR));
if (inst.LK)
MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4;
AND(32, R(EAX), Imm32(0xFFFFFFFC));
WriteExitDestInEAX(0);
}