X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory_arm.s;h=972b9182d7f6a46d95d5495da4b31f4929e75520;hb=b4db550e41b2aa277f570d7bff890c8e8ee1831f;hp=dde8342d22773dc377c25a9b224d1f6c17b70244;hpb=a736af3ecf708652f90e9cb05445d984960a0eec;p=picodrive.git

diff --git a/pico/memory_arm.s b/pico/memory_arm.s
index dde8342..972b918 100644
--- a/pico/memory_arm.s
+++ b/pico/memory_arm.s
@@ -27,7 +27,7 @@ PicoRead8_sram: @ u32 a, u32 d
     ldr     r3, =(Pico+0x22200)
     ldr     r1, [r2, #8]    @ SRam.end
     cmp     r0, r1
-    bge     m_read8_nosram
+    bgt     m_read8_nosram
     ldr     r1, [r2, #4]    @ SRam.start
     cmp     r0, r1
     blt     m_read8_nosram
@@ -58,8 +58,8 @@ m_read8_nosram:
 m_read8_eeprom:
     stmfd   sp!,{r0,lr}
     bl      EEPROM_read
-    ldmfd   sp!,{r0,lr}
-    tst     r0, #1
+    ldmfd   sp!,{r1,lr}
+    tst     r1, #1
     moveq   r0, r0, lsr #8
     bx      lr
 
@@ -126,7 +126,7 @@ PicoRead16_sram: @ u32 a, u32 d
     ldr     r3, =(Pico+0x22200)
     ldr     r1, [r2, #8]    @ SRam.end
     cmp     r0, r1
-    bge     m_read16_nosram
+    bgt     m_read16_nosram
     ldr     r1, [r2, #4]    @ SRam.start
     cmp     r0, r1
     blt     m_read16_nosram