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

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 7f3c2cb..dbe76ac 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -448,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
@@ -595,8 +598,10 @@ m_read16_above_rom:
     bl      SRAMRead16
     ldmfd   sp!,{pc}
 m_read16_ar_nosram:
+    ldr     r2, =PicoRead16Hook
+    ldr     r2, [r2]
     mov     r1, #16
-    b       OtherRead16End
+    bx      r2
 
 .pool
 
@@ -748,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
@@ -870,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
@@ -907,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]
@@ -923,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