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, preparations for msu support (arm version)

Browse source
This commit is contained in:
kub 2023-05-26 20:45:13 +00:00
parent 02ff025479
commit f27a1749fe
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pico/cd/memory.c
View file

@ -95,6 +95,14 @@ void m68k_comm_check(u32 a)
} }
} }
u32 pcd_stopwatch_read(int sub)
{
// ugh..
u32 d = sub ? SekCyclesDoneS68k() : pcd_cycles_m68k_to_s68k(SekCyclesDone());
d = (d - Pico_mcd->m.stopwatch_base_c) / 384;
return d & 0x0fff;
}
#ifndef _ASM_CD_MEMORY_C #ifndef _ASM_CD_MEMORY_C
static u32 m68k_reg_read16(u32 a) static u32 m68k_reg_read16(u32 a)
{ {
@ -121,14 +129,11 @@ static u32 m68k_reg_read16(u32 a)
case 8: case 8:
d = cdc_host_r(); d = cdc_host_r();
goto end; goto end;
case 0xA: case 0xa:
elprintf(EL_UIO, "m68k FIXME: reserved read"); elprintf(EL_UIO, "m68k FIXME: reserved read");
goto end; goto end;
case 0xC: // 384 cycle stopwatch timer case 0xc: // 384 cycle stopwatch timer
// ugh.. d = pcd_stopwatch_read(0);
d = pcd_cycles_m68k_to_s68k(SekCyclesDone());
d = (d - Pico_mcd->m.stopwatch_base_c) / 384;
d &= 0x0fff;
elprintf(EL_CDREGS, "m68k stopwatch timer read (%04x)", d); elprintf(EL_CDREGS, "m68k stopwatch timer read (%04x)", d);
goto end; goto end;
} }
@ -331,10 +336,8 @@ u32 s68k_reg_read16(u32 a)
case 8: case 8:
d = cdc_host_r(); d = cdc_host_r();
goto end; goto end;
case 0xC: case 0xc:
d = SekCyclesDoneS68k() - Pico_mcd->m.stopwatch_base_c; d = pcd_stopwatch_read(1);
d /= 384;
d &= 0x0fff;
elprintf(EL_CDREGS, "s68k stopwatch timer read (%04x)", d); elprintf(EL_CDREGS, "s68k stopwatch timer read (%04x)", d);
goto end; goto end;
case 0x30: case 0x30:

27
pico/cd/memory_arm.S
View file

@ -195,6 +195,8 @@ m_m68k_read8_r06:
ldrb r0, [r1, #0x73] @ IRQ vector ldrb r0, [r1, #0x73] @ IRQ vector
bx lr bx lr
m_m68k_read8_r07: m_m68k_read8_r07:
PIC_LDR(r1, r2, Pico)
ldr r1, [r1, #OFS_Pico_rom]
ldrb r0, [r1, #0x72] ldrb r0, [r1, #0x72]
bx lr bx lr
m_m68k_read8_r08: m_m68k_read8_r08:
@ -206,17 +208,13 @@ m_m68k_read8_r09:
mov r0, #0 mov r0, #0
b cdc_host_r b cdc_host_r
m_m68k_read8_r0c: m_m68k_read8_r0c:
add r1, r1, #0x110000 mov r1, #0
add r1, r1, #0x002200 bl pcd_stopwatch_read
ldr r0, [r1, #0x14] @ Pico_mcd->m.timer_stopwatch mov r0, r0, lsr #8
mov r0, r0, lsr #24
bx lr bx lr
m_m68k_read8_r0d: m_m68k_read8_r0d:
add r1, r1, #0x110000 mov r1, #0
add r1, r1, #0x002200 b pcd_stopwatch_read
ldr r0, [r1, #0x14]
mov r0, r0, lsr #16
bx lr
m_m68k_read8_hi: m_m68k_read8_hi:
cmp r0, #0x30 cmp r0, #0x30
add r1, r1, #0x110000 add r1, r1, #0x110000
@ -258,7 +256,7 @@ PicoRead16_mcd_io:
m_m68k_read16_m68k_regs: m_m68k_read16_m68k_regs:
PIC_LDR(r1, r2, Pico_mcd) PIC_LDR(r1, r2, Pico_mcd)
and r0, r0, #0x3e and r0, r0, #0x3e
ldr r1, [r1, @ Pico.mcd ldr r1, [r1] @ Pico.mcd
cmp r0, #0x0e cmp r0, #0x0e
PIC_XB(lt ,r0, lsl #1) PIC_XB(lt ,r0, lsl #1)
b m_m68k_read16_hi b m_m68k_read16_hi
@ -293,17 +291,16 @@ m_m68k_read16_r04:
mov r0, r0, lsl #8 mov r0, r0, lsl #8
bx lr bx lr
m_m68k_read16_r06: m_m68k_read16_r06:
PIC_LDR(r1, r2, Pico)
ldr r1, [r1, #OFS_Pico_rom]
ldrh r0, [r1, #0x72] @ IRQ vector ldrh r0, [r1, #0x72] @ IRQ vector
bx lr bx lr
m_m68k_read16_r08: m_m68k_read16_r08:
mov r0, #0 mov r0, #0
b cdc_host_r b cdc_host_r
m_m68k_read16_r0c: m_m68k_read16_r0c:
add r1, r1, #0x110000 mov r1, #0
add r1, r1, #0x002200 b pcd_stopwatch_read
ldr r0, [r1, #0x14]
mov r0, r0, lsr #16
bx lr
m_m68k_read16_hi: m_m68k_read16_hi:
cmp r0, #0x30 cmp r0, #0x30
add r1, r1, #0x110000 add r1, r1, #0x110000