X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory_arm.s;h=9d46ba94a40a850929177bb7dcff1998910d855d;hb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;hp=e2b5990eec7fec917d2207525da9580e62eda86e;hpb=0ace9b9aac5de8f1ee5bf181132f98a1f81f4a1d;p=picodrive.git

diff --git a/pico/memory_arm.s b/pico/memory_arm.s
index e2b5990..9d46ba9 100644
--- a/pico/memory_arm.s
+++ b/pico/memory_arm.s
@@ -1,8 +1,10 @@
-@ vim:filetype=armasm
-
-@ (c) Copyright 2006-2009, Grazvydas "notaz" Ignotas
-@ All Rights Reserved
-
+/*
+ * PicoDrive
+ * (C) notaz, 2006-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 @@ .include "port_config.s"
 
@@ -10,7 +12,7 @@
 .equ SRR_READONLY,  (1 <<  1)
 .equ SRF_EEPROM,    (1 <<  1)
 .equ POPT_6BTN_PAD, (1 <<  5)
-.equ POPT_DIS_32X,  (1 << 20)
+.equ POPT_EN_32X,   (1 << 20)
 
 .text
 .align 4
@@ -27,7 +29,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 +60,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
 
@@ -114,8 +116,8 @@ m_read8_not_io:
 m_read8_not_brq:
     ldr     r2, =PicoOpt
     ldr     r2, [r2]
-    tst     r2, #POPT_DIS_32X
-    beq     PicoRead8_32x
+    tst     r2, #POPT_EN_32X
+    bne     PicoRead8_32x
     mov     r0, #0
     bx      lr
 
@@ -126,7 +128,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
@@ -190,8 +192,8 @@ m_read16_not_io:
 m_read16_not_brq:
     ldr     r2, =PicoOpt
     ldr     r2, [r2]
-    tst     r2, #POPT_DIS_32X
-    beq     PicoRead16_32x
+    tst     r2, #POPT_EN_32X
+    bne     PicoRead16_32x
     mov     r0, #0
     bx      lr
 
@@ -261,8 +263,8 @@ m_write8_not_z80ctl:
 m_write8_not_sreg:
     ldr     r2, =PicoOpt
     ldr     r2, [r2]
-    tst     r2, #POPT_DIS_32X
-    beq     PicoWrite8_32x
+    tst     r2, #POPT_EN_32X
+    bne     PicoWrite8_32x
     bx      lr
 
 @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -298,9 +300,10 @@ m_write16_not_z80ctl:
 m_write16_not_sreg:
     ldr     r2, =PicoOpt
     ldr     r2, [r2]
-    tst     r2, #POPT_DIS_32X
-    beq     PicoWrite16_32x
+    tst     r2, #POPT_EN_32X
+    bne     PicoWrite16_32x
     bx      lr
 
 .pool
 
+@ vim:filetype=armasm