void psxHwWriteIstat(u32 value)
{
- u32 stat = psxHu16(0x1070) & SWAPu16(value);
+ u32 stat = psxHu16(0x1070) & value;
psxHu16ref(0x1070) = SWAPu16(stat);
psxRegs.CP0.n.Cause &= ~0x400;
{
u32 stat = psxHu16(0x1070);
psxHu16ref(0x1074) = SWAPu16(value);
- if (stat & SWAPu16(value)) {
+ if (stat & value) {
//if ((psxRegs.CP0.n.SR & 0x401) == 0x401)
// log_unhandled("irq on unmask @%08x\n", psxRegs.pc);
new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
log_unhandled("unhandled r8 %08x @%08x\n", add, psxRegs.pc);
// falthrough
default:
- if (0x1f801c00 <= add && add < 0x1f802000)
- log_unhandled("spu r8 %02x @%08x\n", add, psxRegs.pc);
+ if (0x1f801c00 <= add && add < 0x1f802000) {
+ u16 val = SPU_readRegister(add & ~1, psxRegs.cycle);
+ hard = (add & 1) ? val >> 8 : val;
+ break;
+ }
hard = psxHu8(add);
#ifdef PSXHW_LOG
PSXHW_LOG("*Unkwnown 8bit read at address %x\n", add);
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);