notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error checking for png
[picodrive.git]
/
Pico
/
cd
/
Memory.s
diff --git
a/Pico/cd/Memory.s
b/Pico/cd/Memory.s
index
cedab28
..
1b9fe96
100644
(file)
--- a/
Pico/cd/Memory.s
+++ b/
Pico/cd/Memory.s
@@
-128,7
+128,6
@@
m_s68k_decode_write_table:
.extern PicoVideoRead
.extern Read_CDC_Host
.extern m68k_reg_write8
.extern PicoVideoRead
.extern Read_CDC_Host
.extern m68k_reg_write8
-.extern OtherWrite8
.extern OtherWrite16
.extern gfx_cd_read
.extern s68k_reg_read16
.extern OtherWrite16
.extern gfx_cd_read
.extern s68k_reg_read16
@@
-136,9
+135,11
@@
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 s68k_poll_detect
.extern SN76496Write
+.extern m_m68k_read8_misc
+.extern m_m68k_write8_misc
@ r0=reg3, r1-r3=temp
@ r0=reg3, r1-r3=temp
@@
-379,7
+380,7
@@
PicoWriteS68k32: @ u32 a, u32 d
add r2, r2, #0x110000
add r2, r2, #0x002200
.if \is_read
add r2, r2, #0x110000
add r2, r2, #0x002200
.if \is_read
- ldrb r0, [r2, #0x18]
+ ldrb r0, [r2, #0x18]
@ Pico_mcd->m.bcram_reg
.else
strb r1, [r2, #0x18]
.endif
.else
strb r1, [r2, #0x18]
.endif
@@
-502,7
+503,7
@@
m_m68k_read8_system_io:
bic r2, r0, #0xfe0000
bic r2, r2, #0x3f
cmp r2, #0x012000
bic r2, r0, #0xfe0000
bic r2, r2, #0x3f
cmp r2, #0x012000
- bne m_m68k_read8_misc
+ bne m_m68k_read8_misc
@ now from Pico/Memory.s
ldr r1, =(Pico+0x22200)
and r0, r0, #0x3f
ldr r1, =(Pico+0x22200)
and r0, r0, #0x3f
@@
-588,7
+589,7
@@
m_m68k_read8_hi:
ldrb r0, [r1, r0]
bx lr
ldrb r0, [r1, r0]
bx lr
-
+/*
m_m68k_read8_misc:
bic r2, r0, #0x00ff
bic r2, r2, #0xbf00
m_m68k_read8_misc:
bic r2, r0, #0x00ff
bic r2, r2, #0xbf00
@@
-604,7
+605,7
@@
m_m68k_read8_misc:
tst r1, #1
moveq r0, r0, lsr #8
bx lr
tst r1, #1
moveq r0, r0, lsr #8
bx lr
-
+*/
m_m68k_read8_vdp:
tst r0, #0x70000
m_m68k_read8_vdp:
tst r0, #0x70000
@@
-1116,7
+1117,8
@@
m_m68k_write8_system_io:
cmp r2, #0x012000
beq m68k_reg_write8
mov r2, #8
cmp r2, #0x012000
beq m68k_reg_write8
mov r2, #8
- b OtherWrite8
+@ b OtherWrite8
+ b m_m68k_write8_misc
m_m68k_write8_vdp:
m_m68k_write8_vdp:
@@
-1256,7
+1258,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
@@
-1447,7
+1449,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]