cdrom: change pause timing again
[pcsx_rearmed.git] / libpcsxcore / psxhw.c
index 8069c07..b96db97 100644 (file)
 */
 
 #include "psxhw.h"
+#include "psxevents.h"
 #include "mdec.h"
 #include "cdrom.h"
+#include "gpu.h"
 
 void psxHwReset() {
-       if (Config.Sio) psxHu32ref(0x1070) |= SWAP32(0x80);
-       if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAP32(0x200);
-
        memset(psxH, 0, 0x10000);
 
        mdecInit(); // initialize mdec decoder
        cdrReset();
        psxRcntInit();
+       HW_GPU_STATUS = SWAP32(0x10802000);
+}
+
+void psxHwWriteIstat(u32 value)
+{
+       u32 stat = psxHu16(0x1070) & value;
+       psxHu16ref(0x1070) = SWAPu16(stat);
+
+       psxRegs.CP0.n.Cause &= ~0x400;
+       if (stat & psxHu16(0x1074))
+               psxRegs.CP0.n.Cause |= 0x400;
+}
+
+void psxHwWriteImask(u32 value)
+{
+       u32 stat = psxHu16(0x1070);
+       psxHu16ref(0x1074) = SWAPu16(value);
+       if (stat & value) {
+               //if ((psxRegs.CP0.n.SR & 0x401) == 0x401)
+               //      log_unhandled("irq on unmask @%08x\n", psxRegs.pc);
+               set_event(PSXINT_NEWDRC_CHECK, 1);
+       }
+       psxRegs.CP0.n.Cause &= ~0x400;
+       if (stat & value)
+               psxRegs.CP0.n.Cause |= 0x400;
+}
+
+#define make_dma_func(n, abort_func) \
+void psxHwWriteChcr##n(u32 value) \
+{ \
+       u32 old = SWAPu32(HW_DMA##n##_CHCR); \
+       if (n == 6) { value &= 0x51000002; value |= 2; } \
+       else        { value &= 0x71770703; } \
+       if (value == old) \
+               return; \
+       if (old & 0x01000000) \
+               log_unhandled("%u dma" #n " %08x -> %08x\n", psxRegs.cycle, old, value); \
+       HW_DMA##n##_CHCR = SWAPu32(value); \
+       if ((value ^ old) & 0x01000000) { \
+               if (!(value & 0x01000000)) \
+                       abort_func; \
+               else if (SWAPu32(HW_DMA_PCR) & (8u << (n * 4))) \
+                       psxDma##n(SWAPu32(HW_DMA##n##_MADR), SWAPu32(HW_DMA##n##_BCR), value); \
+       } \
+}
+
+make_dma_func(0,)
+make_dma_func(1,)
+make_dma_func(2, psxAbortDma2())
+make_dma_func(3,)
+make_dma_func(4,)
+make_dma_func(6,)
+
+void psxHwWriteDmaIcr32(u32 value)
+{
+       u32 tmp = value & 0x00ff803f;
+       tmp |= (SWAPu32(HW_DMA_ICR) & ~value) & 0x7f000000;
+       if ((tmp & HW_DMA_ICR_GLOBAL_ENABLE && tmp & 0x7f000000)
+           || tmp & HW_DMA_ICR_BUS_ERROR) {
+               if (!(SWAPu32(HW_DMA_ICR) & HW_DMA_ICR_IRQ_SENT))
+                       psxHu32ref(0x1070) |= SWAP32(8);
+               tmp |= HW_DMA_ICR_IRQ_SENT;
+       }
+       HW_DMA_ICR = SWAPu32(tmp);
+}
+
+void psxHwWriteGpuSR(u32 value)
+{
+       u32 old_sr = HW_GPU_STATUS, new_sr;
+       GPU_writeStatus(value);
+       gpuSyncPluginSR();
+       new_sr = HW_GPU_STATUS;
+       // "The Next Tetris" seems to rely on the field order after enable
+       if ((old_sr ^ new_sr) & new_sr & SWAP32(PSXGPU_ILACE))
+               frame_counter |= 1;
+}
+
+u32 psxHwReadGpuSR(void)
+{
+       u32 v, c = psxRegs.cycle;
+
+       // meh2, syncing for img bit, might want to avoid it..
+       gpuSyncPluginSR();
+       v = SWAP32(HW_GPU_STATUS);
+       v |= ((s32)(psxRegs.gpuIdleAfter - c) >> 31) & PSXGPU_nBUSY;
+
+       // XXX: because of large timeslices can't use hSyncCount, using rough
+       // approximization instead. Perhaps better use hcounter code here or something.
+       if (hSyncCount < 240 && (v & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
+               v |= PSXGPU_LCF & (c << 20);
+       return v;
+}
+
+u32 sio1ReadStat16(void)
+{
+       // Armored Core, F1 Link cable misdetection
+       return 0xa0;
 }
 
 u8 psxHwRead8(u32 add) {
-       unsigned char hard;
-
-       switch (add) {
-               case 0x1f801040: hard = sioRead8();break; \r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050: hard = SIO1_readData8(); break;\r
-#endif
-               case 0x1f801800: hard = cdrRead0(); break;
-               case 0x1f801801: hard = cdrRead1(); break;
-               case 0x1f801802: hard = cdrRead2(); break;
-               case 0x1f801803: hard = cdrRead3(); break;
-               default:
-                       hard = psxHu8(add); 
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("*Unkwnown 8bit read at address %x\n", add);
-#endif
-                       return hard;
+       u8 hard;
+
+       switch (add & 0xffff) {
+       case 0x1040: hard = sioRead8(); break;
+       case 0x1800: hard = cdrRead0(); break;
+       case 0x1801: hard = cdrRead1(); break;
+       case 0x1802: hard = cdrRead2(); break;
+       case 0x1803: hard = cdrRead3(); break;
+
+       case 0x1041: case 0x1042: case 0x1043:
+       case 0x1044: case 0x1045:
+       case 0x1046: case 0x1047:
+       case 0x1048: case 0x1049:
+       case 0x104a: case 0x104b:
+       case 0x104c: case 0x104d:
+       case 0x104e: case 0x104f:
+       case 0x1050: case 0x1051:
+       case 0x1054: case 0x1055:
+       case 0x1058: case 0x1059:
+       case 0x105a: case 0x105b:
+       case 0x105c: case 0x105d:
+       case 0x1100: case 0x1101:
+       case 0x1104: case 0x1105:
+       case 0x1108: case 0x1109:
+       case 0x1110: case 0x1111:
+       case 0x1114: case 0x1115:
+       case 0x1118: case 0x1119:
+       case 0x1120: case 0x1121:
+       case 0x1124: case 0x1125:
+       case 0x1128: case 0x1129:
+       case 0x1810: case 0x1811:
+       case 0x1812: case 0x1813:
+       case 0x1814: case 0x1815:
+       case 0x1816: case 0x1817:
+       case 0x1820: case 0x1821:
+       case 0x1822: case 0x1823:
+       case 0x1824: case 0x1825:
+       case 0x1826: case 0x1827:
+               log_unhandled("unhandled r8  %08x @%08x\n", add, psxRegs.pc);
+               // falthrough
+       default:
+               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("*Known 8bit read at address %x value %x\n", add, hard);
-#endif
+       //printf("r8  %08x       %02x @%08x\n", add, hard, psxRegs.pc);
        return hard;
 }
 
 u16 psxHwRead16(u32 add) {
        unsigned short hard;
 
-       switch (add) {
-#ifdef PSXHW_LOG
-               case 0x1f801070: PSXHW_LOG("IREG 16bit read %x\n", psxHu16(0x1070));
-                       return psxHu16(0x1070);
-#endif
-#ifdef PSXHW_LOG
-               case 0x1f801074: PSXHW_LOG("IMASK 16bit read %x\n", psxHu16(0x1074));
-                       return psxHu16(0x1074);
-#endif
-
-               case 0x1f801040:
-                       hard = sioRead8();
-                       hard|= sioRead8() << 8;
-#ifdef PAD_LOG
-                       PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard);
-#endif
-                       return hard;
-               case 0x1f801044:
-                       hard = sioReadStat16();
-#ifdef PAD_LOG
-                       PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard);
-#endif
-                       return hard;
-               case 0x1f801048:
-                       hard = sioReadMode16();
-#ifdef PAD_LOG
-                       PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard);
-#endif
-                       return hard;
-               case 0x1f80104a:
-                       hard = sioReadCtrl16();
-#ifdef PAD_LOG
-                       PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard);
-#endif
-                       return hard;
-               case 0x1f80104e:
-                       hard = sioReadBaud16();
-#ifdef PAD_LOG
-                       PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard);
-#endif
-                       return hard;\r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050:
-                       hard = SIO1_readData16();
-                       return hard;
-               case 0x1f801054:
-                       hard = SIO1_readStat16();
-                       return hard;
-               case 0x1f80105a:
-                       hard = SIO1_readCtrl16();
-                       return hard;
-               case 0x1f80105e:
-                       hard = SIO1_readBaud16();
-                       return hard;\r
-#endif
-               case 0x1f801100:
-                       hard = psxRcntRcount(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 count read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801104:
-                       hard = psxRcntRmode(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 mode read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801108:
-                       hard = psxRcntRtarget(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 target read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801110:
-                       hard = psxRcntRcount(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 count read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801114:
-                       hard = psxRcntRmode(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 mode read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801118:
-                       hard = psxRcntRtarget(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 target read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801120:
-                       hard = psxRcntRcount(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 count read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801124:
-                       hard = psxRcntRmode(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 mode read16: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801128:
-                       hard = psxRcntRtarget(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 target read16: %x\n", hard);
-#endif
-                       return hard;
-
-               //case 0x1f802030: hard =   //int_2000????
-               //case 0x1f802040: hard =//dip switches...??
-
-               default:
-                       if (add >= 0x1f801c00 && add < 0x1f801e00) {
-               hard = SPU_readRegister(add);
-                       } else {
-                               hard = psxHu16(add); 
-#ifdef PSXHW_LOG
-                               PSXHW_LOG("*Unkwnown 16bit read at address %x\n", add);
-#endif
-                       }
-            return hard;
+       switch (add & 0xffff) {
+       case 0x1040: hard = sioRead8(); break;
+       case 0x1044: hard = sioReadStat16(); break;
+       case 0x1048: hard = sioReadMode16(); break;
+       case 0x104a: hard = sioReadCtrl16(); break;
+       case 0x104e: hard = sioReadBaud16(); break;
+       case 0x1054: hard = sio1ReadStat16(); break;
+       case 0x1100: hard = psxRcntRcount0(); break;
+       case 0x1104: hard = psxRcntRmode(0); break;
+       case 0x1108: hard = psxRcntRtarget(0); break;
+       case 0x1110: hard = psxRcntRcount1(); break;
+       case 0x1114: hard = psxRcntRmode(1); break;
+       case 0x1118: hard = psxRcntRtarget(1); break;
+       case 0x1120: hard = psxRcntRcount2(); break;
+       case 0x1124: hard = psxRcntRmode(2); break;
+       case 0x1128: hard = psxRcntRtarget(2); break;
+
+       case 0x1042:
+       case 0x1046:
+       case 0x104c:
+       case 0x1050:
+       case 0x1058:
+       case 0x105a:
+       case 0x105c:
+       case 0x1800:
+       case 0x1802:
+       case 0x1810:
+       case 0x1812:
+       case 0x1814:
+       case 0x1816:
+       case 0x1820:
+       case 0x1822:
+       case 0x1824:
+       case 0x1826:
+               log_unhandled("unhandled r16 %08x @%08x\n", add, psxRegs.pc);
+               // falthrough
+       default:
+               if (0x1f801c00 <= add && add < 0x1f802000) {
+                       hard = SPU_readRegister(add, psxRegs.cycle);
+                       break;
+               }
+               hard = psxHu16(add);
        }
        
-#ifdef PSXHW_LOG
-       PSXHW_LOG("*Known 16bit read at address %x value %x\n", add, hard);
-#endif
+       //printf("r16 %08x     %04x @%08x\n", add, hard, psxRegs.pc);
        return hard;
 }
 
 u32 psxHwRead32(u32 add) {
        u32 hard;
 
-       switch (add) {
-               case 0x1f801040:
-                       hard = sioRead8();
-                       hard |= sioRead8() << 8;
-                       hard |= sioRead8() << 16;
-                       hard |= sioRead8() << 24;
-#ifdef PAD_LOG
-                       PAD_LOG("sio read32 ;ret = %x\n", hard);
-#endif
-                       return hard;\r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050:
-                       hard = SIO1_readData32();
-                       return hard;\r
-#endif
-#ifdef PSXHW_LOG
-               case 0x1f801060:
-                       PSXHW_LOG("RAM size read %x\n", psxHu32(0x1060));
-                       return psxHu32(0x1060);
-#endif
-#ifdef PSXHW_LOG
-               case 0x1f801070: PSXHW_LOG("IREG 32bit read %x\n", psxHu32(0x1070));
-                       return psxHu32(0x1070);
-#endif
-#ifdef PSXHW_LOG
-               case 0x1f801074: PSXHW_LOG("IMASK 32bit read %x\n", psxHu32(0x1074));
-                       return psxHu32(0x1074);
-#endif
-
-               case 0x1f801810:
-                       hard = GPU_readData();
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("GPU DATA 32bit read %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801814:
-                       hard = GPU_readStatus();
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("GPU STATUS 32bit read %x\n", hard);
-#endif
-                       return hard;
-
-               case 0x1f801820: hard = mdecRead0(); break;
-               case 0x1f801824: hard = mdecRead1(); break;
-
-#ifdef PSXHW_LOG
-               case 0x1f8010a0:
-                       PSXHW_LOG("DMA2 MADR 32bit read %x\n", psxHu32(0x10a0));
-                       return SWAPu32(HW_DMA2_MADR);
-               case 0x1f8010a4:
-                       PSXHW_LOG("DMA2 BCR 32bit read %x\n", psxHu32(0x10a4));
-                       return SWAPu32(HW_DMA2_BCR);
-               case 0x1f8010a8:
-                       PSXHW_LOG("DMA2 CHCR 32bit read %x\n", psxHu32(0x10a8));
-                       return SWAPu32(HW_DMA2_CHCR);
-#endif
-
-#ifdef PSXHW_LOG
-               case 0x1f8010b0:
-                       PSXHW_LOG("DMA3 MADR 32bit read %x\n", psxHu32(0x10b0));
-                       return SWAPu32(HW_DMA3_MADR);
-               case 0x1f8010b4:
-                       PSXHW_LOG("DMA3 BCR 32bit read %x\n", psxHu32(0x10b4));
-                       return SWAPu32(HW_DMA3_BCR);
-               case 0x1f8010b8:
-                       PSXHW_LOG("DMA3 CHCR 32bit read %x\n", psxHu32(0x10b8));
-                       return SWAPu32(HW_DMA3_CHCR);
-#endif
-
-#ifdef PSXHW_LOG
-/*             case 0x1f8010f0:
-                       PSXHW_LOG("DMA PCR 32bit read %x\n", psxHu32(0x10f0));
-                       return SWAPu32(HW_DMA_PCR); // dma rest channel
-               case 0x1f8010f4:
-                       PSXHW_LOG("DMA ICR 32bit read %x\n", psxHu32(0x10f4));
-                       return SWAPu32(HW_DMA_ICR); // interrupt enabler?*/
-#endif
-
-               // time for rootcounters :)
-               case 0x1f801100:
-                       hard = psxRcntRcount(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 count read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801104:
-                       hard = psxRcntRmode(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 mode read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801108:
-                       hard = psxRcntRtarget(0);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T0 target read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801110:
-                       hard = psxRcntRcount(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 count read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801114:
-                       hard = psxRcntRmode(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 mode read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801118:
-                       hard = psxRcntRtarget(1);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T1 target read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801120:
-                       hard = psxRcntRcount(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 count read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801124:
-                       hard = psxRcntRmode(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 mode read32: %x\n", hard);
-#endif
-                       return hard;
-               case 0x1f801128:
-                       hard = psxRcntRtarget(2);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("T2 target read32: %x\n", hard);
-#endif
-                       return hard;
-
-               default:
-                       hard = psxHu32(add); 
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("*Unkwnown 32bit read at address %x\n", add);
-#endif
-                       return hard;
+       switch (add & 0xffff) {
+       case 0x1040: hard = sioRead8(); break;
+       case 0x1044: hard = sioReadStat16(); break;
+       case 0x1100: hard = psxRcntRcount0(); break;
+       case 0x1104: hard = psxRcntRmode(0); break;
+       case 0x1108: hard = psxRcntRtarget(0); break;
+       case 0x1110: hard = psxRcntRcount1(); break;
+       case 0x1114: hard = psxRcntRmode(1); break;
+       case 0x1118: hard = psxRcntRtarget(1); break;
+       case 0x1120: hard = psxRcntRcount2(); break;
+       case 0x1124: hard = psxRcntRmode(2); break;
+       case 0x1128: hard = psxRcntRtarget(2); break;
+       case 0x1810: hard = GPU_readData(); break;
+       case 0x1814: hard = psxHwReadGpuSR(); break;
+       case 0x1820: hard = mdecRead0(); break;
+       case 0x1824: hard = mdecRead1(); break;
+
+       case 0x1048:
+       case 0x104c:
+       case 0x1050:
+       case 0x1054:
+       case 0x1058:
+       case 0x105c:
+       case 0x1800:
+               log_unhandled("unhandled r32 %08x @%08x\n", add, psxRegs.pc);
+               // falthrough
+       default:
+               if (0x1f801c00 <= add && add < 0x1f802000) {
+                       hard = SPU_readRegister(add, psxRegs.cycle);
+                       hard |= SPU_readRegister(add + 2, psxRegs.cycle) << 16;
+                       break;
+               }
+               hard = psxHu32(add);
        }
-#ifdef PSXHW_LOG
-       PSXHW_LOG("*Known 32bit read at address %x\n", add);
-#endif
+       //printf("r32 %08x %08x @%08x\n", add, hard, psxRegs.pc);
        return hard;
 }
 
-void psxHwWrite8(u32 add, u8 value) {
-       switch (add) {
-               case 0x1f801040: sioWrite8(value); break;\r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050: SIO1_writeData8(value); break;\r
-#endif
-               case 0x1f801800: cdrWrite0(value); break;
-               case 0x1f801801: cdrWrite1(value); break;
-               case 0x1f801802: cdrWrite2(value); break;
-               case 0x1f801803: cdrWrite3(value); break;
-
-               default:
-                       psxHu8(add) = value;
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("*Unknown 8bit write at address %x value %x\n", add, value);
-#endif
+void psxHwWrite8(u32 add, u32 value) {
+       switch (add & 0xffff) {
+       case 0x1040: sioWrite8(value); return;
+       case 0x10f6:
+               // nocash documents it as forced w32, but still games use this?
+               break;
+       case 0x1800: cdrWrite0(value); return;
+       case 0x1801: cdrWrite1(value); return;
+       case 0x1802: cdrWrite2(value); return;
+       case 0x1803: cdrWrite3(value); return;
+       case 0x2041: break; // "POST (external 7 segment display)"
+
+       default:
+               if (0x1f801c00 <= add && add < 0x1f802000) {
+                       log_unhandled("spu w8 %02x @%08x\n", value, psxRegs.pc);
+                       if (!(add & 1))
+                               SPU_writeRegister(add, value, psxRegs.cycle);
                        return;
+               }
+               else
+                       log_unhandled("unhandled w8  %08x %08x @%08x\n",
+                               add, value, psxRegs.pc);
        }
        psxHu8(add) = value;
-#ifdef PSXHW_LOG
-       PSXHW_LOG("*Known 8bit write at address %x value %x\n", add, value);
-#endif
 }
 
-void psxHwWrite16(u32 add, u16 value) {
-       switch (add) {
-               case 0x1f801040:
-                       sioWrite8((unsigned char)value);
-                       sioWrite8((unsigned char)(value>>8));
-#ifdef PAD_LOG
-                       PAD_LOG ("sio write16 %x, %x\n", add&0xf, value);
-#endif
-                       return;
-               case 0x1f801044:
-                       sioWriteStat16(value);
-#ifdef PAD_LOG
-                       PAD_LOG ("sio write16 %x, %x\n", add&0xf, value);
-#endif
-                       return;
-               case 0x1f801048:
-            sioWriteMode16(value);
-#ifdef PAD_LOG
-                       PAD_LOG ("sio write16 %x, %x\n", add&0xf, value);
-#endif
-                       return;
-               case 0x1f80104a: // control register
-                       sioWriteCtrl16(value);
-#ifdef PAD_LOG
-                       PAD_LOG ("sio write16 %x, %x\n", add&0xf, value);
-#endif
-                       return;
-               case 0x1f80104e: // baudrate register
-            sioWriteBaud16(value);
-#ifdef PAD_LOG
-                       PAD_LOG ("sio write16 %x, %x\n", add&0xf, value);
-#endif
-                       return;\r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050:
-                       SIO1_writeData16(value);
-                       return;
-               case 0x1f801054:
-                       SIO1_writeStat16(value);
-                       return;
-               case 0x1f80105a:
-                       SIO1_writeCtrl16(value);
-                       return;
-               case 0x1f80105e:
-                       SIO1_writeBaud16(value);
-                       return;\r
-#endif
-               case 0x1f801070: 
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("IREG 16bit write %x\n", value);
-#endif
-                       if (Config.Sio) psxHu16ref(0x1070) |= SWAPu16(0x80);
-                       if (Config.SpuIrq) psxHu16ref(0x1070) |= SWAPu16(0x200);
-                       psxHu16ref(0x1070) &= SWAPu16((psxHu16(0x1074) & value));
-                       return;
-
-               case 0x1f801074:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("IMASK 16bit write %x\n", value);
-#endif
-                       psxHu16ref(0x1074) = SWAPu16(value);
-                       if (psxHu16ref(0x1070) & value)
-                               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
-                       return;
-
-               case 0x1f801100:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 COUNT 16bit write %x\n", value);
-#endif
-                       psxRcntWcount(0, value); return;
-               case 0x1f801104:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 MODE 16bit write %x\n", value);
-#endif
-                       psxRcntWmode(0, value); return;
-               case 0x1f801108:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 TARGET 16bit write %x\n", value);
-#endif
-                       psxRcntWtarget(0, value); return;
-
-               case 0x1f801110:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 COUNT 16bit write %x\n", value);
-#endif
-                       psxRcntWcount(1, value); return;
-               case 0x1f801114:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 MODE 16bit write %x\n", value);
-#endif
-                       psxRcntWmode(1, value); return;
-               case 0x1f801118:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 TARGET 16bit write %x\n", value);
-#endif
-                       psxRcntWtarget(1, value); return;
-
-               case 0x1f801120:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 COUNT 16bit write %x\n", value);
-#endif
-                       psxRcntWcount(2, value); return;
-               case 0x1f801124:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 MODE 16bit write %x\n", value);
-#endif
-                       psxRcntWmode(2, value); return;
-               case 0x1f801128:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 TARGET 16bit write %x\n", value);
-#endif
-                       psxRcntWtarget(2, value); return;
-
-               default:
-                       if (add>=0x1f801c00 && add<0x1f801e00) {
-               SPU_writeRegister(add, value);
-                               return;
-                       }
-
-                       psxHu16ref(add) = SWAPu16(value);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("*Unknown 16bit write at address %x value %x\n", add, value);
-#endif
+void psxHwWrite16(u32 add, u32 value) {
+       switch (add & 0xffff) {
+       case 0x1040: sioWrite8(value); return;
+       case 0x1044: sioWriteStat16(value); return;
+       case 0x1048: sioWriteMode16(value); return;
+       case 0x104a: sioWriteCtrl16(value); return;
+       case 0x104e: sioWriteBaud16(value); return;
+       case 0x1070: psxHwWriteIstat(value); return;
+       case 0x1074: psxHwWriteImask(value); return;
+       case 0x1100: psxRcntWcount(0, value); return;
+       case 0x1104: psxRcntWmode(0, value); return;
+       case 0x1108: psxRcntWtarget(0, value); return;
+       case 0x1110: psxRcntWcount(1, value); return;
+       case 0x1114: psxRcntWmode(1, value); return;
+       case 0x1118: psxRcntWtarget(1, value); return;
+       case 0x1120: psxRcntWcount(2, value); return;
+       case 0x1124: psxRcntWmode(2, value); return;
+       case 0x1128: psxRcntWtarget(2, value); return;
+
+       // forced write32:
+       case 0x1088: // DMA0 chcr (MDEC in DMA)
+       case 0x108c: psxHwWriteChcr0(value); return;
+       case 0x1098: // DMA1 chcr (MDEC out DMA)
+       case 0x109c: psxHwWriteChcr1(value); return;
+       case 0x10a8: // DMA2 chcr (GPU DMA)
+       case 0x10ac: psxHwWriteChcr2(value); return;
+       case 0x10b8: // DMA3 chcr (CDROM DMA)
+       case 0x10bc: psxHwWriteChcr3(value); return;
+       case 0x10c8: // DMA4 chcr (SPU DMA)
+       case 0x10cc: psxHwWriteChcr4(value); return;
+       case 0x10e8: // DMA6 chcr (OT clear)
+       case 0x10ec: psxHwWriteChcr6(value); return;
+       case 0x10f4: psxHwWriteDmaIcr32(value); return;
+
+       // forced write32 with no immediate effect:
+       case 0x1014:
+       case 0x1060:
+       case 0x1080:
+       case 0x1090:
+       case 0x10a0:
+       case 0x10b0:
+       case 0x10c0:
+       case 0x10d0:
+       case 0x10e0:
+       case 0x10f0:
+               psxHu32ref(add) = SWAPu32(value);
+               return;
+
+       case 0x1800:
+       case 0x1802:
+       case 0x1810:
+       case 0x1812:
+       case 0x1814:
+       case 0x1816:
+       case 0x1820:
+       case 0x1822:
+       case 0x1824:
+       case 0x1826:
+               log_unhandled("unhandled w16 %08x @%08x\n", add, psxRegs.pc);
+               break;
+
+       default:
+               if (0x1f801c00 <= add && add < 0x1f802000) {
+                       SPU_writeRegister(add, value, psxRegs.cycle);
                        return;
+               }
+               else if (0x1f801000 <= add && add < 0x1f801800)
+                       log_unhandled("unhandled w16 %08x %08x @%08x\n",
+                               add, value, psxRegs.pc);
        }
        psxHu16ref(add) = SWAPu16(value);
-#ifdef PSXHW_LOG
-       PSXHW_LOG("*Known 16bit write at address %x value %x\n", add, value);
-#endif
-}
-
-#define DmaExec(n) { \
-       HW_DMA##n##_CHCR = SWAPu32(value); \
-\
-       if (SWAPu32(HW_DMA##n##_CHCR) & 0x01000000 && SWAPu32(HW_DMA_PCR) & (8 << (n * 4))) { \
-               psxDma##n(SWAPu32(HW_DMA##n##_MADR), SWAPu32(HW_DMA##n##_BCR), SWAPu32(HW_DMA##n##_CHCR)); \
-       } \
 }
 
 void psxHwWrite32(u32 add, u32 value) {
-       switch (add) {
-           case 0x1f801040:
-                       sioWrite8((unsigned char)value);
-                       sioWrite8((unsigned char)((value&0xff) >>  8));
-                       sioWrite8((unsigned char)((value&0xff) >> 16));
-                       sioWrite8((unsigned char)((value&0xff) >> 24));
-#ifdef PAD_LOG
-                       PAD_LOG("sio write32 %x\n", value);
-#endif
-                       return;\r
-#ifdef ENABLE_SIO1API
-               case 0x1f801050:
-                       SIO1_writeData32(value);
-                       return;\r
-#endif
-#ifdef PSXHW_LOG
-               case 0x1f801060:
-                       PSXHW_LOG("RAM size write %x\n", value);
-                       psxHu32ref(add) = SWAPu32(value);
-                       return; // Ram size
-#endif
-
-               case 0x1f801070: 
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("IREG 32bit write %x\n", value);
-#endif
-                       if (Config.Sio) psxHu32ref(0x1070) |= SWAPu32(0x80);
-                       if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAPu32(0x200);
-                       psxHu32ref(0x1070) &= SWAPu32((psxHu32(0x1074) & value));
-                       return;
-               case 0x1f801074:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("IMASK 32bit write %x\n", value);
-#endif
-                       psxHu32ref(0x1074) = SWAPu32(value);
-                       if (psxHu32ref(0x1070) & value)
-                               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f801080:
-                       PSXHW_LOG("DMA0 MADR 32bit write %x\n", value);
-                       HW_DMA0_MADR = SWAPu32(value); return; // DMA0 madr
-               case 0x1f801084:
-                       PSXHW_LOG("DMA0 BCR 32bit write %x\n", value);
-                       HW_DMA0_BCR  = SWAPu32(value); return; // DMA0 bcr
-#endif
-               case 0x1f801088:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA0 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(0);                      // DMA0 chcr (MDEC in DMA)
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f801090:
-                       PSXHW_LOG("DMA1 MADR 32bit write %x\n", value);
-                       HW_DMA1_MADR = SWAPu32(value); return; // DMA1 madr
-               case 0x1f801094:
-                       PSXHW_LOG("DMA1 BCR 32bit write %x\n", value);
-                       HW_DMA1_BCR  = SWAPu32(value); return; // DMA1 bcr
-#endif
-               case 0x1f801098:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA1 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(1);                  // DMA1 chcr (MDEC out DMA)
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f8010a0:
-                       PSXHW_LOG("DMA2 MADR 32bit write %x\n", value);
-                       HW_DMA2_MADR = SWAPu32(value); return; // DMA2 madr
-               case 0x1f8010a4:
-                       PSXHW_LOG("DMA2 BCR 32bit write %x\n", value);
-                       HW_DMA2_BCR  = SWAPu32(value); return; // DMA2 bcr
-#endif
-               case 0x1f8010a8:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA2 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(2);                  // DMA2 chcr (GPU DMA)
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f8010b0:
-                       PSXHW_LOG("DMA3 MADR 32bit write %x\n", value);
-                       HW_DMA3_MADR = SWAPu32(value); return; // DMA3 madr
-               case 0x1f8010b4:
-                       PSXHW_LOG("DMA3 BCR 32bit write %x\n", value);
-                       HW_DMA3_BCR  = SWAPu32(value); return; // DMA3 bcr
-#endif
-               case 0x1f8010b8:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA3 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(3);                  // DMA3 chcr (CDROM DMA)
-                       
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f8010c0:
-                       PSXHW_LOG("DMA4 MADR 32bit write %x\n", value);
-                       HW_DMA4_MADR = SWAPu32(value); return; // DMA4 madr
-               case 0x1f8010c4:
-                       PSXHW_LOG("DMA4 BCR 32bit write %x\n", value);
-                       HW_DMA4_BCR  = SWAPu32(value); return; // DMA4 bcr
-#endif
-               case 0x1f8010c8:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA4 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(4);                  // DMA4 chcr (SPU DMA)
-                       return;
-
-#if 0
-               case 0x1f8010d0: break; //DMA5write_madr();
-               case 0x1f8010d4: break; //DMA5write_bcr();
-               case 0x1f8010d8: break; //DMA5write_chcr(); // Not needed
-#endif
-
-#ifdef PSXHW_LOG
-               case 0x1f8010e0:
-                       PSXHW_LOG("DMA6 MADR 32bit write %x\n", value);
-                       HW_DMA6_MADR = SWAPu32(value); return; // DMA6 bcr
-               case 0x1f8010e4:
-                       PSXHW_LOG("DMA6 BCR 32bit write %x\n", value);
-                       HW_DMA6_BCR  = SWAPu32(value); return; // DMA6 bcr
-#endif
-               case 0x1f8010e8:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA6 CHCR 32bit write %x\n", value);
-#endif
-                       DmaExec(6);                   // DMA6 chcr (OT clear)
-                       return;
-
-#ifdef PSXHW_LOG
-               case 0x1f8010f0:
-                       PSXHW_LOG("DMA PCR 32bit write %x\n", value);
-                       HW_DMA_PCR = SWAPu32(value);
-                       return;
-#endif
-
-               case 0x1f8010f4:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("DMA ICR 32bit write %x\n", value);
-#endif
-               {
-                       u32 tmp = (~value) & SWAPu32(HW_DMA_ICR);
-                       HW_DMA_ICR = SWAPu32(((tmp ^ value) & 0xffffff) ^ tmp);
+       switch (add & 0xffff) {
+       case 0x1040: sioWrite8(value); return;
+       case 0x1070: psxHwWriteIstat(value); return;
+       case 0x1074: psxHwWriteImask(value); return;
+       case 0x1088: // DMA0 chcr (MDEC in DMA)
+       case 0x108c: psxHwWriteChcr0(value); return;
+       case 0x1098: // DMA1 chcr (MDEC out DMA)
+       case 0x109c: psxHwWriteChcr1(value); return;
+       case 0x10a8: // DMA2 chcr (GPU DMA)
+       case 0x10ac: psxHwWriteChcr2(value); return;
+       case 0x10b8: // DMA3 chcr (CDROM DMA)
+       case 0x10bc: psxHwWriteChcr3(value); return;
+       case 0x10c8: // DMA4 chcr (SPU DMA)
+       case 0x10cc: psxHwWriteChcr4(value); return;
+       case 0x10e8: // DMA6 chcr (OT clear)
+       case 0x10ec: psxHwWriteChcr6(value); return;
+       case 0x10f4: psxHwWriteDmaIcr32(value); return;
+
+       case 0x1810: GPU_writeData(value); return;
+       case 0x1814: psxHwWriteGpuSR(value); return;
+       case 0x1820: mdecWrite0(value); break;
+       case 0x1824: mdecWrite1(value); break;
+
+       case 0x1100: psxRcntWcount(0, value & 0xffff); return;
+       case 0x1104: psxRcntWmode(0, value); return;
+       case 0x1108: psxRcntWtarget(0, value & 0xffff); return;
+       case 0x1110: psxRcntWcount(1, value & 0xffff); return;
+       case 0x1114: psxRcntWmode(1, value); return;
+       case 0x1118: psxRcntWtarget(1, value & 0xffff); return;
+       case 0x1120: psxRcntWcount(2, value & 0xffff); return;
+       case 0x1124: psxRcntWmode(2, value); return;
+       case 0x1128: psxRcntWtarget(2, value & 0xffff); return;
+
+       case 0x1044:
+       case 0x1048:
+       case 0x104c:
+       case 0x1050:
+       case 0x1054:
+       case 0x1058:
+       case 0x105c:
+       case 0x1800:
+               log_unhandled("unhandled w32 %08x %08x @%08x\n", add, value, psxRegs.pc);
+               break;
+
+       default:
+               if (0x1f801c00 <= add && add < 0x1f802000) {
+                       SPU_writeRegister(add, value&0xffff, psxRegs.cycle);
+                       SPU_writeRegister(add + 2, value>>16, psxRegs.cycle);
                        return;
                }
-
-               case 0x1f801810:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("GPU DATA 32bit write %x\n", value);
-#endif
-                       GPU_writeData(value); return;
-               case 0x1f801814:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("GPU STATUS 32bit write %x\n", value);
-#endif
-                       GPU_writeStatus(value); return;
-
-               case 0x1f801820:
-                       mdecWrite0(value); break;
-               case 0x1f801824:
-                       mdecWrite1(value); break;
-
-               case 0x1f801100:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 COUNT 32bit write %x\n", value);
-#endif
-                       psxRcntWcount(0, value & 0xffff); return;
-               case 0x1f801104:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 MODE 32bit write %x\n", value);
-#endif
-                       psxRcntWmode(0, value); return;
-               case 0x1f801108:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 0 TARGET 32bit write %x\n", value);
-#endif
-                       psxRcntWtarget(0, value & 0xffff); return; //  HW_DMA_ICR&= SWAP32((~value)&0xff000000);
-
-               case 0x1f801110:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 COUNT 32bit write %x\n", value);
-#endif
-                       psxRcntWcount(1, value & 0xffff); return;
-               case 0x1f801114:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 MODE 32bit write %x\n", value);
-#endif
-                       psxRcntWmode(1, value); return;
-               case 0x1f801118:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 1 TARGET 32bit write %x\n", value);
-#endif
-                       psxRcntWtarget(1, value & 0xffff); return;
-
-               case 0x1f801120:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 COUNT 32bit write %x\n", value);
-#endif
-                       psxRcntWcount(2, value & 0xffff); return;
-               case 0x1f801124:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 MODE 32bit write %x\n", value);
-#endif
-                       psxRcntWmode(2, value); return;
-               case 0x1f801128:
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("COUNTER 2 TARGET 32bit write %x\n", value);
-#endif
-                       psxRcntWtarget(2, value & 0xffff); return;
-
-               default:
-                       // Dukes of Hazard 2 - car engine noise
-                       if (add>=0x1f801c00 && add<0x1f801e00) {
-                               SPU_writeRegister(add, value&0xffff);
-                               SPU_writeRegister(add + 2, value>>16);
-                               return;
-                       }
-
-                       psxHu32ref(add) = SWAPu32(value);
-#ifdef PSXHW_LOG
-                       PSXHW_LOG("*Unknown 32bit write at address %x value %x\n", add, value);
-#endif
-                       return;
        }
        psxHu32ref(add) = SWAPu32(value);
-#ifdef PSXHW_LOG
-       PSXHW_LOG("*Known 32bit write at address %x value %x\n", add, value);
-#endif
 }
 
-int psxHwFreeze(gzFile f, int Mode) {
+int psxHwFreeze(void *f, int Mode) {
        return 0;
 }