mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-06 15:48:05 -04:00
SekRunPS Cyclone integration
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@68 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
8b71d0ebf9
commit
7336a99a49
12 changed files with 278 additions and 47 deletions
|
|
@ -421,7 +421,6 @@ u16 PicoReadM68k16(u32 a)
|
|||
a = (a&2) | (cell_map(a >> 2) << 2); // cell arranged
|
||||
else a &= 0x1fffe;
|
||||
d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a);
|
||||
//d = 0xaaaa;
|
||||
} else {
|
||||
// allow access in any mode, like Gens does
|
||||
d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
|
||||
|
|
@ -936,9 +935,6 @@ static void decode_write8(u32 a, u8 d, int r3)
|
|||
u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);
|
||||
u8 oldmask = (a&1) ? 0xf0 : 0x0f;
|
||||
|
||||
//if ((a & 0x3ffff) < 0x28000) return;
|
||||
//return;
|
||||
|
||||
r3 &= 0x18;
|
||||
d &= 0x0f;
|
||||
if (!(a&1)) d <<= 4;
|
||||
|
|
|
|||
|
|
@ -83,44 +83,55 @@ static __inline void SekRunS68k(int cyc)
|
|||
#endif
|
||||
}
|
||||
|
||||
#define PS_STEP_M68K 8
|
||||
#define PS_STEP_S68K 13
|
||||
#define PS_STEP_M68K ((488<<16)/20) // ~24
|
||||
//#define PS_STEP_S68K 13
|
||||
|
||||
#ifndef _ASM_CD_PICO_C
|
||||
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
||||
{
|
||||
int cyc_do_m68k, cyc_do_s68k, it=0;
|
||||
int cyc_done_m68k=0, cyc_done_s68k=0;
|
||||
int cycn, cycn_s68k, cyc_do;
|
||||
int d_cm = 0, d_cs = 0, ex;
|
||||
SekCycleAim+=cyc_m68k;
|
||||
SekCycleAimS68k+=cyc_s68k;
|
||||
cyc_do_m68k=SekCycleAim-SekCycleCnt;
|
||||
cyc_do_s68k=SekCycleAimS68k-SekCycleCntS68k;
|
||||
while (cyc_done_m68k < cyc_do_m68k || cyc_done_s68k < cyc_do_s68k) {
|
||||
it++;
|
||||
if (cyc_done_m68k < cyc_do_m68k && it*PS_STEP_M68K > cyc_done_m68k) {
|
||||
|
||||
// fprintf(stderr, "=== start %3i/%3i [%3i/%3i] {%05i.%i} ===\n", cyc_m68k, cyc_s68k,
|
||||
// SekCycleAim-SekCycleCnt, SekCycleAimS68k-SekCycleCntS68k, Pico.m.frame_count, Pico.m.scanline);
|
||||
|
||||
/* loop 488 downto 0 in steps of PS_STEP */
|
||||
for (cycn = (488<<16)-PS_STEP_M68K; cycn >= 0; cycn -= PS_STEP_M68K)
|
||||
{
|
||||
ex = 0;
|
||||
cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
|
||||
//fprintf(stderr, "%3i/%3i: ", cycn>>16, cycn_s68k);
|
||||
if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
|
||||
#if defined(EMU_C68K)
|
||||
PicoCpu.cycles = PS_STEP_M68K;
|
||||
PicoCpu.cycles = cyc_do;
|
||||
CycloneRun(&PicoCpu);
|
||||
cyc_done_m68k += PS_STEP_M68K - PicoCpu.cycles;
|
||||
SekCycleCnt += cyc_do - PicoCpu.cycles;
|
||||
#elif defined(EMU_M68K)
|
||||
m68k_set_context(&PicoM68kCPU);
|
||||
cyc_done_m68k += m68k_execute(PS_STEP_M68K);
|
||||
SekCycleCnt += (ex = m68k_execute(cyc_do));
|
||||
#endif
|
||||
} //else dprintf("m68k skipping it #%i", it);
|
||||
if (cyc_done_s68k < cyc_do_s68k && it*PS_STEP_S68K > cyc_done_s68k) {
|
||||
}
|
||||
//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
|
||||
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
|
||||
#if defined(EMU_C68K)
|
||||
PicoCpuS68k.cycles = PS_STEP_S68K;
|
||||
PicoCpuS68k.cycles = cyc_do;
|
||||
CycloneRun(&PicoCpuS68k);
|
||||
cyc_done_s68k += PS_STEP_S68K - PicoCpuS68k.cycles;
|
||||
SekCycleCntS68k += cyc_do - PicoCpuS68k.cycles;
|
||||
#elif defined(EMU_M68K)
|
||||
m68k_set_context(&PicoS68kCPU);
|
||||
cyc_done_s68k += m68k_execute(PS_STEP_S68K);
|
||||
SekCycleCntS68k += (ex = m68k_execute(cyc_do));
|
||||
#endif
|
||||
} //else dprintf("s68k skipping it #%i", it);
|
||||
}
|
||||
//fprintf(stderr, "%3i\n", ex); d_cs += ex;
|
||||
}
|
||||
SekCycleCnt += cyc_done_m68k;
|
||||
SekCycleCntS68k += cyc_done_s68k;
|
||||
//dprintf("== end SekRunPS, it=%i ==", it);
|
||||
|
||||
//fprintf(stderr, "== end %3i/%3i ==\n", d_cm, d_cs);
|
||||
}
|
||||
#else
|
||||
void SekRunPS(int cyc_m68k, int cyc_s68k);
|
||||
#endif
|
||||
|
||||
|
||||
static __inline void check_cd_dma(void)
|
||||
|
|
@ -271,7 +282,7 @@ static int PicoFrameHintsMCD(void)
|
|||
//dprintf("m68k starting exec @ %06x", SekPc);
|
||||
if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
|
||||
if((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) {
|
||||
SekRunPS(cycles_68k, cycles_s68k); // "perfect sync"
|
||||
SekRunPS(cycles_68k, cycles_s68k); // "better/perfect sync"
|
||||
} else {
|
||||
SekRun(cycles_68k);
|
||||
if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset
|
||||
|
|
|
|||
179
Pico/cd/Pico.s
Normal file
179
Pico/cd/Pico.s
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
@ vim:filetype=armasm
|
||||
|
||||
@ SekRunPS runs PicoCpu and PicoCpuS68k interleaved in steps of PS_STEP_M68K
|
||||
@ cycles. This is done without calling CycloneRun and jumping directly to
|
||||
@ Cyclone code to avoid pushing/popping all the registers every time.
|
||||
|
||||
@ (c) Copyright 2007, Grazvydas "notaz" Ignotas
|
||||
@ All Rights Reserved
|
||||
|
||||
|
||||
.equiv PS_STEP_M68K, ((488<<16)/20) @ ~24
|
||||
|
||||
@ .extern is ignored by gas, we add these here just to see what we depend on.
|
||||
.extern CycloneJumpTab
|
||||
.extern CycloneDoInterrupt
|
||||
.extern PicoCpu
|
||||
.extern PicoCpuS68k
|
||||
.extern SekCycleAim
|
||||
.extern SekCycleCnt
|
||||
.extern SekCycleAimS68k
|
||||
.extern SekCycleCntS68k
|
||||
|
||||
|
||||
.text
|
||||
.align 4
|
||||
|
||||
|
||||
.global SekRunPS @ cyc_m68k, cyc_s68k
|
||||
|
||||
SekRunPS:
|
||||
stmfd sp!, {r4-r11,lr}
|
||||
sub sp, sp, #2*4 @ sp[0] = main_cycle_cnt, sp[4] = run_cycle_cnt
|
||||
|
||||
@ override CycloneEnd for both contexts
|
||||
ldr r7, =PicoCpu
|
||||
ldr lr, =PicoCpuS68k
|
||||
ldr r2, =CycloneEnd_M68k
|
||||
ldr r3, =CycloneEnd_S68k
|
||||
str r2, [r7,#0x54]
|
||||
str r3, [lr,#0x54]
|
||||
|
||||
@ update aims
|
||||
ldr r8, =SekCycleAim
|
||||
ldr r9, =SekCycleAimS68k
|
||||
ldr r2, [r8]
|
||||
ldr r3, [r9]
|
||||
add r2, r2, r0
|
||||
add r3, r3, r1
|
||||
str r2, [r8]
|
||||
str r3, [r9]
|
||||
|
||||
ldr r1, =SekCycleCnt
|
||||
ldr r0, =((488<<16)-PS_STEP_M68K)
|
||||
ldr r6, =CycloneJumpTab
|
||||
|
||||
@ schedule m68k for the first time..
|
||||
ldr r1, [r1]
|
||||
str r0, [sp] @ main target 'left cycle' counter
|
||||
sub r1, r2, r1
|
||||
subs r5, r1, r0, asr #16
|
||||
ble schedule_s68k @ m68k has not enough cycles
|
||||
|
||||
str r5, [sp,#4] @ run_cycle_cnt
|
||||
b CycloneRunLocal
|
||||
|
||||
|
||||
|
||||
CycloneEnd_M68k:
|
||||
ldr r3, =SekCycleCnt
|
||||
ldr r0, [sp,#4] @ run_cycle_cnt
|
||||
ldr r1, [r3]
|
||||
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
|
||||
strb r9, [r7,#0x46] ;@ Save Flags (NZCV)
|
||||
sub r0, r0, r5 @ subtract leftover cycles (which should be negative)
|
||||
add r0, r0, r1
|
||||
str r0, [r3]
|
||||
|
||||
schedule_s68k:
|
||||
ldr r8, =SekCycleCntS68k
|
||||
ldr r9, =SekCycleAimS68k
|
||||
ldr r3, [sp]
|
||||
ldr r8, [r8]
|
||||
ldr r9, [r9]
|
||||
|
||||
sub r0, r9, r8
|
||||
add r3, r3, r3, asr #1
|
||||
add r3, r3, r3, asr #3 @ cycn_s68k = (cycn + cycn/2 + cycn/8)
|
||||
|
||||
subs r5, r0, r3, asr #16
|
||||
ble schedule_m68k @ s68k has not enough cycles
|
||||
|
||||
ldr r7, =PicoCpuS68k
|
||||
str r5, [sp,#4] @ run_cycle_cnt
|
||||
b CycloneRunLocal
|
||||
|
||||
|
||||
|
||||
CycloneEnd_S68k:
|
||||
ldr r3, =SekCycleCntS68k
|
||||
ldr r0, [sp,#4] @ run_cycle_cnt
|
||||
ldr r1, [r3]
|
||||
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
|
||||
strb r9, [r7,#0x46] ;@ Save Flags (NZCV)
|
||||
sub r0, r0, r5 @ subtract leftover cycles (should be negative)
|
||||
add r0, r0, r1
|
||||
str r0, [r3]
|
||||
|
||||
schedule_m68k:
|
||||
ldr r1, =PS_STEP_M68K
|
||||
ldr r3, [sp] @ main_cycle_cnt
|
||||
ldr r8, =SekCycleCnt
|
||||
ldr r9, =SekCycleAim
|
||||
subs r3, r3, r1
|
||||
bmi SekRunPS_end
|
||||
|
||||
ldr r8, [r8]
|
||||
ldr r9, [r9]
|
||||
str r3, [sp] @ update main_cycle_cnt
|
||||
sub r0, r9, r8
|
||||
|
||||
subs r5, r0, r3, asr #16
|
||||
ble schedule_s68k @ m68k has not enough cycles
|
||||
|
||||
ldr r7, =PicoCpu
|
||||
str r5, [sp,#4] @ run_cycle_cnt
|
||||
b CycloneRunLocal
|
||||
|
||||
|
||||
|
||||
SekRunPS_end:
|
||||
ldr r7, =PicoCpu
|
||||
ldr lr, =PicoCpuS68k
|
||||
mov r0, #0
|
||||
str r0, [r7,#0x54] @ remove CycloneEnd handler
|
||||
str r0, [lr,#0x54]
|
||||
@ return
|
||||
add sp, sp, #2*4
|
||||
ldmfd sp!, {r4-r11,pc}
|
||||
|
||||
|
||||
|
||||
|
||||
CycloneRunLocal:
|
||||
;@ r0-3 = Temporary registers
|
||||
ldr r4,[r7,#0x40] ;@ r4 = Current PC + Memory Base
|
||||
;@ r5 = Cycles
|
||||
;@ r6 = Opcode Jump table
|
||||
;@ r7 = Pointer to Cpu Context
|
||||
;@ r8 = Current Opcode
|
||||
ldrb r9,[r7,#0x46] ;@ r9 = Flags (NZCV)
|
||||
ldr r0,[r7,#0x44]
|
||||
mov r9,r9,lsl #28 ;@ r9 = Flags 0xf0000000, cpsr format
|
||||
;@ r10 = Source value / Memory Base
|
||||
|
||||
;@ CheckInterrupt:
|
||||
movs r0,r0,lsr #24 ;@ Get IRQ level
|
||||
beq NoIntsLocal
|
||||
cmp r0,#6 ;@ irq>6 ?
|
||||
ldrleb r1,[r7,#0x44] ;@ Get SR high: T_S__III
|
||||
andle r1,r1,#7 ;@ Get interrupt mask
|
||||
cmple r0,r1 ;@ irq<=6: Is irq<=mask ?
|
||||
blgt CycloneDoInterrupt
|
||||
;@ Check if interrupt used up all the cycles:
|
||||
subs r5,r5,#0
|
||||
ldrlt r1,[r7,#0x54]
|
||||
bxlt r1 ;@ jump to alternative CycloneEnd
|
||||
NoIntsLocal:
|
||||
|
||||
;@ Check if our processor is in stopped state and jump to opcode handler if not
|
||||
ldr r0,[r7,#0x58]
|
||||
ldrh r8,[r4],#2 ;@ Fetch first opcode
|
||||
tst r0,r0 ;@ stopped?
|
||||
ldreq pc,[r6,r8,asl #2] ;@ Jump to opcode handler
|
||||
|
||||
@ stopped
|
||||
ldr r1,[r7,#0x54]
|
||||
mov r5,#0
|
||||
bx r1
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue