notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfixes, cd/Memory.s
[picodrive.git]
/
Pico
/
Memory.s
diff --git
a/Pico/Memory.s
b/Pico/Memory.s
index
51778c4
..
8fd4e13
100644
(file)
--- a/
Pico/Memory.s
+++ b/
Pico/Memory.s
@@
-1,3
+1,5
@@
+@ vim:filetype=armasm
\r
+
\r
@ memory handlers with banking support for SSF II - The New Challengers
\r
@ mostly based on Gens code
\r
\r
@ memory handlers with banking support for SSF II - The New Challengers
\r
@ mostly based on Gens code
\r
\r
@@
-384,7
+386,7
@@
m_read8_above_rom:
stmfd sp!,{r0,lr}
\r
bic r0, r0, #1
\r
mov r1, #8
\r
stmfd sp!,{r0,lr}
\r
bic r0, r0, #1
\r
mov r1, #8
\r
- bl
UnusualRead16
\r
+ bl
OtherRead16End
\r
ldmfd sp!,{r1,lr}
\r
tst r1, #1
\r
moveq r0, r0, lsr #8
\r
ldmfd sp!,{r1,lr}
\r
tst r1, #1
\r
moveq r0, r0, lsr #8
\r
@@
-485,18
+487,20
@@
m_read16_romF: @ 0x780000 - 0x7fffff
m_read16_rom 0xF
\r
\r
m_read16_misc:
\r
m_read16_rom 0xF
\r
\r
m_read16_misc:
\r
- mov r1, #16
\r
- ldr r2, =OtherRead16
\r
bic r0, r0, #1
\r
bic r0, r0, #1
\r
- bx r2
\r
+ mov r1, #16
\r
+ b OtherRead16
\r
+@ ldr r2, =OtherRead16
\r
+@ bx r2
\r
\r
m_read16_vdp:
\r
tst r0, #0x70000
\r
tsteq r0, #0x000e0
\r
bxne lr @ invalid read
\r
\r
m_read16_vdp:
\r
tst r0, #0x70000
\r
tsteq r0, #0x000e0
\r
bxne lr @ invalid read
\r
- ldr r1, =PicoVideoRead
\r
bic r0, r0, #1
\r
bic r0, r0, #1
\r
- bx r1
\r
+ b PicoVideoRead
\r
+@ ldr r1, =PicoVideoRead
\r
+@ bx r1
\r
\r
m_read16_ram:
\r
ldr r1, =Pico
\r
\r
m_read16_ram:
\r
ldr r1, =Pico
\r
@@
-506,10
+510,11
@@
m_read16_ram:
bx lr
\r
\r
m_read16_above_rom:
\r
bx lr
\r
\r
m_read16_above_rom:
\r
- mov r1, #16
\r
- ldr r2, =UnusualRead16
\r
bic r0, r0, #1
\r
bic r0, r0, #1
\r
- bx r2
\r
+ mov r1, #16
\r
+ b OtherRead16End
\r
+@ ldr r2, =OtherRead16End
\r
+@ bx r2
\r
\r
.pool
\r
\r
\r
.pool
\r
\r
@@
-633,12
+638,10
@@
m_read32_vdp:
tsteq r0, #0x000e0
\r
bxne lr @ invalid read
\r
bic r0, r0, #1
\r
tsteq r0, #0x000e0
\r
bxne lr @ invalid read
\r
bic r0, r0, #1
\r
- stmfd sp!,{r0,lr}
\r
+ add r1, r0, #2
\r
+ stmfd sp!,{r1,lr}
\r
bl PicoVideoRead
\r
bl PicoVideoRead
\r
- mov r1, r0
\r
- ldmfd sp!,{r0}
\r
- stmfd sp!,{r1}
\r
- add r0, r0, #2
\r
+ swp r0, r0, [sp]
\r
bl PicoVideoRead
\r
ldmfd sp!,{r1,lr}
\r
orr r0, r0, r1, lsl #16
\r
bl PicoVideoRead
\r
ldmfd sp!,{r1,lr}
\r
orr r0, r0, r1, lsl #16
\r
@@
-657,13
+660,13
@@
m_read32_above_rom:
bic r0, r0, #1
\r
stmfd sp!,{r0,lr}
\r
mov r1, #32
\r
bic r0, r0, #1
\r
stmfd sp!,{r0,lr}
\r
mov r1, #32
\r
- bl
UnusualRead16
\r
+ bl
OtherRead16End
\r
mov r1, r0
\r
ldmfd sp!,{r0}
\r
stmfd sp!,{r1}
\r
add r0, r0, #2
\r
mov r1, #32
\r
mov r1, r0
\r
ldmfd sp!,{r0}
\r
stmfd sp!,{r1}
\r
add r0, r0, #2
\r
mov r1, #32
\r
- bl
UnusualRead16
\r
+ bl
OtherRead16End
\r
ldmfd sp!,{r1,lr}
\r
orr r0, r0, r1, lsl #16
\r
bx lr
\r
ldmfd sp!,{r1,lr}
\r
orr r0, r0, r1, lsl #16
\r
bx lr
\r