RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mcd, fixes for msu

Browse source
This commit is contained in:
kub 2023-05-30 22:07:56 +00:00
parent 02f3222feb
commit 411b2c1949
3 changed files with 62 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pico/cd/memory_arm.S
View file

@ -165,9 +165,13 @@ PicoRead8_mcd_io:
PIC_BT(m_m68k_read8_r0d)
m_m68k_read8_r00:
add r1, r1, #0x110000
ldr r0, [r1, #0x30]
ldr r0, [r1, #0x30] @ Pico_mcd->s68k_regs
add r1, r1, #0x002200
ldr r1, [r1, #4] @ Pico_mcd->m.state_flags
and r0, r0, #0x04000000 @ we need irq2 mask state
mov r0, r0, lsr #19
and r1, r1, #0x00000100 @ irq2 pending
orr r0, r0, r1, lsr #8
bx lr
m_m68k_read8_r01:
add r1, r1, #0x110000
@ -271,9 +275,12 @@ m_m68k_read16_r00:
add r1, r1, #0x110000
ldr r0, [r1, #0x30]
add r1, r1, #0x002200
ldrb r1, [r1, #2] @ Pico_mcd->m.busreq
ldrb r2, [r1, #2] @ Pico_mcd->m.busreq
ldr r1, [r1, #4]
and r0, r0, #0x04000000 @ we need irq2 mask state
orr r0, r1, r0, lsr #11
orr r0, r2, r0, lsr #11
and r1, r1, #0x00000100 @ irq2 pending
orr r0, r1, r0
bx lr
m_m68k_read16_r02:
add r1, r1, #0x110000