--- hatari/src/uae-cpu/newcpu.c 2019/04/01 07:13:13 1.1.1.11 +++ hatari/src/uae-cpu/newcpu.c 2019/04/09 08:54:38 1.1.1.20 @@ -7,27 +7,161 @@ * * Adaptation to Hatari by Thomas Huth * - * This file is distributed under the GNU Public License, version 2 or at - * your option any later version. Read the file gpl.txt for details. + * This file is distributed under the GNU General Public License, version 2 + * or at your option any later version. Read the file gpl.txt for details. */ -const char NewCpu_rcsid[] = "Hatari $Id: newcpu.c,v 1.1.1.11 2019/04/01 07:13:13 root Exp $"; + + +/* 2007/11/12 [NP] Add HATARI_TRACE_CPU_DISASM. */ +/* 2007/11/15 [NP] In MakeFromSR, writes to m and t0 should be ignored and set to 0 if cpu < 68020 */ +/* 2007/11/26 [NP] We set BusErrorPC in m68k_run_1 instead of M68000_BusError, else the BusErrorPC */ +/* will not point to the opcode that generated the bus error. */ +/* Huge debug/work on Exceptions 2/3 stack frames, result is more accurate and */ +/* allow to pass the very tricky Transbeauce 2 Demo's protection. */ +/* 2007/11/28 [NP] Backport DIVS/DIVU cycles exact routines from WinUAE (original work by Jorge */ +/* Cwik, pasti@fxatari.com). */ +/* 2007/12/06 [NP] The PC stored in the stack frame for the bus error is complex to emulate, */ +/* because it doesn't necessarily point to the next instruction after the one that */ +/* triggered the bus error. In the case of the Transbeauce 2 Demo, after */ +/* 'move.l $0.w,$24.w', PC is incremented of 4 bytes, not 6, and stored in the */ +/* stack. Special case to decrement PC of 2 bytes if opcode is '21f8'. */ +/* This should be fixed with a real model. */ +/* 2007/12/07 [NP] If Trace is enabled and a group 2 exception occurs (such as CHK), the trace */ +/* handler should be called after the group 2's handler. If a bus error, address */ +/* error or illegal occurs while Trace is enabled, the trace handler should not be */ +/* called after this instruction (Transbeauce 2 Demo, Phaleon Demo). */ +/* This means that if a CHK is executed while trace bit was set, we must set PC */ +/* to CHK handler, turn trace off in the internal SR, but we must still call the */ +/* trace handler one last time with the PC set to the CHK's handler (even if */ +/* trace mode is internally turned off while processing an exception). Once trace */ +/* handler is finished (RTE), we return to the CHK's handler. */ +/* This is true for DIV BY 0, CHK, TRAPV and TRAP. */ +/* Backport exception_trace() from WinUAE to handle this behaviour (used in */ +/* Transbeauce 2 demo). */ +/* 2007/12/09 [NP] 'dc.w $a' should not be used to call 'OpCode_SysInit' but should give an illegal*/ +/* instruction (Transbeauce 2 demo). */ +/* Instead of always replacing the illegal instructions $8, $a and $c by the */ +/* 3 functions required for HD emulation, we now do it in cart.c only if the */ +/* built-in cartridge image is loaded. */ +/* YEAH! Hatari is now the first emulator to pass the Transbeauce 2 protection :) */ +/* 2007/12/18 [NP] More precise timings for HBL, VBL and MFP interrupts. On ST, these interrupts */ +/* are taking 56 cycles instead of the 44 cycles in the 68000's documentation. */ +/* 2007/12/24 [NP] If an interrupt (HBL, VBL) is pending after instruction 'n' was processed, the */ +/* exception should be called before instr. 'n+1' is processed, not after (else the*/ +/* interrupt's handler is delayed by one 68000's instruction, which could break */ +/* some demos with too strict timings) (ACF's Demo Main Menu). */ +/* We call the interrupt if ( SPCFLAG_INT | SPCFLAG_DOINT ) is set, not only if */ +/* SPCFLAG_DOINT is set (as it was already the case when handling 'STOP'). */ +/* 2007/12/25 [NP] FIXME When handling exceptions' cycles, using nr >= 64 to determine if this is */ +/* an MFP exception could be wrong if the MFP VR was set to another value than the */ +/* default $40 (this could be a problem with programs requiring a precise cycles */ +/* calculation while changing VR, but no such programs were encountered so far). */ +/* -> FIXED, see 2008/10/05 */ +/* 2008/04/17 [NP] In m68k_run_1/m68k_run_2, add the wait state cycles before testing if content */ +/* of PendingInterruptCount is <= 0 (else the int could happen a few cycles earlier*/ +/* than expected in some rare cases (reading $fffa21 in BIG Demo Screen 1)). */ +/* 2008/09/14 [NP] Add the value of the new PC in the exception's log. */ +/* 2008/09/14 [NP] Correct cycles for TRAP are 34 not 38 (4 more cycles were counted because cpuemu*/ +/* returns 4 and Exception() adds 34) (Phaleon / Illusion Demo by Next). */ +/* FIXME : Others exception cycles may be wrong too. */ +/* 2008/10/05 [NP] Add a parameter 'ExceptionSource' to Exception(). This allows to know the source*/ +/* of the exception (video, mfp, cpu) and properly handle MFP interrupts. Since */ +/* it's possible to change the vector base in $fffa17, MFP int vectors can overlap */ +/* the 'normal' 68000 ones and the exception number is not enough to decide. */ +/* We need ExceptionSource to remove the ambiguity. */ +/* Fix High Fidelity Dreams by Aura which sets MFP vector base to $c0 instead of */ +/* $100. In that case, timer B int becomes exception nr 56 and conflicts with the */ +/* 'MMU config error' exception, which takes 4 cycles instead of 56 cycles for MFP.*/ +/* 2008/11/18 [NP] In 'do_specialties()', when the cpu is in the STOP state, we must test all */ +/* possible int handlers while PendingInterruptCount <= 0 without increasing the */ +/* cpu cycle counter. In the case where both an MFP int and an HBL occur at the */ +/* same time for example, the HBL was delayed by 4 cycles if no MFP exception */ +/* was triggered, which was wrong (this happened mainly with the TOS timer D that */ +/* expires very often). Such precision is required for very recent hardscroll */ +/* techniques that use 'stop' to stay in sync with the video shifter. */ +/* 2008/11/23 [NP] In 'do_specialties()', when in STOP state, we must first test for a pending */ +/* interrupt that would exit the STOP state immediately, without doing a 'while' */ +/* loop until 'SPCFLAG_INT' or 'SPCFLAG_DOINT' are set. */ +/* 2008/11/29 [NP] Call 'InterruptAddJitter()' when a video interrupt happens to precisely emulate */ +/* the jitter happening on the Atari (see video.c for the jitter patterns). */ +/* FIXME : Pattern is not always correct when handling pending interrupt in STOP */ +/* state, but this should be harmless as no program has been found using this. */ +/* 2008/12/05 [NP] On Atari it takes 56 cycles to process an interrupt. During that time, a higher */ +/* level interrupt could happen and we must execute it before the previous int */ +/* (see m68k_run_1()). */ +/* This is the case for the VBL which can interrupt the last HBL of a screen */ +/* (end of line 312) at various point (from 0 to 8 cycles). */ +/* This fixes the fullscreen tunnel in Suretrip 49% by Checkpoint, which uses a */ +/* really buggy vbl/hbl combination, even on a real ST. Also fixes sample sound */ +/* in Swedish New Year's TCB screen. */ +/* 2008/12/11 [NP] Extract interrupt handling from do_specialties() in do_specialties_interrupt() */ +/* and factorize some code. In m68k_run_1 when testing for multiple interrupts at */ +/* the same time, call do_specialties_interrupt() to check only the special flags */ +/* related to interrupts (MFP and video) (else, this caused problem when the TRACE */ +/* flag was set). */ +/* 2008/12/14 [NP] In m68k_run_1(), we should check for simultaneous ints only if the cpu is not */ +/* in the STOP state after the last instruction was executed. Else, the call to */ +/* do_specialties_interrupt() could acknowledge the interrupt and we would never */ +/* exit the STOP state in do_specialties() just after (the problem can happen if */ +/* the TOS timer D expires just at the same time as the STOP instruction). */ +/* Fix regression since 2008/12/11 in the hidden screen from ULM in Oh Crickey... */ +/* 2008/12/20 [NP] In m68k_run_1(), when checking interrupts and STOP mode, we should test */ +/* PendingInterruptCount before regs.spcflags to have a faster evaluation of the */ +/* 'while' condition (PendingInterruptCount <= 0 is true less often than STOP==0) */ +/* 2011/04/29 [NP] In Exception(), check the new PC is not on odd address ; raise an address error */ +/* exception if it's the case. */ +/* 2012/09/01 [NP] Add a special case to correct the stacked PC when a bus error happens during */ +/* a movem (fix the game Blood Money). */ +/* 2013/03/16 [NP] In refill_prefetch(), reload only one new word in regs.prefetch if low word is */ +/* still valid : low word goes to high word and we reload only low word */ +/* (fix EOR/ADD self modified code in the protection for the game Damocles). */ +/* 2013/04/11 [NP] In Exception(), call MFP_ProcessIACK after 12 cycles to update the MFP's vector */ +/* number used for the exception (see mfp.c). */ +/* 2013/05/03 [NP] In Exception(), handle IACK for HBL and VBL interrupts too, allowing pending bit*/ +/* to be set twice during an active video interrupt (correct fix for Super Monaco */ +/* GP, Super Hang On, Monster Business, European Demo's Intro, BBC Menu 52). */ +/* 2014/02/22 [NP] In Exception(), call valid_address() before reading the opcode at BusErrorPC, */ +/* else this will cause an unwanted "double bus error" ("Union Demo" loader). */ +/* 2014/02/22 [NP] In refill_prefetch(), use get_word() instead of do_get_mem_word() to generate */ +/* a bus error when trying to read from an invalid region. */ +/* 2014/03/18 [NP] In Exception(), add a specific case to restore the dest part of a "move" after */ +/* it was overwritten during a bus error (fix the game Dragon Flight). */ +/* 2014/04/06 [NP] In Exception(), add a special case for last_addr_for_exception_3 stored in the */ +/* stack after a bus error (fix the game Batman The Movie). */ + +const char NewCpu_fileid[] = "Hatari newcpu.c : " __DATE__ " " __TIME__; #include "sysdeps.h" #include "hatari-glue.h" #include "maccess.h" #include "memory.h" #include "newcpu.h" -#include "../includes/main.h" -#include "../includes/log.h" -#include "../includes/m68000.h" -#include "../includes/mfp.h" -#include "../includes/tos.h" -#include "../includes/vdi.h" -#include "../includes/cart.h" -#include "../includes/debugui.h" -#include "../includes/bios.h" -#include "../includes/xbios.h" +#include "main.h" +#include "m68000.h" +#include "cycInt.h" +#include "mfp.h" +#include "tos.h" +#include "vdi.h" +#include "cart.h" +#include "dialog.h" +#include "bios.h" +#include "xbios.h" +#include "screen.h" +#include "video.h" +#include "options.h" +#include "dsp.h" +#include "log.h" +#include "debugui.h" +#include "debugcpu.h" +#include "68kDisass.h" + +#ifdef HAVE_CAPSIMAGE +#if CAPSIMAGE_VERSION == 5 +#include +#endif +#endif +//#define DEBUG_PREFETCH struct flag_struct regflags; @@ -51,6 +185,8 @@ int fpp_movem_next[256]; cpuop_func *cpufunctbl[65536]; +int OpcodeFamily; +int BusCyclePenalty = 0; #define COUNT_INSTRS 0 @@ -118,15 +254,15 @@ void build_cpufunctbl(void) { int i; unsigned long opcode; - const struct cputbl *tbl = (cpu_level == 4 ? op_smalltbl_0_ff - : cpu_level == 3 ? op_smalltbl_1_ff - : cpu_level == 2 ? op_smalltbl_2_ff - : cpu_level == 1 ? op_smalltbl_3_ff - : ! cpu_compatible ? op_smalltbl_4_ff + const struct cputbl *tbl = (currprefs.cpu_level == 4 ? op_smalltbl_0_ff + : currprefs.cpu_level == 3 ? op_smalltbl_1_ff + : currprefs.cpu_level == 2 ? op_smalltbl_2_ff + : currprefs.cpu_level == 1 ? op_smalltbl_3_ff + : ! currprefs.cpu_compatible ? op_smalltbl_4_ff : op_smalltbl_5_ff); Log_Printf(LOG_DEBUG, "Building CPU function table (%d %d %d).\n", - cpu_level, cpu_compatible, address_space_24); + currprefs.cpu_level, currprefs.cpu_compatible, currprefs.address_space_24); for (opcode = 0; opcode < 65536; opcode++) cpufunctbl[opcode] = op_illg_1; @@ -137,7 +273,7 @@ void build_cpufunctbl(void) for (opcode = 0; opcode < 65536; opcode++) { cpuop_func *f; - if (table68k[opcode].mnemo == i_ILLG || table68k[opcode].clev > cpu_level) + if (table68k[opcode].mnemo == i_ILLG || table68k[opcode].clev > currprefs.cpu_level) continue; if (table68k[opcode].handler != -1) { @@ -151,11 +287,6 @@ void build_cpufunctbl(void) if (tbl[i].specific) cpufunctbl[tbl[i].opcode] = tbl[i].handler; } - - /* Hatari's illegal opcodes: */ - cpufunctbl[GEMDOS_OPCODE] = OpCode_GemDos; - cpufunctbl[SYSINIT_OPCODE] = OpCode_SysInit; - cpufunctbl[VDI_OPCODE] = OpCode_VDI; } @@ -199,9 +330,9 @@ void init_m68k (void) } #endif write_log ("Building CPU table for configuration: 68"); - if (address_space_24 && cpu_level > 1) + if (currprefs.address_space_24 && currprefs.cpu_level > 1) write_log ("EC"); - switch (cpu_level) { + switch (currprefs.cpu_level) { case 1: write_log ("010"); break; @@ -219,7 +350,7 @@ void init_m68k (void) write_log ("000"); break; } - if (cpu_compatible) + if (currprefs.cpu_compatible) write_log (" (compatible mode)"); write_log ("\n"); @@ -636,7 +767,7 @@ void MakeFromSR (void) SET_ZFLG ((regs.sr >> 2) & 1); SET_VFLG ((regs.sr >> 1) & 1); SET_CFLG (regs.sr & 1); - if (cpu_level >= 2) { + if (currprefs.cpu_level >= 2) { if (olds != regs.s) { if (olds) { if (oldm) @@ -658,6 +789,10 @@ void MakeFromSR (void) } } } else { + /* [NP] If cpu < 68020, m and t0 are ignored and should be set to 0 */ + regs.t0 = 0; + regs.m = 0; + if (olds != regs.s) { if (olds) { regs.isp = m68k_areg(regs, 7); @@ -680,45 +815,117 @@ void MakeFromSR (void) } -void Exception(int nr, uaecptr oldpc) +static void exception_trace (int nr) { - uae_u32 currpc = m68k_getpc (); + unset_special (SPCFLAG_TRACE | SPCFLAG_DOTRACE); + if (regs.t1 && !regs.t0) { + /* trace stays pending if exception is div by zero, chk, + * trapv or trap #x + */ + if (nr == 5 || nr == 6 || nr == 7 || (nr >= 32 && nr <= 47)) + set_special (SPCFLAG_DOTRACE); + } + regs.t1 = regs.t0 = regs.m = 0; +} - /*if( nr>=2 && nr<10 ) fprintf(stderr,"Exception (-> %i bombs)!\n",nr);*/ - /* Intercept VDI exception (Trap #2 with D0 = 0x73) */ - if(bUseVDIRes && nr == 0x22 && regs.regs[0] == 0x73) - { - if(!VDI()) +/* + * Compute the number of jitter cycles to add when a video interrupt occurs + * (this is specific to the Atari ST) + */ +static void InterruptAddJitter (int Level , int Pending) +{ + int cycles = 0; + + if ( Level == 2 ) /* HBL */ { - /* Set 'PC' as address of 'VDI_OPCODE' illegal instruction - * This will call OpCode_VDI after completion of Trap call! - * Use to modify return structure from VDI */ - VDI_OldPC = currpc; - currpc = CART_VDI_OPCODE_ADDR; + if ( Pending ) + cycles = HblJitterArrayPending[ HblJitterIndex ]; + else + cycles = HblJitterArray[ HblJitterIndex ]; + } + + else if ( Level == 4 ) /* VBL */ + { + if ( Pending ) + cycles = VblJitterArrayPending[ VblJitterIndex ]; + else + cycles = VblJitterArray[ VblJitterIndex ]; } - } -#if 0 - /* Intercept BIOS or XBIOS trap (Trap #13 or #14) */ - if (nr == 0x2d) +//fprintf ( stderr , "jitter %d\n" , cycles ); +//cycles=0; + if ( cycles > 0 ) /* no need to call M68000_AddCycles if cycles == 0 */ + M68000_AddCycles ( cycles ); +} + + +/* Handle exceptions. We need a special case to handle MFP exceptions */ +/* on Atari ST, because it's possible to change the MFP's vector base */ +/* and get a conflict with 'normal' cpu exceptions. */ +void Exception(int nr, uaecptr oldpc, int ExceptionSource) +{ + uae_u32 currpc = m68k_getpc () , newpc; + + /*if( nr>=2 && nr<10 ) fprintf(stderr,"Exception (-> %i bombs)!\n",nr);*/ + + /* Pending bits / vector number can change before the end of the IACK sequence. */ + /* We need to handle MFP and HBL/VBL cases for this. */ + if ( ExceptionSource == M68000_EXC_SRC_INT_MFP ) { - /* Intercept BIOS calls */ - if (Bios()) return; + M68000_AddCycles ( CPU_IACK_CYCLES_MFP ); + CPU_IACK = true; + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) + CALL_VAR(PendingInterruptFunction); + nr = MFP_ProcessIACK ( nr ); + CPU_IACK = false; } - else if (nr == 0x2e) + else if ( ( ExceptionSource == M68000_EXC_SRC_AUTOVEC ) && ( ( nr == 26 ) || ( nr == 28 ) ) ) { - /* Intercept XBIOS calls */ - if (XBios()) return; + M68000_AddCycles ( CPU_IACK_CYCLES_VIDEO ); + CPU_IACK = true; + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) + CALL_VAR(PendingInterruptFunction); + if ( MFP_UpdateNeeded == true ) + MFP_UpdateIRQ ( 0 ); /* update MFP's state if some internal timers related to MFP expired */ + pendingInterrupts &= ~( 1 << ( nr - 24 ) ); /* clear HBL or VBL pending bit */ + CPU_IACK = false; } -#endif + + + if (ExceptionSource == M68000_EXC_SRC_CPU) + { + if (nr == 0x22) + { + /* Intercept VDI & AES exceptions (Trap #2) */ + if(bVdiAesIntercept && VDI_AES_Entry()) + { + /* Set 'PC' to address of 'VDI_OPCODE' illegal instruction. + * This will call OpCode_VDI() after completion of Trap call! + * This is used to modify specific VDI return vectors contents. + */ + VDI_OldPC = currpc; + currpc = CART_VDI_OPCODE_ADDR; + } + } + else if (nr == 0x2d) + { + /* Intercept BIOS (Trap #13) calls */ + if (Bios()) return; + } + else if (nr == 0x2e) + { + /* Intercept XBIOS (Trap #14) calls */ + if (XBios()) return; + } + } MakeSR(); /* Change to supervisor mode if necessary */ if (!regs.s) { regs.usp = m68k_areg(regs, 7); - if (cpu_level >= 2) + if (currprefs.cpu_level >= 2) m68k_areg(regs, 7) = regs.m ? regs.msp : regs.isp; else m68k_areg(regs, 7) = regs.isp; @@ -726,8 +933,14 @@ void Exception(int nr, uaecptr oldpc) } /* Build additional exception stack frame for 68010 and higher */ - if (cpu_level > 0) { - if (nr == 2 || nr == 3) { + /* (special case for MFP) */ + if (currprefs.cpu_level > 0) { + if (ExceptionSource == M68000_EXC_SRC_INT_MFP + || ExceptionSource == M68000_EXC_SRC_INT_DSP) { + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), nr * 4); /* MFP interrupt, 'nr' can be in a different range depending on $fffa17 */ + } + else if (nr == 2 || nr == 3) { int i; /* @@@ this is probably wrong (?) */ for (i = 0 ; i < 12 ; i++) { @@ -766,117 +979,227 @@ void Exception(int nr, uaecptr oldpc) m68k_areg(regs, 7) -= 2; put_word (m68k_areg(regs, 7), regs.sr); + LOG_TRACE(TRACE_CPU_EXCEPTION, "cpu exception %d currpc %x buspc %x newpc %x fault_e3 %x op_e3 %hx addr_e3 %x\n", + nr, currpc, BusErrorPC, get_long (regs.vbr + 4*nr), last_fault_for_exception_3, last_op_for_exception_3, last_addr_for_exception_3); + /* 68000 bus/address errors: */ - if (cpu_level==0 && (nr==2 || nr==3)) { - uae_u16 specialstatus = 0x2001; + if (currprefs.cpu_level==0 && (nr==2 || nr==3) && ExceptionSource == M68000_EXC_SRC_CPU) { + uae_u16 specialstatus = 1; + uae_u16 BusError_opcode; + /* Special status word emulation isn't perfect yet... :-( */ if (regs.sr & 0x2000) specialstatus |= 0x4; m68k_areg(regs, 7) -= 8; if (nr == 3) { /* Address error */ + specialstatus |= ( last_op_for_exception_3 & (~0x1f) ); /* [NP] unused bits of specialstatus are those of the last opcode ! */ put_word (m68k_areg(regs, 7), specialstatus); put_long (m68k_areg(regs, 7)+2, last_fault_for_exception_3); put_word (m68k_areg(regs, 7)+6, last_op_for_exception_3); put_long (m68k_areg(regs, 7)+10, last_addr_for_exception_3); - if (bEnableDebug) { + if (ExceptionDebugMask & EXCEPT_ADDRESS) { fprintf(stderr,"Address Error at address $%x, PC=$%x\n",last_fault_for_exception_3,currpc); - DebugUI(); + DebugUI(REASON_CPU_EXCEPTION); } } else { /* Bus error */ + /* Get the opcode that caused the bus error, to adapt the stack frame in some cases */ + /* (we must call get_word() only on valid region, else this will cause a double bus error) */ + if ( valid_address ( BusErrorPC , 2 ) ) + BusError_opcode = get_word(BusErrorPC); + else + BusError_opcode = 0; + + specialstatus |= ( BusError_opcode & (~0x1f) ); /* [NP] unused bits of special status are those of the last opcode ! */ if (bBusErrorReadWrite) specialstatus |= 0x10; put_word (m68k_areg(regs, 7), specialstatus); put_long (m68k_areg(regs, 7)+2, BusErrorAddress); - put_word (m68k_areg(regs, 7)+6, get_word(BusErrorPC)); /* Opcode */ + put_word (m68k_areg(regs, 7)+6, BusError_opcode); /* Opcode */ + + /* [NP] PC stored in the stack frame is not necessarily pointing to the next instruction ! */ + /* FIXME : we should have a proper model for this, in the meantime we handle specific cases */ + if ( BusError_opcode == 0x21f8 ) /* move.l $0.w,$24.w (Transbeauce 2 loader) */ + put_long (m68k_areg(regs, 7)+10, currpc-2); /* correct PC is 2 bytes less than usual value */ + + else if ( ( BusErrorPC == 0xccc ) && ( BusError_opcode == 0x48d6 ) ) /* 48d6 3f00 movem.l a0-a5,(a6) (Blood Money) */ + put_long (m68k_areg(regs, 7)+10, currpc+2); /* correct PC is 2 bytes more than usual value */ + + else if ( ( BusErrorPC == 0x1fece ) && ( BusError_opcode == 0x33d4 ) ) /* 1fece : 33d4 0001 fdca move.w (a4),$1fdca (Batman The Movie) */ + put_long (m68k_areg(regs, 7)+10, currpc-4); /* correct PC is 4 bytes less than usual value */ + + /* [NP] In case of a move with a bus error on the read part, uae cpu is writing to the dest part */ + /* then process the bus error ; on a real CPU, the bus error occurs after the read and before the */ + /* write, so the dest part doesn't change. For now, we restore the dest part on some specific cases */ + /* FIXME : the bus error should be processed just after the read, not at the end of the instruction */ + else if ( ( BusErrorPC == 0x62a ) && ( BusError_opcode == 0x3079 ) ) /* 3079 4ef9 0000 move.l $4ef90000,a0 (Dragon Flight) */ + m68k_areg(regs, 0) = 8; /* A0 should not be changed to "0" but keep its value "8" */ + + else if ( get_long(BusErrorPC) == 0x13f88e21 ) /* 13f8 8e21 move.b $ffff8e21.w,$xxxxx (Tymewarp) */ + put_byte ( get_long(BusErrorPC+4) , 0x00 ); /* dest content should not be changed to "ff" but keep its value "00" */ + + fprintf(stderr,"Bus Error at address $%x, PC=$%lx %x %x\n", BusErrorAddress, (long)currpc, BusErrorPC , BusError_opcode); + /* Check for double bus errors: */ if (regs.spcflags & SPCFLAG_BUSERROR) { fprintf(stderr, "Detected double bus error at address $%x, PC=$%lx => CPU halted!\n", BusErrorAddress, (long)currpc); unset_special(SPCFLAG_BUSERROR); - if (bEnableDebug) - DebugUI(); + if (ExceptionDebugMask & EXCEPT_BUS) + DebugUI(REASON_CPU_EXCEPTION); + else + DlgAlert_Notice("Detected double bus error => CPU halted!\nEmulation needs to be reset.\n"); regs.intmask = 7; - m68k_setstopped(TRUE); + m68k_setstopped(true); return; } - if (bEnableDebug && BusErrorAddress!=0xff8a00) { + if ((ExceptionDebugMask & EXCEPT_BUS) && BusErrorAddress!=0xff8a00) { fprintf(stderr,"Bus Error at address $%x, PC=$%lx\n", BusErrorAddress, (long)currpc); - DebugUI(); + DebugUI(REASON_CPU_EXCEPTION); } } } /* Set PC and flags */ - if (bEnableDebug && get_long (regs.vbr + 4*nr) == 0) { - write_log("Uninitialized exception handler #%i!\n", nr); + if ((ExceptionDebugMask & EXCEPT_NOHANDLER) && (regs.vbr + 4*nr) == 0) { + fprintf(stderr,"Uninitialized exception handler #%i!\n", nr); + DebugUI(REASON_CPU_EXCEPTION); } + newpc = get_long (regs.vbr + 4*nr); + if ( newpc & 1) /* check new pc is even */ + { + if ( nr==2 || nr==3 ) /* address error during bus/address error -> stop emulation */ + { + fprintf(stderr,"Address Error during exception 2/3, aborting new PC=$%x\n",newpc); + if (ExceptionDebugMask & (EXCEPT_BUS|EXCEPT_ADDRESS)) + DebugUI(REASON_CPU_EXCEPTION); + else + DlgAlert_Notice("Address Error during exception 2/3 => CPU halted!\nEmulation needs to be reset.\n"); + } + else + { + fprintf(stderr,"Address Error during exception, new PC=$%x\n",newpc); + Exception ( 3 , m68k_getpc() , M68000_EXC_SRC_CPU ); + } + return; + } + /* handle debugger invocation for rest of exceptions */ + if (ExceptionDebugMask && nr > 3 && nr < 9) + DebugUI_Exceptions(nr, currpc); + m68k_setpc (get_long (regs.vbr + 4*nr)); fill_prefetch_0 (); - regs.t1 = regs.t0 = regs.m = 0; - unset_special (SPCFLAG_TRACE | SPCFLAG_DOTRACE); + /* Handle trace flags depending on current state */ + exception_trace (nr); - /* Handle exception cycles: */ - if(nr >= 24 && nr <= 31) + /* Handle exception cycles (special case for MFP) */ + if (ExceptionSource == M68000_EXC_SRC_INT_MFP) + { + M68000_AddCycles(44+12-CPU_IACK_CYCLES_MFP); /* MFP interrupt, 'nr' can be in a different range depending on $fffa17 */ + } + else if (nr >= 24 && nr <= 31) { - M68000_AddCycles(44+4); /* Interrupt */ + if ( nr == 26 ) /* HBL */ + M68000_AddCycles(44+12-CPU_IACK_CYCLES_VIDEO); /* Video Interrupt */ + else if ( nr == 28 ) /* VBL */ + M68000_AddCycles(44+12-CPU_IACK_CYCLES_VIDEO); /* Video Interrupt */ + else + M68000_AddCycles(44+4); /* Other Interrupts */ } else if(nr >= 32 && nr <= 47) { - M68000_AddCycles(34); /* Trap */ + M68000_AddCycles(34-4); /* Trap (total is 34, but cpuemu.c already adds 4) */ } else switch(nr) { - case 2: M68000_AddCycles(50); break; /* Bus error */ - case 3: M68000_AddCycles(50); break; /* Address error */ - case 4: M68000_AddCycles(34); break; /* Illegal instruction */ - case 5: M68000_AddCycles(38); break; /* Div by zero */ - case 6: M68000_AddCycles(40); break; /* CHK */ - case 7: M68000_AddCycles(34); break; /* TRAPV */ - case 8: M68000_AddCycles(34); break; /* Privilege violation */ - case 9: M68000_AddCycles(34); break; /* Trace */ - case 10: M68000_AddCycles(34); break; /* Line-A - probably wrong */ - case 11: M68000_AddCycles(34); break; /* Line-F - probably wrong */ + case 2: M68000_AddCycles(50); break; /* Bus error */ + case 3: M68000_AddCycles(50); break; /* Address error */ + case 4: M68000_AddCycles(34); break; /* Illegal instruction */ + case 5: M68000_AddCycles(38); break; /* Div by zero */ + case 6: M68000_AddCycles(40); break; /* CHK */ + case 7: M68000_AddCycles(34); break; /* TRAPV */ + case 8: M68000_AddCycles(34); break; /* Privilege violation */ + case 9: M68000_AddCycles(34); break; /* Trace */ + case 10: M68000_AddCycles(34); break; /* Line-A - probably wrong */ + case 11: M68000_AddCycles(34); break; /* Line-F - probably wrong */ default: /* FIXME: Add right cycles value for MFP interrupts and copro exceptions ... */ if(nr < 64) - M68000_AddCycles(4); /* Coprocessor and unassigned exceptions (???) */ + M68000_AddCycles(4); /* Coprocessor and unassigned exceptions (???) */ else - M68000_AddCycles(24); /* Must be a MFP interrupt */ + M68000_AddCycles(44+12); /* Must be a MFP or DSP interrupt */ break; } + } -static void Interrupt(int nr) +static void Interrupt(int nr , int Pending) { assert(nr < 8 && nr >= 0); /*lastint_regs = regs;*/ /*lastint_no = nr;*/ - Exception(nr+24, 0); + + /* On Hatari, only video ints are using SPCFLAG_INT (see m68000.c) */ + Exception(nr+24, 0, M68000_EXC_SRC_AUTOVEC); regs.intmask = nr; set_special (SPCFLAG_INT); + + /* Handle Atari ST's specific jitter for hbl/vbl */ + InterruptAddJitter ( nr , Pending ); } -uae_u32 reg_caar, reg_cacr; +uae_u32 caar, cacr; static uae_u32 itt0, itt1, dtt0, dtt1, tc, mmusr, urp, srp; +static int movec_illg (int regno) +{ + int regno2 = regno & 0x7ff; + if (currprefs.cpu_level == 1) { /* 68010 */ + if (regno2 < 2) + return 0; + return 1; + } + if (currprefs.cpu_level == 2 || currprefs.cpu_level == 3) { /* 68020 */ + if (regno == 3) return 1; /* 68040 only */ + /* 4 is >=68040, but 0x804 is in 68020 */ + if (regno2 < 4 || regno == 0x804) + return 0; + return 1; + } + if (currprefs.cpu_level >= 4) { /* 68040 */ + if (regno == 0x802) return 1; /* 68020 only */ + if (regno2 < 8) return 0; + if (currprefs.cpu_level == 6 && regno2 == 8) /* 68060 only */ + return 0; + return 1; + } + return 1; +} + int m68k_move2c (int regno, uae_u32 *regp) { - if ((cpu_level == 1 && (regno & 0x7FF) > 1) - || (cpu_level < 4 && (regno & 0x7FF) > 2) - || (cpu_level == 4 && regno == 0x802)) - { + if (movec_illg (regno)) { op_illg (0x4E7B); return 0; } else { switch (regno) { case 0: regs.sfc = *regp & 7; break; case 1: regs.dfc = *regp & 7; break; - case 2: reg_cacr = *regp & (cpu_level < 4 ? 0x3 : 0x80008000); break; + case 2: + { + uae_u32 cacr_mask = 0; + if (currprefs.cpu_level == 2) // 68020 + cacr_mask = 0x0000000f; + else if (currprefs.cpu_level == 3) // Fake 68030 + cacr_mask = 0x00003f1f; + else if (currprefs.cpu_level == 4) // 68040 + cacr_mask = 0x80008000; + cacr = *regp & cacr_mask; + } case 3: tc = *regp & 0xc000; break; /* Mask out fields that should be zero. */ case 4: itt0 = *regp & 0xffffe364; break; @@ -886,7 +1209,7 @@ int m68k_move2c (int regno, uae_u32 *reg case 0x800: regs.usp = *regp; break; case 0x801: regs.vbr = *regp; break; - case 0x802: reg_caar = *regp & 0xfc; break; + case 0x802: caar = *regp; break; case 0x803: regs.msp = *regp; if (regs.m == 1) m68k_areg(regs, 7) = regs.msp; break; case 0x804: regs.isp = *regp; if (regs.m == 0) m68k_areg(regs, 7) = regs.isp; break; case 0x805: mmusr = *regp; break; @@ -902,17 +1225,14 @@ int m68k_move2c (int regno, uae_u32 *reg int m68k_movec2 (int regno, uae_u32 *regp) { - if ((cpu_level == 1 && (regno & 0x7FF) > 1) - || (cpu_level < 4 && (regno & 0x7FF) > 2) - || (cpu_level == 4 && regno == 0x802)) - { + if (movec_illg (regno)) { op_illg (0x4E7A); return 0; } else { switch (regno) { case 0: *regp = regs.sfc; break; case 1: *regp = regs.dfc; break; - case 2: *regp = reg_cacr; break; + case 2: *regp = cacr; break; case 3: *regp = tc; break; case 4: *regp = itt0; break; case 5: *regp = itt1; break; @@ -920,7 +1240,7 @@ int m68k_movec2 (int regno, uae_u32 *reg case 7: *regp = dtt1; break; case 0x800: *regp = regs.usp; break; case 0x801: *regp = regs.vbr; break; - case 0x802: *regp = reg_caar; break; + case 0x802: *regp = caar; break; case 0x803: *regp = regs.m == 1 ? m68k_areg(regs, 7) : regs.msp; break; case 0x804: *regp = regs.m == 0 ? m68k_areg(regs, 7) : regs.isp; break; case 0x805: *regp = mmusr; break; @@ -963,7 +1283,7 @@ void m68k_divl (uae_u32 opcode, uae_u32 { #if defined(uae_s64) if (src == 0) { - Exception (5, oldpc); + Exception (5, oldpc,M68000_EXC_SRC_CPU); return; } if (extra & 0x800) { @@ -1018,7 +1338,7 @@ void m68k_divl (uae_u32 opcode, uae_u32 } #else if (src == 0) { - Exception (5, oldpc); + Exception (5, oldpc,M68000_EXC_SRC_CPU); return; } if (extra & 0x800) { @@ -1199,7 +1519,7 @@ void m68k_reset (void) SET_CFLG (0); SET_VFLG (0); SET_NFLG (0); - regs.spcflags &= SPCFLAG_MODE_CHANGE; /* Clear specialflags except mode-change */ + regs.spcflags &= ( SPCFLAG_MODE_CHANGE | SPCFLAG_DEBUGGER ); /* Clear specialflags except mode-change and debugger */ regs.intmask = 7; regs.vbr = regs.sfc = regs.dfc = 0; regs.fpcr = regs.fpsr = regs.fpiar = 0; @@ -1216,17 +1536,17 @@ unsigned long REGPARAM2 op_illg (uae_u32 uaecptr pc = m68k_getpc (); #endif if ((opcode & 0xF000) == 0xF000) { - Exception(0xB,0); + Exception(0xB,0,M68000_EXC_SRC_CPU); return 4; } if ((opcode & 0xF000) == 0xA000) { - Exception(0xA,0); + Exception(0xA,0,M68000_EXC_SRC_CPU); return 4; } #if 0 write_log ("Illegal instruction: %04x at %08lx\n", opcode, (long)pc); #endif - Exception (4,0); + Exception (4,0,M68000_EXC_SRC_CPU); return 4; } @@ -1249,7 +1569,7 @@ static uaecptr last_trace_ad = 0; static void do_trace (void) { - if (regs.t0 && cpu_level >= 2) { + if (regs.t0 && currprefs.cpu_level >= 2) { uae_u16 opcode; /* should also include TRAP, CHK, SR modification FPcc */ /* probably never used so why bother */ @@ -1257,7 +1577,7 @@ static void do_trace (void) m68k_setpc (m68k_getpc ()); fill_prefetch_0 (); opcode = get_word (regs.pc); - if (opcode == 0x4e72 /* RTE */ + if (opcode == 0x4e73 /* RTE */ || opcode == 0x4e74 /* RTD */ || opcode == 0x4e75 /* RTS */ || opcode == 0x4e77 /* RTR */ @@ -1286,6 +1606,39 @@ static void do_trace (void) /* * Handle special flags */ + +static bool do_specialties_interrupt (int Pending) +{ +#if ENABLE_DSP_EMU + /* Check for DSP int first (if enabled) (level 6) */ + if (regs.spcflags & SPCFLAG_DSP) { + if (DSP_ProcessIRQ() == true) + return true; + } +#endif + + /* Check for MFP ints (level 6) */ + if (regs.spcflags & SPCFLAG_MFP) { + if (MFP_ProcessIRQ() == true) + return true; /* MFP exception was generated, no higher interrupt can happen */ + } + + /* No MFP int, check for VBL/HBL ints (levels 4/2) */ + if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)) { + int intr = intlev (); + /* SPCFLAG_DOINT will be enabled again in MakeFromSR to handle pending interrupts! */ +// unset_special (SPCFLAG_DOINT); + unset_special (SPCFLAG_INT | SPCFLAG_DOINT); + if (intr != -1 && intr > regs.intmask) { + Interrupt (intr , Pending); /* process the interrupt and add pending jitter if necessary */ + return true; + } + } + + return false; /* no interrupt was found */ +} + + static int do_specialties (void) { if(regs.spcflags & SPCFLAG_BUSERROR) { @@ -1293,63 +1646,74 @@ static int do_specialties (void) * functions since the PC should point to the address of the next * instruction, so we're executing the bus errors here: */ unset_special(SPCFLAG_BUSERROR); - Exception(2,0); + Exception(2,0,M68000_EXC_SRC_CPU); } if(regs.spcflags & SPCFLAG_EXTRA_CYCLES) { /* Add some extra cycles to simulate a wait state */ unset_special(SPCFLAG_EXTRA_CYCLES); M68000_AddCycles(nWaitStateCycles); + nWaitStateCycles = 0; } if (regs.spcflags & SPCFLAG_DOTRACE) { - Exception (9,last_trace_ad); + Exception (9,last_trace_ad,M68000_EXC_SRC_CPU); } - while (regs.spcflags & SPCFLAG_STOP) { - if (regs.intmask > 5) { - /* We still have to care about events when IPL==7 ! */ - Main_EventHandler(); - if (regs.spcflags & SPCFLAG_BRK) return 1; - } - M68000_AddCycles(4); - if (PendingInterruptCount<=0 && PendingInterruptFunction) { - CALL_VAR(PendingInterruptFunction); - } - if (regs.spcflags & SPCFLAG_MFP) { - MFP_CheckPendingInterrupts(); - } - if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)) { - int intr = intlev (); - unset_special (SPCFLAG_INT | SPCFLAG_DOINT); - if (intr != -1 && intr > regs.intmask) { - Interrupt (intr); + + /* Handle the STOP instruction */ + if ( regs.spcflags & SPCFLAG_STOP ) { +//fprintf ( stderr , "test stop %d\n" , nCyclesMainCounter ); + /* We first test if there's a pending interrupt that would */ + /* allow to immediately leave the STOP state */ + if ( do_specialties_interrupt(true) ) { /* test if there's an interrupt and add pending jitter */ + regs.stopped = 0; + unset_special (SPCFLAG_STOP); +//fprintf ( stderr , "exit stop %d\n" , nCyclesMainCounter ); + } + + /* No pending int, we have to wait for the next matching int */ + while (regs.spcflags & SPCFLAG_STOP) { + + /* Take care of quit event if needed */ + if (regs.spcflags & SPCFLAG_BRK) + return 1; + + M68000_AddCycles(4); + + /* It is possible one or more ints happen at the same time */ + /* We must process them during the same cpu cycle then choose the highest priority one */ + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) + CALL_VAR(PendingInterruptFunction); + if ( MFP_UpdateNeeded == true ) + MFP_UpdateIRQ ( 0 ); + + /* Check is there's an interrupt to process (could be a delayed MFP interrupt) */ + if ( do_specialties_interrupt(false) ) { /* test if there's an interrupt and add non pending jitter */ regs.stopped = 0; unset_special (SPCFLAG_STOP); } } } + if (regs.spcflags & SPCFLAG_TRACE) do_trace (); - if (regs.spcflags & SPCFLAG_DOINT) { - int intr = intlev (); - /* SPCFLAG_DOINT will be enabled again in MakeFromSR to handle pending interrupts! */ - unset_special (SPCFLAG_DOINT); - if (intr != -1 && intr > regs.intmask) { - Interrupt (intr); - regs.stopped = 0; - } +// if (regs.spcflags & SPCFLAG_DOINT) { + /* [NP] pending int should be processed now, not after the current instr */ + /* so we check for (SPCFLAG_INT | SPCFLAG_DOINT), not just for SPCFLAG_DOINT */ + + if ( do_specialties_interrupt(false) ) { /* test if there's an interrupt and add non pending jitter */ + regs.stopped = 0; /* [NP] useless ? */ } if (regs.spcflags & SPCFLAG_INT) { unset_special (SPCFLAG_INT); set_special (SPCFLAG_DOINT); } - if (regs.spcflags & SPCFLAG_MFP) { /* Check for MFP interrupts */ - MFP_CheckPendingInterrupts(); - } + if (regs.spcflags & SPCFLAG_DEBUGGER) + DebugCpu_Check(); if (regs.spcflags & (SPCFLAG_BRK | SPCFLAG_MODE_CHANGE)) { unset_special(SPCFLAG_MODE_CHANGE); @@ -1366,25 +1730,34 @@ static void m68k_run_1 (void) { #ifdef DEBUG_PREFETCH uae_u8 saved_bytes[20]; - uae_u16 *oldpcp; + uae_u8 *oldpcp; #endif for (;;) { int cycles; +//fprintf (stderr, "ir in %x %x\n",do_get_mem_long(®s.prefetch) , regs.prefetch_pc); uae_u32 opcode = get_iword_prefetch (0); #ifdef DEBUG_PREFETCH - if (get_ilong (0) != do_get_mem_long (®s.prefetch)) { - fprintf (stderr, "Prefetch differs from memory.\n"); - debugging = 1; - return; - } +// if (get_ilong (0) != do_get_mem_long (®s.prefetch)) { +// fprintf (stderr, "Prefetch differs from memory.\n"); +// debugging = 1; +// return; +// } oldpcp = regs.pc_p; memcpy (saved_bytes, regs.pc_p, 20); #endif /*m68k_dumpstate(stderr, NULL);*/ - /*m68k_disasm(stderr, m68k_getpc (), NULL, 1);*/ + if (LOG_TRACE_LEVEL(TRACE_CPU_DISASM)) + { + int FrameCycles, HblCounterVideo, LineCycles; + + Video_GetPosition ( &FrameCycles , &HblCounterVideo , &LineCycles ); + + LOG_TRACE_PRINT ( "cpu video_cyc=%6d %3d@%3d : " , FrameCycles, LineCycles, HblCounterVideo ); + Disasm(stderr, m68k_getpc (), NULL, 1); + } /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ /* regs_backup[backup_pointer = (backup_pointer + 1) % 16] = regs;*/ @@ -1395,24 +1768,58 @@ static void m68k_run_1 (void) instrcount[opcode]++; #endif + /* In case of a Bus Error, we need the PC of the instruction that caused */ + /* the error to build the exception stack frame */ + BusErrorPC = m68k_getpc(); + + if (bDspEnabled) + Cycles_SetCounter(CYCLES_COUNTER_CPU, 0); /* to measure the total number of cycles spent in the cpu */ + + /* Uncomment following lines to call capslib's debugger after each instruction */ + //if ( CAPSGetDebugRequest() ) + // DebugUI(REASON_CPU_BREAKPOINT); + cycles = (*cpufunctbl[opcode])(opcode); +//fprintf (stderr, "ir out %x %x\n",do_get_mem_long(®s.prefetch) , regs.prefetch_pc); #ifdef DEBUG_PREFETCH if (memcmp (saved_bytes, oldpcp, 20) != 0) { - fprintf (stderr, "Self-modifying code detected.\n"); - set_special (SPCFLAG_BRK); - debugging = 1; + fprintf (stderr, "Self-modifying code detected %x.\n" , m68k_getpc() ); +// set_special (SPCFLAG_BRK); +// debugging = 1; } #endif - M68000_AddCycles(cycles); - if (PendingInterruptCount<=0 && PendingInterruptFunction) - CALL_VAR(PendingInterruptFunction); + M68000_AddCyclesWithPairing(cycles); + if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { + /* Add some extra cycles to simulate a wait state */ + unset_special(SPCFLAG_EXTRA_CYCLES); + M68000_AddCycles(nWaitStateCycles); + nWaitStateCycles = 0; + } + + /* We can have several interrupts at the same time before the next CPU instruction */ + /* We must check for pending interrupt and call do_specialties_interrupt() only */ + /* if the cpu is not in the STOP state. Else, the int could be acknowledged now */ + /* and prevent exiting the STOP state when calling do_specialties() after. */ + /* For performance, we first test PendingInterruptCount, then regs.spcflags */ + if ( PendingInterruptCount <= 0 ) + { + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) && ( ( regs.spcflags & SPCFLAG_STOP ) == 0 ) ) + CALL_VAR ( PendingInterruptFunction ); /* call the interrupt's handler */ + if ( MFP_UpdateNeeded == true ) + MFP_UpdateIRQ ( 0 ); /* update MFP's state if some internal timers related to MFP expired */ + } if (regs.spcflags) { if (do_specialties ()) return; } + + /* Run DSP 56k code if necessary */ + if (bDspEnabled) { + DSP_Run( Cycles_GetCounter(CYCLES_COUNTER_CPU) * 2); + } } } @@ -1425,7 +1832,15 @@ static void m68k_run_2 (void) uae_u32 opcode = get_iword (0); /*m68k_dumpstate(stderr, NULL);*/ - /*m68k_disasm(stderr, m68k_getpc (), NULL, 1);*/ + if (LOG_TRACE_LEVEL(TRACE_CPU_DISASM)) + { + int FrameCycles, HblCounterVideo, LineCycles; + + Video_GetPosition ( &FrameCycles , &HblCounterVideo , &LineCycles ); + + LOG_TRACE_PRINT ( "cpu video_cyc=%6d %3d@%3d : " , FrameCycles, LineCycles, HblCounterVideo ); + Disasm(stderr, m68k_getpc (), NULL, 1); + } /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ /* regs_backup[backup_pointer = (backup_pointer + 1) % 16] = regs;*/ @@ -1436,16 +1851,40 @@ static void m68k_run_2 (void) instrcount[opcode]++; #endif + /* In case of a Bus Error, we need the PC of the instruction that caused */ + /* the error to build the exception stack frame */ + BusErrorPC = m68k_getpc(); + cycles = (*cpufunctbl[opcode])(opcode); + if (bDspEnabled) + Cycles_SetCounter(CYCLES_COUNTER_CPU, 0); /* to measure the total number of cycles spent in the cpu */ + M68000_AddCycles(cycles); - if (PendingInterruptCount<=0 && PendingInterruptFunction) - CALL_VAR(PendingInterruptFunction); + if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { + /* Add some extra cycles to simulate a wait state */ + unset_special(SPCFLAG_EXTRA_CYCLES); + M68000_AddCycles(nWaitStateCycles); + nWaitStateCycles = 0; + } + + if ( PendingInterruptCount <= 0 ) + { + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) + CALL_VAR(PendingInterruptFunction); + if ( MFP_UpdateNeeded == true ) + MFP_UpdateIRQ ( 0 ); + } if (regs.spcflags) { if (do_specialties ()) return; } + + /* Run DSP 56k code if necessary */ + if (bDspEnabled) { + DSP_Run( Cycles_GetCounter(CYCLES_COUNTER_CPU) ); + } } } @@ -1461,7 +1900,7 @@ void m68k_go (int may_quit) in_m68k_go++; while (!(regs.spcflags & SPCFLAG_BRK)) { - if(cpu_compatible) + if(currprefs.cpu_compatible) m68k_run_1(); else m68k_run_2(); @@ -1488,13 +1927,13 @@ static void m68k_verify (uaecptr addr, u if (dp->suse) { if (!verify_ea (dp->sreg, dp->smode, dp->size, &val)) { - Exception (3, 0); + Exception (3, 0,M68000_EXC_SRC_CPU); return; } } if (dp->duse) { if (!verify_ea (dp->dreg, dp->dmode, dp->size, &val)) { - Exception (3, 0); + Exception (3, 0,M68000_EXC_SRC_CPU); return; } } @@ -1593,10 +2032,146 @@ void m68k_dumpstate (FILE *f, uaecptr *n (regs.fpsr & 0x4000000) != 0, (regs.fpsr & 0x2000000) != 0, (regs.fpsr & 0x1000000) != 0); - if (cpu_compatible) + if (currprefs.cpu_compatible) fprintf (f, "prefetch %08lx\n", (unsigned long)do_get_mem_long(®s.prefetch)); m68k_disasm (f, m68k_getpc (), nextpc, 1); if (nextpc) fprintf (f, "next PC: %08lx\n", (long)*nextpc); } + + +/* + + The routines below take dividend and divisor as parameters. + They return 0 if division by zero, or exact number of cycles otherwise. + + The number of cycles returned assumes a register operand. + Effective address time must be added if memory operand. + + For 68000 only (not 68010, 68012, 68020, etc). + Probably valid for 68008 after adding the extra prefetch cycle. + + + Best and worst cases are for register operand: + (Note the difference with the documented range.) + + + DIVU: + + Overflow (always): 10 cycles. + Worst case: 136 cycles. + Best case: 76 cycles. + + + DIVS: + + Absolute overflow: 16-18 cycles. + Signed overflow is not detected prematurely. + + Worst case: 156 cycles. + Best case without signed overflow: 122 cycles. + Best case with signed overflow: 120 cycles + + + */ + + +// +// DIVU +// Unsigned division +// + +STATIC_INLINE int getDivu68kCycles_2 (uae_u32 dividend, uae_u16 divisor) +{ + int mcycles; + uae_u32 hdivisor; + int i; + + if (divisor == 0) + return 0; + + // Overflow + if ((dividend >> 16) >= divisor) + return (mcycles = 5) * 2; + + mcycles = 38; + hdivisor = divisor << 16; + + for (i = 0; i < 15; i++) { + uae_u32 temp; + temp = dividend; + + dividend <<= 1; + + // If carry from shift + if ((uae_s32)temp < 0) + dividend -= hdivisor; + else { + mcycles += 2; + if (dividend >= hdivisor) { + dividend -= hdivisor; + mcycles--; + } + } + } + return mcycles * 2; +} +int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor) +{ + int v = getDivu68kCycles_2 (dividend, divisor) - 4; +// write_log ("U%d ", v); + return v; +} + +// +// DIVS +// Signed division +// + +STATIC_INLINE int getDivs68kCycles_2 (uae_s32 dividend, uae_s16 divisor) +{ + int mcycles; + uae_u32 aquot; + int i; + + if (divisor == 0) + return 0; + + mcycles = 6; + + if (dividend < 0) + mcycles++; + + // Check for absolute overflow + if (((uae_u32)abs (dividend) >> 16) >= (uae_u16)abs (divisor)) + return (mcycles + 2) * 2; + + // Absolute quotient + aquot = (uae_u32) abs (dividend) / (uae_u16)abs (divisor); + + mcycles += 55; + + if (divisor >= 0) { + if (dividend >= 0) + mcycles--; + else + mcycles++; + } + + // Count 15 msbits in absolute of quotient + + for (i = 0; i < 15; i++) { + if ((uae_s16)aquot >= 0) + mcycles++; + aquot <<= 1; + } + + return mcycles * 2; +} +int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor) +{ + int v = getDivs68kCycles_2 (dividend, divisor) - 4; +// write_log ("S%d ", v); + return v; +}