mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
split memories away from Pico
saves ~3k of code on ARM because Pico no longer crosses ldr limit
This commit is contained in:
notaz
parent
e64886365d
commit
88fd63ad10
30 changed files with 633 additions and 587 deletions
|
|
@ -26,7 +26,7 @@ PICO_INTERNAL void DmaSlowCell(unsigned int source, unsigned int a, int len, uns
|
|||
switch (Pico.video.type)
|
||||
{
|
||||
case 1: // vram
|
||||
r = Pico.vram;
|
||||
r = PicoMem.vram;
|
||||
for(; len; len--)
|
||||
{
|
||||
asrc = cell_map(source >> 2) << 2;
|
||||
|
|
@ -42,7 +42,7 @@ PICO_INTERNAL void DmaSlowCell(unsigned int source, unsigned int a, int len, uns
|
|||
|
||||
case 3: // cram
|
||||
Pico.m.dirtyPal = 1;
|
||||
r = Pico.cram;
|
||||
r = PicoMem.cram;
|
||||
for(a2=a&0x7f; len; len--)
|
||||
{
|
||||
asrc = cell_map(source >> 2) << 2;
|
||||
|
|
@ -58,7 +58,7 @@ PICO_INTERNAL void DmaSlowCell(unsigned int source, unsigned int a, int len, uns
|
|||
break;
|
||||
|
||||
case 5: // vsram[a&0x003f]=d;
|
||||
r = Pico.vsram;
|
||||
r = PicoMem.vsram;
|
||||
for(a2=a&0x7f; len; len--)
|
||||
{
|
||||
asrc = cell_map(source >> 2) << 2;
|
||||
|
|
|
|||
|
|
@ -76,16 +76,16 @@ PICO_INTERNAL int PicoResetMCD(void)
|
|||
{
|
||||
// reset button doesn't affect MCD hardware
|
||||
|
||||
// use SRam.data for RAM cart
|
||||
// use Pico.sv.data for RAM cart
|
||||
if (PicoOpt & POPT_EN_MCD_RAMCART) {
|
||||
if (SRam.data == NULL)
|
||||
SRam.data = calloc(1, 0x12000);
|
||||
if (Pico.sv.data == NULL)
|
||||
Pico.sv.data = calloc(1, 0x12000);
|
||||
}
|
||||
else if (SRam.data != NULL) {
|
||||
free(SRam.data);
|
||||
SRam.data = NULL;
|
||||
else if (Pico.sv.data != NULL) {
|
||||
free(Pico.sv.data);
|
||||
Pico.sv.data = NULL;
|
||||
}
|
||||
SRam.start = SRam.end = 0; // unused
|
||||
Pico.sv.start = Pico.sv.end = 0; // unused
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -95,17 +95,17 @@ static void SekRunM68kOnce(void)
|
|||
int cyc_do;
|
||||
pevt_log_m68k_o(EVT_RUN_START);
|
||||
|
||||
if ((cyc_do = SekCycleAim - SekCycleCnt) > 0) {
|
||||
SekCycleCnt += cyc_do;
|
||||
if ((cyc_do = Pico.t.m68c_aim - Pico.t.m68c_cnt) > 0) {
|
||||
Pico.t.m68c_cnt += cyc_do;
|
||||
|
||||
#if defined(EMU_C68K)
|
||||
PicoCpuCM68k.cycles = cyc_do;
|
||||
CycloneRun(&PicoCpuCM68k);
|
||||
SekCycleCnt -= PicoCpuCM68k.cycles;
|
||||
Pico.t.m68c_cnt -= PicoCpuCM68k.cycles;
|
||||
#elif defined(EMU_M68K)
|
||||
SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
|
||||
Pico.t.m68c_cnt += m68k_execute(cyc_do) - cyc_do;
|
||||
#elif defined(EMU_F68K)
|
||||
SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
|
||||
Pico.t.m68c_cnt += fm68k_emulate(cyc_do, 0) - cyc_do;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -316,39 +316,39 @@ static void SekSyncM68k(void);
|
|||
|
||||
void pcd_run_cpus_normal(int m68k_cycles)
|
||||
{
|
||||
SekCycleAim += m68k_cycles;
|
||||
Pico.t.m68c_aim += m68k_cycles;
|
||||
if (SekShouldInterrupt() || Pico_mcd->m.m68k_poll_cnt < 12)
|
||||
Pico_mcd->m.m68k_poll_cnt = 0;
|
||||
else if (Pico_mcd->m.m68k_poll_cnt >= 16) {
|
||||
int s68k_left = pcd_sync_s68k(SekCycleAim, 1);
|
||||
int s68k_left = pcd_sync_s68k(Pico.t.m68c_aim, 1);
|
||||
if (s68k_left <= 0) {
|
||||
elprintf(EL_CDPOLL, "m68k poll [%02x] x%d @%06x",
|
||||
Pico_mcd->m.m68k_poll_a, Pico_mcd->m.m68k_poll_cnt, SekPc);
|
||||
SekCycleCnt = SekCycleAim;
|
||||
Pico.t.m68c_cnt = Pico.t.m68c_aim;
|
||||
return;
|
||||
}
|
||||
SekCycleCnt = SekCycleAim - (s68k_left * 40220 >> 16);
|
||||
Pico.t.m68c_cnt = Pico.t.m68c_aim - (s68k_left * 40220 >> 16);
|
||||
}
|
||||
|
||||
while (CYCLES_GT(SekCycleAim, SekCycleCnt)) {
|
||||
while (CYCLES_GT(Pico.t.m68c_aim, Pico.t.m68c_cnt)) {
|
||||
SekRunM68kOnce();
|
||||
if (Pico_mcd->m.need_sync) {
|
||||
Pico_mcd->m.need_sync = 0;
|
||||
pcd_sync_s68k(SekCycleCnt, 0);
|
||||
pcd_sync_s68k(Pico.t.m68c_cnt, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void pcd_run_cpus_lockstep(int m68k_cycles)
|
||||
{
|
||||
unsigned int target = SekCycleAim + m68k_cycles;
|
||||
unsigned int target = Pico.t.m68c_aim + m68k_cycles;
|
||||
do {
|
||||
SekCycleAim += 8;
|
||||
Pico.t.m68c_aim += 8;
|
||||
SekSyncM68k();
|
||||
pcd_sync_s68k(SekCycleAim, 0);
|
||||
} while (CYCLES_GT(target, SekCycleAim));
|
||||
pcd_sync_s68k(Pico.t.m68c_aim, 0);
|
||||
} while (CYCLES_GT(target, Pico.t.m68c_aim));
|
||||
|
||||
SekCycleAim = target;
|
||||
Pico.t.m68c_aim = target;
|
||||
}
|
||||
|
||||
#define PICO_CD
|
||||
|
|
@ -364,7 +364,7 @@ void pcd_prepare_frame(void)
|
|||
|
||||
// need this because we can't have direct mapping between
|
||||
// master<->slave cycle counters because of overflows
|
||||
mcd_m68k_cycle_base = SekCycleAim;
|
||||
mcd_m68k_cycle_base = Pico.t.m68c_aim;
|
||||
mcd_s68k_cycle_base = SekCycleAimS68k;
|
||||
}
|
||||
|
||||
|
|
@ -390,7 +390,7 @@ void pcd_state_loaded(void)
|
|||
Pico_mcd->pcm_regs_dirty = 1;
|
||||
|
||||
// old savestates..
|
||||
cycles = pcd_cycles_m68k_to_s68k(SekCycleAim);
|
||||
cycles = pcd_cycles_m68k_to_s68k(Pico.t.m68c_aim);
|
||||
diff = cycles - SekCycleAimS68k;
|
||||
if (diff < -1000 || diff > 1000) {
|
||||
SekCycleCntS68k = SekCycleAimS68k = cycles;
|
||||
|
|
|
|||
|
|
@ -602,14 +602,14 @@ static u32 PicoReadM68k8_ramc(u32 a)
|
|||
{
|
||||
u32 d = 0;
|
||||
if (a == 0x400001) {
|
||||
if (SRam.data != NULL)
|
||||
if (Pico.sv.data != NULL)
|
||||
d = 3; // 64k cart
|
||||
return d;
|
||||
}
|
||||
|
||||
if ((a & 0xfe0000) == 0x600000) {
|
||||
if (SRam.data != NULL)
|
||||
d = SRam.data[((a >> 1) & 0xffff) + 0x2000];
|
||||
if (Pico.sv.data != NULL)
|
||||
d = Pico.sv.data[((a >> 1) & 0xffff) + 0x2000];
|
||||
return d;
|
||||
}
|
||||
|
||||
|
|
@ -629,9 +629,9 @@ static u32 PicoReadM68k16_ramc(u32 a)
|
|||
static void PicoWriteM68k8_ramc(u32 a, u32 d)
|
||||
{
|
||||
if ((a & 0xfe0000) == 0x600000) {
|
||||
if (SRam.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {
|
||||
SRam.data[((a>>1) & 0xffff) + 0x2000] = d;
|
||||
SRam.changed = 1;
|
||||
if (Pico.sv.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {
|
||||
Pico.sv.data[((a>>1) & 0xffff) + 0x2000] = d;
|
||||
Pico.sv.changed = 1;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -877,7 +877,7 @@ static u32 PicoReadS68k16_bram(u32 a)
|
|||
static void PicoWriteS68k8_bram(u32 a, u32 d)
|
||||
{
|
||||
Pico_mcd->bram[(a >> 1) & 0x1fff] = d;
|
||||
SRam.changed = 1;
|
||||
Pico.sv.changed = 1;
|
||||
}
|
||||
|
||||
static void PicoWriteS68k16_bram(u32 a, u32 d)
|
||||
|
|
@ -886,7 +886,7 @@ static void PicoWriteS68k16_bram(u32 a, u32 d)
|
|||
a = (a >> 1) & 0x1fff;
|
||||
Pico_mcd->bram[a++] = d;
|
||||
Pico_mcd->bram[a++] = d >> 8; // TODO: verify..
|
||||
SRam.changed = 1;
|
||||
Pico.sv.changed = 1;
|
||||
}
|
||||
|
||||
#ifndef _ASM_CD_MEMORY_C
|
||||
|
|
@ -1175,7 +1175,7 @@ PICO_INTERNAL void PicoMemSetupCD(void)
|
|||
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
|
||||
// .. and RAM
|
||||
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
|
||||
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
|
||||
PicoCpuFM68k.Fetch[i] = (unsigned long)PicoMem.ram - (i<<(24-FAMEC_FETCHBITS));
|
||||
// S68k
|
||||
// PRG RAM is default
|
||||
for (i = 0; i < M68K_FETCHBANK1; i++)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
@* See COPYING file in the top-level directory.
|
||||
@*
|
||||
|
||||
#include "../pico_int_o32.h"
|
||||
|
||||
.equiv PCM_STEP_SHIFT, 11
|
||||
|
||||
.text
|
||||
|
|
@ -127,9 +129,9 @@ PicoReadM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
|
|||
mov r3, #0x0e0000
|
||||
0:
|
||||
cell_map
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
add r0, r0, r3
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd (used everywhere)
|
||||
eor r0, r0, #1
|
||||
ldrb r0, [r1, r0]
|
||||
bx lr
|
||||
|
|
@ -140,9 +142,9 @@ PicoRead8_mcd_io:
|
|||
cmp r1, #0x2000 @ a120xx?
|
||||
bne PicoRead8_io
|
||||
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
and r0, r0, #0x3f
|
||||
ldr r1, [r1] @ Pico.mcd (used everywhere)
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
cmp r0, #0x0e
|
||||
ldrlt pc, [pc, r0, lsl #2]
|
||||
b m_m68k_read8_hi
|
||||
|
|
@ -237,9 +239,9 @@ PicoReadM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
|
|||
mov r3, #0x0e0000
|
||||
0:
|
||||
cell_map
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
add r0, r0, r3
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
bic r0, r0, #1
|
||||
ldrh r0, [r1, r0]
|
||||
bx lr
|
||||
|
|
@ -251,9 +253,9 @@ PicoRead16_mcd_io:
|
|||
bne PicoRead16_io
|
||||
|
||||
m_m68k_read16_m68k_regs:
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
and r0, r0, #0x3e
|
||||
ldr r1, [r1] @ Pico.mcd (used everywhere)
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
cmp r0, #0x0e
|
||||
ldrlt pc, [pc, r0, lsl #1]
|
||||
b m_m68k_read16_hi
|
||||
|
|
@ -328,8 +330,9 @@ PicoWriteM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
|
|||
0:
|
||||
mov r3, r1
|
||||
cell_map
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
add r0, r0, r12
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
ldr r2, [r2]
|
||||
eor r0, r0, #1
|
||||
strb r3, [r2, r0]
|
||||
|
|
@ -355,9 +358,9 @@ PicoWriteM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
|
|||
0:
|
||||
mov r3, r1
|
||||
cell_map
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
add r0, r0, r12
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
bic r0, r0, #1
|
||||
strh r3, [r1, r0]
|
||||
bx lr
|
||||
|
|
@ -397,9 +400,9 @@ PicoReadS68k8_dec0: @ 0x080000 - 0x0bffff
|
|||
PicoReadS68k8_dec1:
|
||||
mov r3, #0x0a0000 @ + ^ / 2
|
||||
0:
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
eor r0, r0, #2
|
||||
ldr r2, [r2]
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
movs r0, r0, lsr #1 @ +4-6 <<16
|
||||
add r2, r2, r3 @ map to our address
|
||||
ldrb r0, [r2, r0]
|
||||
|
|
@ -429,8 +432,8 @@ m_s68k_read8_regs:
|
|||
bx lr
|
||||
|
||||
m_s68k_read8_comm:
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, [r1]
|
||||
ldr r1, =Pico
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
add r1, r1, #0x110000
|
||||
ldrb r1, [r1, r0]
|
||||
bic r0, r0, #1
|
||||
|
|
@ -442,9 +445,9 @@ m_s68k_read8_pcm:
|
|||
bne m_read_null
|
||||
|
||||
@ must not trash r3 and r12
|
||||
ldr r1, =(Pico+0x22200)
|
||||
ldr r1, =Pico
|
||||
bic r0, r0, #0xff0000
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd
|
||||
mov r2, #0x110000
|
||||
orr r2, r2, #0x002200
|
||||
cmp r0, #0x2000
|
||||
|
|
@ -477,9 +480,9 @@ PicoReadS68k16_dec0: @ 0x080000 - 0x0bffff
|
|||
PicoReadS68k16_dec1:
|
||||
mov r3, #0x0a0000 @ + ^ / 2
|
||||
0:
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
eor r0, r0, #2
|
||||
ldr r2, [r2]
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
mov r0, r0, lsr #1 @ +4-6 <<16
|
||||
add r2, r2, r3 @ map to our address
|
||||
ldrb r0, [r2, r0]
|
||||
|
|
@ -508,9 +511,9 @@ m_s68k_read16_regs:
|
|||
|
||||
|
||||
.macro m_s68k_write8_2M_decode
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
eor r0, r0, #2
|
||||
ldr r2, [r2] @ Pico.rom
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
movs r0, r0, lsr #1 @ +4-6 <<16
|
||||
add r2, r2, r3 @ map to our address
|
||||
.endm
|
||||
|
|
@ -592,9 +595,9 @@ m_s68k_write8_pcm:
|
|||
bxlt lr
|
||||
|
||||
m_s68k_write8_pcm_ram:
|
||||
ldr r3, =(Pico+0x22200)
|
||||
ldr r3, =Pico
|
||||
bic r0, r0, #0x00e000
|
||||
ldr r3, [r3]
|
||||
ldr r3, [r3, #OFS_Pico_rom] @ Pico.mcd
|
||||
mov r0, r0, lsr #1
|
||||
add r2, r3, #0x110000
|
||||
add r2, r2, #0x002200
|
||||
|
|
@ -611,9 +614,9 @@ m_s68k_write8_pcm_ram:
|
|||
|
||||
|
||||
.macro m_s68k_write16_2M_decode
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
eor r0, r0, #2
|
||||
ldr r2, [r2]
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
mov r0, r0, lsr #1 @ +4-6 <<16
|
||||
add r2, r2, r3 @ map to our address
|
||||
.endm
|
||||
|
|
@ -692,9 +695,9 @@ m_s68k_write16_regs:
|
|||
bne s68k_reg_write16
|
||||
|
||||
m_s68k_write16_regs_spec: @ special case
|
||||
ldr r2, =(Pico+0x22200)
|
||||
ldr r2, =Pico
|
||||
mov r0, #0x110000
|
||||
ldr r2, [r2]
|
||||
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd
|
||||
add r0, r0, #0x00000f
|
||||
strb r1, [r2, r0] @ if (a == 0xe) s68k_regs[0xf] = d;
|
||||
bx lr
|
||||
Loading…
Add table
Add a link
Reference in a new issue