X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FSek.c;h=d641e04546c6d09bd486516da28eac8e695e9c63;hb=8187ba84b7ed56e2535a8381ac66fb5b32414b39;hp=1f2316eee20dd576daaeb9d48a2ff03992068ec5;hpb=69996cb7c62468cd97842e35bdd2b74006a28dba;p=picodrive.git diff --git a/Pico/Sek.c b/Pico/Sek.c index 1f2316e..d641e04 100644 --- a/Pico/Sek.c +++ b/Pico/Sek.c @@ -14,33 +14,23 @@ int SekCycleCnt=0; // cycles done in this frame int SekCycleAim=0; // cycle aim unsigned int SekCycleCntT=0; + +/* context */ +// Cyclone 68000 #ifdef EMU_C68K -// ---------------------- Cyclone 68000 ---------------------- -struct Cyclone PicoCpu; +struct Cyclone PicoCpuCM68k; #endif - +// MUSASHI 68000 #ifdef EMU_M68K -// ---------------------- MUSASHI 68000 ---------------------- -m68ki_cpu_core PicoM68kCPU; // MD's CPU +m68ki_cpu_core PicoCpuMM68k; #endif - -#ifdef EMU_A68K -// ---------------------- A68K ---------------------- - -void __cdecl M68000_RESET(); -int m68k_ICount=0; -unsigned int mem_amask=0xffffff; // 24-bit bus -unsigned int mame_debug=0,cur_mrhard=0,m68k_illegal_opcode=0,illegal_op=0,illegal_pc=0,opcode_entry=0; // filler - -static int IrqCallback(int i) { i; return -1; } -static int DoReset() { return 0; } -static int (*ResetCallback)()=DoReset; - -#pragma warning (disable:4152) +// FAME 68000 +#ifdef EMU_F68K +M68K_CONTEXT PicoCpuFM68k; #endif - +/* callbacks */ #ifdef EMU_C68K // interrupt acknowledgment static int SekIntAck(int level) @@ -48,7 +38,7 @@ static int SekIntAck(int level) // try to emulate VDP's reaction to 68000 int ack if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); } else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); } - PicoCpu.irq = 0; + PicoCpuCM68k.irq = 0; return CYCLONE_INT_ACK_AUTOVECTOR; } @@ -61,12 +51,12 @@ static int SekUnrecognizedOpcode() { unsigned int pc, op; pc = SekPc; - op = PicoCpu.read16(pc); + op = PicoCpuCM68k.read16(pc); elprintf(EL_ANOMALY, "Unrecognized Opcode %04x @ %06x", op, pc); // see if we are not executing trash if (pc < 0x200 || (pc > Pico.romsize+4 && (pc&0xe00000)!=0xe00000)) { - PicoCpu.cycles = 0; - PicoCpu.state_flags |= 1; + PicoCpuCM68k.cycles = 0; + PicoCpuCM68k.state_flags |= 1; return 1; } #ifdef EMU_M68K // debugging cyclone @@ -75,7 +65,6 @@ static int SekUnrecognizedOpcode() have_illegal = 1; } #endif - //exit(1); return 0; } #endif @@ -97,118 +86,236 @@ static int SekTasCallback(void) #endif +#ifdef EMU_F68K +static void SekIntAckF68K(unsigned level) +{ + if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); } + else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); } + PicoCpuFM68k.interrupts[0] = 0; +} +#endif + -PICO_INTERNAL int SekInit() +PICO_INTERNAL void SekInit(void) { #ifdef EMU_C68K CycloneInit(); - memset(&PicoCpu,0,sizeof(PicoCpu)); - PicoCpu.IrqCallback=SekIntAck; - PicoCpu.ResetCallback=SekResetAck; - PicoCpu.UnrecognizedCallback=SekUnrecognizedOpcode; -#endif -#ifdef EMU_A68K - memset(&M68000_regs,0,sizeof(M68000_regs)); - M68000_regs.IrqCallback=IrqCallback; - M68000_regs.pResetCallback=ResetCallback; - M68000_RESET(); // Init cpu emulator + memset(&PicoCpuCM68k,0,sizeof(PicoCpuCM68k)); + PicoCpuCM68k.IrqCallback=SekIntAck; + PicoCpuCM68k.ResetCallback=SekResetAck; + PicoCpuCM68k.UnrecognizedCallback=SekUnrecognizedOpcode; + PicoCpuCM68k.flags=4; // Z set #endif #ifdef EMU_M68K { void *oldcontext = m68ki_cpu_p; - m68k_set_context(&PicoM68kCPU); + m68k_set_context(&PicoCpuMM68k); m68k_set_cpu_type(M68K_CPU_TYPE_68000); m68k_init(); m68k_set_int_ack_callback(SekIntAckM68K); m68k_set_tas_instr_callback(SekTasCallback); - m68k_pulse_reset(); // Init cpu emulator + //m68k_pulse_reset(); m68k_set_context(oldcontext); } #endif - - return 0; +#ifdef EMU_F68K + { + void *oldcontext = g_m68kcontext; + g_m68kcontext = &PicoCpuFM68k; + memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k)); + fm68k_init(); + PicoCpuFM68k.iack_handler = SekIntAckF68K; + PicoCpuFM68k.sr = 0x2704; // Z flag + g_m68kcontext = oldcontext; + } +#endif } + // Reset the 68000: -PICO_INTERNAL int SekReset() +PICO_INTERNAL int SekReset(void) { if (Pico.rom==NULL) return 1; #ifdef EMU_C68K - PicoCpu.state_flags=0; - PicoCpu.osp=0; - PicoCpu.srh =0x27; // Supervisor mode - PicoCpu.flags=4; // Z set - PicoCpu.irq=0; - PicoCpu.a[7]=PicoCpu.read32(0); // Stack Pointer - PicoCpu.membase=0; - PicoCpu.pc=PicoCpu.checkpc(PicoCpu.read32(4)); // Program Counter -#endif -#ifdef EMU_A68K - // Reset CPU: fetch SP and PC - M68000_regs.srh=0x27; // Supervisor mode - M68000_regs.a[7]=PicoRead32(0); - M68000_regs.pc =PicoRead32(4); - PicoInitPc(M68000_regs.pc); + PicoCpuCM68k.state_flags=0; + PicoCpuCM68k.osp=0; + PicoCpuCM68k.srh =0x27; // Supervisor mode + PicoCpuCM68k.irq=0; + PicoCpuCM68k.a[7]=PicoCpuCM68k.read32(0); // Stack Pointer + PicoCpuCM68k.membase=0; + PicoCpuCM68k.pc=PicoCpuCM68k.checkpc(PicoCpuCM68k.read32(4)); // Program Counter #endif #ifdef EMU_M68K - m68k_set_context(&PicoM68kCPU); // if we ever reset m68k, we always need it's context to be set + m68k_set_context(&PicoCpuMM68k); // if we ever reset m68k, we always need it's context to be set m68ki_cpu.sp[0]=0; m68k_set_irq(0); m68k_pulse_reset(); + REG_USP = 0; // ? +#endif +#ifdef EMU_F68K + { + g_m68kcontext = &PicoCpuFM68k; + fm68k_reset(); + } #endif return 0; } -PICO_INTERNAL int SekInterrupt(int irq) +PICO_INTERNAL void SekSetRealTAS(int use_real) { -#if defined(EMU_C68K) && defined(EMU_M68K) - { - extern unsigned int dbg_irq_level; - dbg_irq_level=irq; - return 0; - } +#ifdef EMU_C68K + CycloneSetRealTAS(use_real); #endif +#ifdef EMU_F68K + // TODO +#endif +} + +/* idle loop detection, not to be used in CD mode */ #ifdef EMU_C68K - PicoCpu.irq=irq; +#include "cpu/Cyclone/tools/idle.h" #endif -#ifdef EMU_A68K - M68000_regs.irq=irq; // raise irq (gets lowered after taken) + +static int *idledet_addrs = NULL; +static int idledet_count = 0, idledet_bads = 0; +int idledet_start_frame = 0; + +void SekInitIdleDet(void) +{ + void *tmp = realloc(idledet_addrs, 0x200*4); + if (tmp == NULL) { + free(idledet_addrs); + idledet_addrs = NULL; + } + else + idledet_addrs = tmp; + idledet_count = idledet_bads = 0; + idledet_start_frame = Pico.m.frame_count + 360; + +#ifdef EMU_C68K + CycloneInitIdle(); #endif -#ifdef EMU_M68K +#ifdef EMU_F68K + fm68k_emulate(0, 0, 1); +#endif +} + +int SekIsIdleCode(unsigned short *dst, int bytes) +{ + // printf("SekIsIdleCode %04x %i\n", *dst, bytes); + switch (bytes) { - void *oldcontext = m68ki_cpu_p; - m68k_set_context(&PicoM68kCPU); - m68k_set_irq(irq); // raise irq (gets lowered after taken or must be done in ack) - m68k_set_context(oldcontext); + case 4: + if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX) // there should be no need to wait + (*dst & 0xfff8) == 0x4a28 || // tst.b ($xxxx,a0) // for byte change anywhere + (*dst & 0xff3f) == 0x4a38 || // tst.x ($xxxx.w); tas ($xxxx.w) + (*dst & 0xc1ff) == 0x0038 || // move.x ($xxxx.w), dX + (*dst & 0xf13f) == 0xb038) // cmp.x ($xxxx.w), dX + return 1; + break; + case 6: + if ( ((dst[1] & 0xe0) == 0xe0 && ( // RAM and + *dst == 0x4a39 || // tst.b ($xxxxxxxx) + *dst == 0x4a79 || // tst.w ($xxxxxxxx) + *dst == 0x4ab9 || // tst.l ($xxxxxxxx) + (*dst & 0xc1ff) == 0x0039 || // move.x ($xxxxxxxx), dX + (*dst & 0xf13f) == 0xb039))||// cmp.x ($xxxxxxxx), dX + *dst == 0x0838 || // btst $X, ($xxxx.w) [6 byte op] + (*dst & 0xffbf) == 0x0c38) // cmpi.{b,w} $X, ($xxxx.w) + return 1; + break; + case 8: + if ( ((dst[2] & 0xe0) == 0xe0 && ( // RAM and + *dst == 0x0839 || // btst $X, ($xxxxxxxx.w) [8 byte op] + (*dst & 0xffbf) == 0x0c39))||// cmpi.{b,w} $X, ($xxxxxxxx) + *dst == 0x0cb8) // cmpi.l $X, ($xxxx.w) + return 1; + break; + case 12: + if ((*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX + (dst[1]&0xf100) == 0x0000 && // arithmetic + (dst[3]&0xf100) == 0x0000) // arithmetic + return 1; + break; } -#endif + return 0; } -//int SekPc() { return PicoCpu.pc-PicoCpu.membase; } -//int SekPc() { return M68000_regs.pc; } -//int SekPc() { return m68k_get_reg(NULL, M68K_REG_PC); } - -PICO_INTERNAL void SekState(unsigned char *data) +int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop) { #ifdef EMU_C68K - memcpy(data,PicoCpu.d,0x44); -#elif defined(EMU_A68K) - memcpy(data, M68000_regs.d, 0x40); - memcpy(data+0x40,&M68000_regs.pc,0x04); -#elif defined(EMU_M68K) - memcpy(data, PicoM68kCPU.dar,0x40); - memcpy(data+0x40,&PicoM68kCPU.pc, 0x04); + pc -= PicoCpuCM68k.membase; #endif + pc &= ~0xff000000; + elprintf(EL_IDLE, "idle: patch %06x %04x %04x #%i", pc, oldop, newop, idledet_count); + if (pc > Pico.romsize && !(PicoAHW & PAHW_SVP)) { + if (++idledet_bads > 128) return 2; // remove detector + return 1; // don't patch + } + + if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) { + void *tmp = realloc(idledet_addrs, (idledet_count+0x200)*4); + if (tmp == NULL) return 1; + idledet_addrs = tmp; + } + + if (pc < Pico.romsize) + idledet_addrs[idledet_count++] = pc; + + return 0; } -PICO_INTERNAL void SekSetRealTAS(int use_real) +void SekFinishIdleDet(void) { #ifdef EMU_C68K - CycloneSetRealTAS(use_real); + CycloneFinishIdle(); #endif +#ifdef EMU_F68K + fm68k_emulate(0, 0, 2); +#endif + while (idledet_count > 0) + { + unsigned short *op = (unsigned short *)&Pico.rom[idledet_addrs[--idledet_count]]; + if ((*op & 0xfd00) == 0x7100) + *op &= 0xff, *op |= 0x6600; + else if ((*op & 0xfd00) == 0x7500) + *op &= 0xff, *op |= 0x6700; + else if ((*op & 0xfd00) == 0x7d00) + *op &= 0xff, *op |= 0x6000; + else + elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op); + } +} + + +#if defined(EMU_M68K) && M68K_INSTRUCTION_HOOK == OPT_SPECIFY_HANDLER +static unsigned char op_flags[0x400000/2] = { 0, }; +static int atexit_set = 0; + +static void make_idc(void) +{ + FILE *f = fopen("idc.idc", "w"); + int i; + if (!f) return; + fprintf(f, "#include \nstatic main() {\n"); + for (i = 0; i < 0x400000/2; i++) + if (op_flags[i] != 0) + fprintf(f, " MakeCode(0x%06x);\n", i*2); + fprintf(f, "}\n"); + fclose(f); } +void instruction_hook(void) +{ + if (!atexit_set) { + atexit(make_idc); + atexit_set = 1; + } + if (REG_PC < 0x400000) + op_flags[REG_PC/2] = 1; +} +#endif