X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=dbe76ac52e2c845f47a8848271c2b9f2ee7977fd;hb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;hp=732e6b852ebcea4259ae6a906fb606e62c95a9b4;hpb=3ec29f016cdeb3100dbb433dd9041e81542765bd;p=picodrive.git

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 732e6b8..dbe76ac 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -386,17 +386,14 @@ m_read8_misc2:
     cmp     r2, #0x4000
     mvnne   r0, #0
     bxne    lr                @ invalid
-.if EXTERNAL_YM2612
     ldr     r1, =PicoOpt
     ldr     r1, [r1]
     tst     r1, #1
-    beq     m_read8_fake_ym2612
-    tst     r1, #0x200
-    beq     YM2612Read_
-    b       YM2612Read_940
-.else
-    b       YM2612Read_
-.endif
+
+    ldrne   r1, =ym2612_st
+    ldrne   r1, [r1]
+    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status
+    bxne    lr
 
 m_read8_fake_ym2612:
     ldr     r3, =(Pico+0x22200)
@@ -451,10 +448,13 @@ m_read8_above_rom:
     tst     r1, #5
     bne     SRAMRead
 m_read8_ar_nosram:
+    ldr     r2, =PicoRead16Hook
     stmfd   sp!,{r0,lr}
+    ldr     r2, [r2]
     bic     r0, r0, #1
     mov     r1, #8
-    bl      OtherRead16End
+    mov     lr, pc
+    bx      r2
     ldmfd   sp!,{r1,lr}
     tst     r1, #1
     moveq   r0, r0, lsr #8
@@ -505,8 +505,7 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95)
     tst     r1, #5
     beq     m_read16_nosram
     stmfd   sp!,{lr}
-    bl      SRAMRead
-    orr     r0, r0, r0, lsl #8
+    bl      SRAMRead16
     ldmfd   sp!,{pc}
 m_read16_nosram:
     ldr     r1, [r3, #4]    @ romsize
@@ -596,12 +595,13 @@ m_read16_above_rom:
     tst     r1, #5
     beq     m_read16_ar_nosram
     stmfd   sp!,{lr}
-    bl      SRAMRead
-    orr     r0, r0, r0, lsl #8
+    bl      SRAMRead16
     ldmfd   sp!,{pc}
 m_read16_ar_nosram:
+    ldr     r2, =PicoRead16Hook
+    ldr     r2, [r2]
     mov     r1, #16
-    b       OtherRead16End
+    bx      r2
 
 .pool
 
@@ -650,14 +650,13 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?)
     tst     r1, #5
     beq     m_read32_nosram
     stmfd   sp!,{r0,lr}
-    bl      SRAMRead
+    bl      SRAMRead16
     ldmfd   sp!,{r1,lr}
     stmfd   sp!,{r0,lr}
     add     r0, r1, #2
-    bl      SRAMRead
+    bl      SRAMRead16
     ldmfd   sp!,{r1,lr}
     orr     r0, r0, r1, lsl #16
-    orr     r0, r0, r0, lsl #8
     bx      lr
 m_read32_nosram:
     ldr     r1, [r3, #4]    @ romsize
@@ -754,16 +753,20 @@ m_read32_ram:
     bx      lr
 
 m_read32_above_rom:
+    ldr     r2, =PicoRead16Hook
     bic     r0, r0, #1
-    stmfd   sp!,{r0,lr}
+    ldr     r2, [r2]
     mov     r1, #32
-    bl      OtherRead16End
+    stmfd   sp!,{r0,r2,lr}
+    mov     lr, pc
+    bx      r2
     mov     r1, r0
-    ldmfd   sp!,{r0}
+    ldmfd   sp!,{r0,r2}
     stmfd   sp!,{r1}
     add     r0, r0, #2
     mov     r1, #32
-    bl      OtherRead16End
+    mov     lr, pc
+    bx      r2
     ldmfd   sp!,{r1,lr}
     orr     r0, r0, r1, lsl #16
     bx      lr
@@ -876,27 +879,21 @@ m_write8_z80_not_ram:
     and     r2, r0, #0x6000
     cmp     r2,     #0x4000
     bne     m_write8_z80_not_ym2612
-    ldr     r2, =PicoOpt
+    ldr     r3, =PicoOpt
     and     r0, r0, #3
-    ldr     r2, [r2]
-    tst     r2, #1
+    ldr     r3, [r3]
+    mov     r2, #0           @ is_from_z80 = 0
+    tst     r3, #1
     bxeq    lr
     stmfd   sp!,{lr}
-.if EXTERNAL_YM2612
-    tst     r2, #0x200
-    ldreq   r2, =YM2612Write_
-    ldrne   r2, =YM2612Write_940
-    mov     lr, pc
-    bx      r2
-.else
-    bl      YM2612Write_
-.endif
+    and     r1, r1, #0xff
+    bl      ym2612_write_local
     ldr     r2, =emustatus
     ldmfd   sp!,{lr}
     ldr     r1, [r2]
     and     r0, r0, #1
     orr     r1, r0, r1
-    str     r1, [r2]         @ emustatus|=YM2612Write(a&3, d);
+    str     r1, [r2]         @ emustatus|=ym2612_write_local(a&3, d);
     bx      lr
 
 m_write8_z80_not_ym2612:     @ not too likely
@@ -913,7 +910,7 @@ m_write8_z80_not_ym2612:     @ not too likely
 m_write8_z80_bank_reg:
     ldr     r3, =(Pico+0x22208) @ Pico.m
     ldrh    r2, [r3, #0x0a]
-    mov     r1, r1, lsr #8
+    mov     r1, r1, lsl #8
     orr     r2, r1, r2, lsr #1
     bic     r2, r2, #0xfe00
     strh    r2, [r3, #0x0a]
@@ -929,7 +926,7 @@ m_write8_not_z80:
     bne     OtherWrite8
 m_write8_psg:
     ldr     r2, =PicoOpt
-    mov     r0, r1
+    and     r0, r1, #0xff
     ldr     r2, [r2]
     tst     r2, #2
     bxeq    lr