X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fmemory_arm.s;h=be2fa99556ad828ee72c18c12a99c6e7fab14425;hb=7fd5d17b31f3ccdbc3eaf7e9761ddb41fa994863;hp=dde8342d22773dc377c25a9b224d1f6c17b70244;hpb=db1d3564e69b422518701926bffdeae05379c400;p=picodrive.git

diff --git a/pico/memory_arm.s b/pico/memory_arm.s
index dde8342..be2fa99 100644
--- a/pico/memory_arm.s
+++ b/pico/memory_arm.s
@@ -1,10 +1,10 @@
-@ vim:filetype=armasm
-
-@ (c) Copyright 2006-2009, Grazvydas "notaz" Ignotas
-@ All Rights Reserved
-
-
-@@ .include "port_config.s"
+/*
+ * PicoDrive
+ * (C) notaz, 2006-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 .equ SRR_MAPPED,    (1 <<  0)
 .equ SRR_READONLY,  (1 <<  1)
@@ -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
@@ -304,3 +304,4 @@ m_write16_not_sreg:
 
 .pool
 
+@ vim:filetype=armasm