case 3:
delayWrite(reg, bpc); return;
}
+ // DS
psxBSC[psxRegs.code >> 26](&psxRegs, psxRegs.code);
branch = 0;
addCycle();
// check for load delay
- tmp = psxRegs.code >> 26;
+ tmp = code >> 26;
switch (tmp) {
case 0x10: // COP0
switch (_Rs_) {
break;
}
- psxBSC[psxRegs.code >> 26](&psxRegs, psxRegs.code);
+ psxBSC[code >> 26](&psxRegs, code);
branch = 0;
psxRegs.pc = branchPC;
* Register branch logic *
* Format: OP rs, offset *
*********************************************************/
-#define RepZBranchi32(op) if(_i32(_rRs_) op 0) doBranch(_BranchTarget_);
-#define RepZBranchLinki32(op) { _SetLink(31); if(_i32(_rRs_) op 0) { doBranch(_BranchTarget_); } }
+#define RepZBranchi32(op) \
+ if(_i32(_rRs_) op 0) \
+ doBranch(_BranchTarget_);
+#define RepZBranchLinki32(op) { \
+ s32 temp = _i32(_rRs_); \
+ _SetLink(31); \
+ if(temp op 0) \
+ doBranch(_BranchTarget_); \
+}
OP(psxBGEZ) { RepZBranchi32(>=) } // Branch if Rs >= 0
OP(psxBGEZAL) { RepZBranchLinki32(>=) } // Branch if Rs >= 0 and link
*********************************************************/
OP(psxBREAK) {
regs_->pc -= 4;
- psxException(0x24, branch);
+ psxException(0x24, branch, ®s_->CP0);
}
OP(psxSYSCALL) {
regs_->pc -= 4;
- psxException(0x20, branch);
+ psxException(0x20, branch, ®s_->CP0);
}
static inline void psxTestSWInts(psxRegisters *regs_) {
if (regs_->CP0.n.Cause & regs_->CP0.n.Status & 0x0300 &&
regs_->CP0.n.Status & 0x1) {
regs_->CP0.n.Cause &= ~0x7c;
- psxException(regs_->CP0.n.Cause, branch);
+ psxException(regs_->CP0.n.Cause, branch, ®s_->CP0);
}
}
}
OP(psxREGIMM) {
- switch (_Rt_) {
- case 0x00: psxBLTZ(regs_, code); break;
- case 0x01: psxBGEZ(regs_, code); break;
+ u32 rt = _Rt_;
+ switch (rt) {
case 0x10: psxBLTZAL(regs_, code); break;
case 0x11: psxBGEZAL(regs_, code); break;
- default: psxNULL_(); break;
+ default:
+ if (rt & 1)
+ psxBGEZ(regs_, code);
+ else
+ psxBLTZ(regs_, code);
}
}
execI_(memRLUT, regs_);
}
-void intExecuteBlock() {
+void intExecuteBlock(enum blockExecCaller caller) {
psxRegisters *regs_ = &psxRegs;
u8 **memRLUT = psxMemRLUT;