X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmemory_arm.s;h=3e6f9db6bd88be9d327e16ffbb35c670e51387fd;hb=fa8fb7544593a0ed43f3354cc5f41150464b55bf;hp=2fc74ca0fd00a152011a5d24a417efd4c956e46f;hpb=9a1f192a146e9b9752ec1a760745b1261fe9bdec;p=picodrive.git

diff --git a/pico/cd/memory_arm.s b/pico/cd/memory_arm.s
index 2fc74ca..3e6f9db 100644
--- a/pico/cd/memory_arm.s
+++ b/pico/cd/memory_arm.s
@@ -11,10 +11,10 @@
 .text
 .align 2
 
-.global PicoReadM68k8_io
-.global PicoReadM68k16_io
-.global PicoWriteM68k8_io
-.global PicoWriteM68k16_io
+.global PicoRead8_mcd_io
+.global PicoRead16_mcd_io
+.global PicoWrite8_mcd_io
+.global PicoWrite16_mcd_io
 
 .global PicoReadS68k8_pr
 .global PicoReadS68k16_pr
@@ -134,7 +134,7 @@ PicoReadM68k8_cell1:                    @ 0x220000 - 0x23ffff, cell arranged
     bx      lr
 
 
-PicoReadM68k8_io:
+PicoRead8_mcd_io:
     and     r1, r0, #0xff00
     cmp     r1, #0x2000	              @ a120xx?
     bne     PicoRead8_io
@@ -174,16 +174,14 @@ m_m68k_read8_r02:
     add     r1, r1, #0x110000
     ldrb    r0, [r1, #2]
     bx      lr
-m_m68k_read8_r03:                     @ FIXME: sync with C
-    add     r2, r1, #0x110000
-    ldrb    r1, [r2, #3]
-    add     r2, r2, #0x002200
-    ldr     r2, [r2, #4]
-    and     r1, r1, #0xc7
-    tst     r2, #2                    @ DMNA pending?
-    bicne   r1, r1, #1
-    orrne   r1, r1, #2
-    b       m68k_comm_check
+m_m68k_read8_r03:
+    add     r1, r1, #0x110000
+    push    {r1, lr}
+    bl      m68k_comm_check
+    pop     {r1, lr}
+    ldrb    r0, [r1, #3]
+    and     r0, r0, #0xc7
+    bx      lr
 m_m68k_read8_r04:
     add     r1, r1, #0x110000
     ldrb    r0, [r1, #4]
@@ -216,11 +214,15 @@ m_m68k_read8_r0d:
     bx      lr
 m_m68k_read8_hi:
     cmp     r0, #0x30
-    movge   r0, #0
-    bxeq    lr
     add     r1, r1, #0x110000
-    ldrb    r1, [r1, r0]
-    b       m68k_comm_check
+    movge   r0, #0
+    bxge    lr
+    add     r1, r0
+    push    {r1, lr}
+    bl      m68k_comm_check
+    pop     {r1, lr}
+    ldrb    r0, [r1]
+    bx      lr
 
 
 @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -242,7 +244,7 @@ PicoReadM68k16_cell1:                   @ 0x220000 - 0x23ffff, cell arranged
     bx      lr
 
 
-PicoReadM68k16_io:
+PicoRead16_mcd_io:
     and     r1, r0, #0xff00
     cmp     r1, #0x2000	              @ a120xx
     bne     PicoRead16_io
@@ -269,18 +271,16 @@ m_m68k_read16_r00:
     and     r0, r0, #0x04000000       @ we need irq2 mask state
     orr     r0, r1, r0, lsr #11
     bx      lr
-m_m68k_read16_r02:                    @ FIXME: out of sync from C
-    add     r3, r1, #0x110000
-    ldrb    r1, [r3, #2]
-    ldrb    r2, [r3, #3]
-    add     r3, r3, #0x002200
-    ldr     r3, [r3, #4]
+m_m68k_read16_r02:
+    add     r1, r1, #0x110000
+    push    {r1, lr}
+    bl      m68k_comm_check
+    pop     {r1, lr}
+    ldrb    r2, [r1, #3]
+    ldrb    r0, [r1, #2]
     and     r2, r2, #0xc7
-    orr     r1, r2, r1, lsl #8
-    tst     r3, #2                    @ DMNA pending?
-    bicne   r1, r1, #1
-    orrne   r1, r1, #2
-    b       m68k_comm_check
+    orr     r0, r2, r0, lsl #8
+    bx      lr
 m_m68k_read16_r04:
     add     r1, r1, #0x110000
     ldrb    r0, [r1, #4]
@@ -300,14 +300,19 @@ m_m68k_read16_r0c:
     bx      lr
 m_m68k_read16_hi:
     cmp     r0, #0x30
-    addlt   r1, r1, #0x110000
-    ldrlth  r1, [r1, r0]
+    add     r1, r1, #0x110000
     movge   r0, #0
     bxge    lr
-    mov     r2, r1, lsr #8
-    and     r1, r1, #0xff
-    orr     r1, r2, r1, lsl #8
-    b       m68k_comm_check
+
+    add     r1, r0, r1
+    push    {r1, lr}
+    bl      m68k_comm_check
+    pop     {r0, lr}
+    ldrh    r0, [r0]
+    mov     r1, r0, lsr #8
+    and     r0, r0, #0xff
+    orr     r0, r1, r0, lsl #8
+    bx      lr
 
 
 @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -330,7 +335,7 @@ PicoWriteM68k8_cell1:                   @ 0x220000 - 0x23ffff, cell arranged
     bx      lr
 
 
-PicoWriteM68k8_io:
+PicoWrite8_mcd_io:
     and     r2, r0, #0xff00
     cmp     r2, #0x2000                 @ a120xx?
     beq     m68k_reg_write8
@@ -357,7 +362,7 @@ PicoWriteM68k16_cell1:                   @ 0x220000 - 0x23ffff, cell arranged
     bx      lr
 
 
-PicoWriteM68k16_io:
+PicoWrite16_mcd_io:
     and     r2, r0, #0xff00
     cmp     r2, #0x2000                 @ a120xx?
     bne     PicoWrite16_io