return 0x80;\r
case 0x1f801100:
- hard = psxRcntRcount(0);
+ hard = psxRcntRcount0();
#ifdef PSXHW_LOG
PSXHW_LOG("T0 count read16: %x\n", hard);
#endif
#endif
return hard;
case 0x1f801110:
- hard = psxRcntRcount(1);
+ hard = psxRcntRcount1();
#ifdef PSXHW_LOG
PSXHW_LOG("T1 count read16: %x\n", hard);
#endif
#endif
return hard;
case 0x1f801120:
- hard = psxRcntRcount(2);
+ hard = psxRcntRcount2();
#ifdef PSXHW_LOG
PSXHW_LOG("T2 count read16: %x\n", hard);
#endif
// falthrough
default:
if (0x1f801c00 <= add && add < 0x1f802000)
- return SPU_readRegister(add);
+ return SPU_readRegister(add, psxRegs.cycle);
hard = psxHu16(add);
#ifdef PSXHW_LOG
PSXHW_LOG("*Unkwnown 16bit read at address %x\n", add);
// time for rootcounters :)
case 0x1f801100:
- hard = psxRcntRcount(0);
+ hard = psxRcntRcount0();
#ifdef PSXHW_LOG
PSXHW_LOG("T0 count read32: %x\n", hard);
#endif
#endif
return hard;
case 0x1f801110:
- hard = psxRcntRcount(1);
+ hard = psxRcntRcount1();
#ifdef PSXHW_LOG
PSXHW_LOG("T1 count read32: %x\n", hard);
#endif
#endif
return hard;
case 0x1f801120:
- hard = psxRcntRcount(2);
+ hard = psxRcntRcount2();
#ifdef PSXHW_LOG
PSXHW_LOG("T2 count read32: %x\n", hard);
#endif
// falthrough
default:
if (0x1f801c00 <= add && add < 0x1f802000) {
- hard = SPU_readRegister(add);
- hard |= SPU_readRegister(add + 2) << 16;
+ hard = SPU_readRegister(add, psxRegs.cycle);
+ hard |= SPU_readRegister(add + 2, psxRegs.cycle) << 16;
return hard;
}
hard = psxHu32(add);