notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cd: fix yet more desyncs
[picodrive.git]
/
pico
/
cd
/
memory_arm.s
diff --git
a/pico/cd/memory_arm.s
b/pico/cd/memory_arm.s
index
598bcd7
..
db5b8a2
100644
(file)
--- a/
pico/cd/memory_arm.s
+++ b/
pico/cd/memory_arm.s
@@
-11,10
+11,10
@@
.text
.align 2
.text
.align 2
-.global PicoRead
M68k8
_io
-.global PicoRead
M68k16
_io
-.global PicoWrite
M68k8
_io
-.global PicoWrite
M68k16
_io
+.global PicoRead
8_mcd
_io
+.global PicoRead
16_mcd
_io
+.global PicoWrite
8_mcd
_io
+.global PicoWrite
16_mcd
_io
.global PicoReadS68k8_pr
.global PicoReadS68k16_pr
.global PicoReadS68k8_pr
.global PicoReadS68k16_pr
@@
-53,15
+53,17
@@
.extern m68k_reg_write8
.extern s68k_reg_read16
.extern s68k_reg_write8
.extern m68k_reg_write8
.extern s68k_reg_read16
.extern s68k_reg_write8
-.extern s68k_poll_adclk
.extern s68k_poll_detect
.extern gfx_cd_read
.extern gfx_cd_write16
.extern s68k_poll_detect
.extern gfx_cd_read
.extern gfx_cd_write16
+.extern pcd_pcm_write
+.extern pcd_pcm_read
.extern PicoCpuCS68k
.extern PicoRead8_io
.extern PicoRead16_io
.extern PicoWrite8_io
.extern PicoWrite16_io
.extern PicoCpuCS68k
.extern PicoRead8_io
.extern PicoRead16_io
.extern PicoWrite8_io
.extern PicoWrite16_io
+.extern m68k_comm_check
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@
-134,7
+136,7
@@
PicoReadM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
bx lr
-PicoRead
M68k8
_io:
+PicoRead
8_mcd
_io:
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx?
bne PicoRead8_io
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx?
bne PicoRead8_io
@@
-176,14
+178,11
@@
m_m68k_read8_r02:
bx lr
m_m68k_read8_r03:
add r1, r1, #0x110000
bx lr
m_m68k_read8_r03:
add r1, r1, #0x110000
+ push {r1, lr}
+ bl m68k_comm_check
+ pop {r1, lr}
ldrb r0, [r1, #3]
ldrb r0, [r1, #3]
- add r1, r1, #0x002200
- ldr r1, [r1, #4]
and r0, r0, #0xc7
and r0, r0, #0xc7
- tst r1, #2 @ DMNA pending?
- bxeq lr
- bic r0, r0, #1
- orr r0, r0, #2
bx lr
m_m68k_read8_r04:
add r1, r1, #0x110000
bx lr
m_m68k_read8_r04:
add r1, r1, #0x110000
@@
-216,14
+215,15
@@
m_m68k_read8_r0d:
mov r0, r0, lsr #16
bx lr
m_m68k_read8_hi:
mov r0, r0, lsr #16
bx lr
m_m68k_read8_hi:
- push {r0,r1,lr}
- bl m68k_comm_check
- pop {r0,r1,lr}
cmp r0, #0x30
cmp r0, #0x30
- movge r0, #0
- bxeq lr
add r1, r1, #0x110000
add r1, r1, #0x110000
- ldrb r0, [r1, r0]
+ movge r0, #0
+ bxge lr
+ add r1, r0
+ push {r1, lr}
+ bl m68k_comm_check
+ pop {r1, lr}
+ ldrb r0, [r1]
bx lr
bx lr
@@
-246,7
+246,7
@@
PicoReadM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
bx lr
-PicoRead
M68k16
_io:
+PicoRead
16_mcd
_io:
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx
bne PicoRead16_io
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx
bne PicoRead16_io
@@
-275,16
+275,13
@@
m_m68k_read16_r00:
bx lr
m_m68k_read16_r02:
add r1, r1, #0x110000
bx lr
m_m68k_read16_r02:
add r1, r1, #0x110000
- ldrb r0, [r1, #2]
+ push {r1, lr}
+ bl m68k_comm_check
+ pop {r1, lr}
ldrb r2, [r1, #3]
ldrb r2, [r1, #3]
- add r1, r1, #0x002200
- ldr r1, [r1, #4]
+ ldrb r0, [r1, #2]
and r2, r2, #0xc7
orr r0, r2, r0, lsl #8
and r2, r2, #0xc7
orr r0, r2, r0, lsl #8
- tst r1, #2 @ DMNA pending?
- bxeq lr
- bic r0, r0, #1
- orr r0, r0, #2
bx lr
m_m68k_read16_r04:
add r1, r1, #0x110000
bx lr
m_m68k_read16_r04:
add r1, r1, #0x110000
@@
-305,13
+302,18
@@
m_m68k_read16_r0c:
bx lr
m_m68k_read16_hi:
cmp r0, #0x30
bx lr
m_m68k_read16_hi:
cmp r0, #0x30
- addlt r1, r1, #0x110000
- ldrlth r1, [r1, r0]
+ add r1, r1, #0x110000
movge r0, #0
bxge lr
movge r0, #0
bxge lr
- mov r0, r1, lsr #8
- and r1, r1, #0xff
- orr r0, r0, r1, lsl #8
+
+ add r1, r0, r1
+ push {r1, lr}
+ bl m68k_comm_check
+ pop {r0, lr}
+ ldrh r0, [r0]
+ mov r1, r0, lsr #8
+ and r0, r0, #0xff
+ orr r0, r1, r0, lsl #8
bx lr
bx lr
@@
-335,7
+337,7
@@
PicoWriteM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
bx lr
-PicoWrite
M68k8
_io:
+PicoWrite
8_mcd
_io:
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
beq m68k_reg_write8
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
beq m68k_reg_write8
@@
-362,7
+364,7
@@
PicoWriteM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
bx lr
-PicoWrite
M68k16
_io:
+PicoWrite
16_mcd
_io:
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
bne PicoWrite16_io
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
bne PicoWrite16_io
@@
-380,22
+382,8
@@
m_m68k_write16_regs:
b m68k_reg_write8
m_m68k_write16_regs_spec: @ special case
b m68k_reg_write8
m_m68k_write16_regs_spec: @ special case
- ldr r2, =(Pico+0x22200)
- ldr r3, =s68k_poll_adclk
- mov r0, #0x110000
- ldr r2, [r2]
- add r0, r0, #0x00000e
mov r1, r1, lsr #8
mov r1, r1, lsr #8
- strb r1, [r2, r0] @ if (a == 0xe) s68k_regs[0x0e] = d >> 8;
- ldr r2, [r3]
- mov r1, #0
- and r2, r2, #0xfe
- cmp r2, #0x0e
- bxne lr
- ldr r0, =PicoCpuCS68k
- str r1, [r0, #0x58] @ push s68k out of stopped state
- str r1, [r3]
- bx lr
+ b m68k_reg_write8
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@
-461,23
+449,15
@@
m_s68k_read8_pcm:
@ must not trash r3 and r12
ldr r1, =(Pico+0x22200)
bic r0, r0, #0xff0000
@ must not trash r3 and r12
ldr r1, =(Pico+0x22200)
bic r0, r0, #0xff0000
-@ bic r0, r0, #0x008000
ldr r1, [r1]
mov r2, #0x110000
orr r2, r2, #0x002200
cmp r0, #0x2000
bge m_s68k_read8_pcm_ram
cmp r0, #0x20
ldr r1, [r1]
mov r2, #0x110000
orr r2, r2, #0x002200
cmp r0, #0x2000
bge m_s68k_read8_pcm_ram
cmp r0, #0x20
- movlt r0, #0
- bxlt lr
- orr r2, r2, #(0x48+8) @ pcm.ch + addr_offset
- add r1, r1, r2
- and r2, r0, #0x1c
- ldr r1, [r1, r2, lsl #2]
- tst r0, #2
- moveq r0, r1, lsr #PCM_STEP_SHIFT
- movne r0, r1, lsr #(PCM_STEP_SHIFT+8)
- and r0, r0, #0xff
+ movge r0, r0, lsr #1
+ bge pcd_pcm_read
+ mov r0, #0
bx lr
m_s68k_read8_pcm_ram:
bx lr
m_s68k_read8_pcm_ram:
@@
-614,7
+594,7
@@
m_s68k_write8_pcm:
bic r0, r0, #0xff0000
cmp r0, #0x12
movlt r0, r0, lsr #1
bic r0, r0, #0xff0000
cmp r0, #0x12
movlt r0, r0, lsr #1
- blt pcm_write
+ blt pc
d_pc
m_write
cmp r0, #0x2000
bxlt lr
cmp r0, #0x2000
bxlt lr