notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAME integration finished, some adjustments of CPU core stuff
[picodrive.git]
/
Pico
/
cd
/
Memory.s
diff --git
a/Pico/cd/Memory.s
b/Pico/cd/Memory.s
index
7b19e61
..
3b49cac
100644
(file)
--- a/
Pico/cd/Memory.s
+++ b/
Pico/cd/Memory.s
@@
-136,7
+136,7
@@
m_s68k_decode_write_table:
.extern gfx_cd_write16
.extern s68k_reg_write8
.extern s68k_poll_adclk
.extern gfx_cd_write16
.extern s68k_reg_write8
.extern s68k_poll_adclk
-.extern PicoCpuS68k
+.extern PicoCpu
M
S68k
.extern s68k_poll_detect
.extern SN76496Write
.extern m_m68k_read8_misc
.extern s68k_poll_detect
.extern SN76496Write
.extern m_m68k_read8_misc
@@
-1259,7
+1259,7
@@
m_m68k_write16_regs_spec: @ special case
and r2, r2, #0xfe
cmp r2, #0x0e
bxne lr
and r2, r2, #0xfe
cmp r2, #0x0e
bxne lr
- ldr r0, =PicoCpuS68k
+ ldr r0, =PicoCpu
C
S68k
str r1, [r0, #0x58] @ push s68k out of stopped state
str r1, [r3]
bx lr
str r1, [r0, #0x58] @ push s68k out of stopped state
str r1, [r3]
bx lr
@@
-1450,7
+1450,7
@@
m_m68k_write32_regs_comm: @ Handle the 0x10-0x1f range
strneh r1, [r2, #2]
cmp r0, #0x10
bxlt lr
strneh r1, [r2, #2]
cmp r0, #0x10
bxlt lr
- ldr r0, =PicoCpu
S68k
@ remove poll detected state for s68k
+ ldr r0, =PicoCpu
CS68k
@ remove poll detected state for s68k
mov r1, #0
str r1, [r0, #0x58]
str r1, [r3]
mov r1, #0
str r1, [r0, #0x58]
str r1, [r3]