notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarify PicoDrive's license
[picodrive.git]
/
pico
/
memory_arm.s
diff --git
a/pico/memory_arm.s
b/pico/memory_arm.s
index
dde8342
..
9d46ba9
100644
(file)
--- a/
pico/memory_arm.s
+++ b/
pico/memory_arm.s
@@
-1,8
+1,10
@@
-@ vim:filetype=armasm
\r
-
\r
-@ (c) Copyright 2006-2009, Grazvydas "notaz" Ignotas
\r
-@ All Rights Reserved
\r
-
\r
+/*
\r
+ * PicoDrive
\r
+ * (C) notaz, 2006-2009
\r
+ *
\r
+ * This work is licensed under the terms of MAME license.
\r
+ * See COPYING file in the top-level directory.
\r
+ */
\r
\r
@@ .include "port_config.s"
\r
\r
\r
@@ .include "port_config.s"
\r
\r
@@
-27,7
+29,7
@@
PicoRead8_sram: @ u32 a, u32 d
ldr r3, =(Pico+0x22200)
\r
ldr r1, [r2, #8] @ SRam.end
\r
cmp r0, r1
\r
ldr r3, =(Pico+0x22200)
\r
ldr r1, [r2, #8] @ SRam.end
\r
cmp r0, r1
\r
- bg
e
m_read8_nosram
\r
+ bg
t
m_read8_nosram
\r
ldr r1, [r2, #4] @ SRam.start
\r
cmp r0, r1
\r
blt m_read8_nosram
\r
ldr r1, [r2, #4] @ SRam.start
\r
cmp r0, r1
\r
blt m_read8_nosram
\r
@@
-58,8
+60,8
@@
m_read8_nosram:
m_read8_eeprom:
\r
stmfd sp!,{r0,lr}
\r
bl EEPROM_read
\r
m_read8_eeprom:
\r
stmfd sp!,{r0,lr}
\r
bl EEPROM_read
\r
- ldmfd sp!,{r
0
,lr}
\r
- tst r
0
, #1
\r
+ ldmfd sp!,{r
1
,lr}
\r
+ tst r
1
, #1
\r
moveq r0, r0, lsr #8
\r
bx lr
\r
\r
moveq r0, r0, lsr #8
\r
bx lr
\r
\r
@@
-126,7
+128,7
@@
PicoRead16_sram: @ u32 a, u32 d
ldr r3, =(Pico+0x22200)
\r
ldr r1, [r2, #8] @ SRam.end
\r
cmp r0, r1
\r
ldr r3, =(Pico+0x22200)
\r
ldr r1, [r2, #8] @ SRam.end
\r
cmp r0, r1
\r
- bg
e
m_read16_nosram
\r
+ bg
t
m_read16_nosram
\r
ldr r1, [r2, #4] @ SRam.start
\r
cmp r0, r1
\r
blt m_read16_nosram
\r
ldr r1, [r2, #4] @ SRam.start
\r
cmp r0, r1
\r
blt m_read16_nosram
\r
@@
-304,3
+306,4
@@
m_write16_not_sreg:
\r
.pool
\r
\r
\r
.pool
\r
\r
+@ vim:filetype=armasm
\r