--- hatari/src/uae-cpu/newcpu.c 2019/04/09 08:48:50 1.1.1.16 +++ hatari/src/uae-cpu/newcpu.c 2019/04/09 08:54:38 1.1.1.20 @@ -7,8 +7,8 @@ * * 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. */ @@ -46,7 +46,7 @@ /* 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 intruction 'n' was processed, the */ +/* 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). */ @@ -80,7 +80,7 @@ /* 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 immediatly, without doing a 'while' */ +/* 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). */ @@ -108,7 +108,26 @@ /* 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__; @@ -127,12 +146,20 @@ const char NewCpu_fileid[] = "Hatari new #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 @@ -838,38 +865,58 @@ static void InterruptAddJitter (int Leve /* and get a conflict with 'normal' cpu exceptions. */ void Exception(int nr, uaecptr oldpc, int ExceptionSource) { - uae_u32 currpc = m68k_getpc (); + uae_u32 currpc = m68k_getpc () , newpc; /*if( nr>=2 && nr<10 ) fprintf(stderr,"Exception (-> %i bombs)!\n",nr);*/ - /* Intercept VDI exception (Trap #2 with D0 = 0x73) */ + /* 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 ) + { + 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 ( ( ExceptionSource == M68000_EXC_SRC_AUTOVEC ) && ( ( nr == 26 ) || ( nr == 28 ) ) ) + { + 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; + } + + if (ExceptionSource == M68000_EXC_SRC_CPU) { - if(bUseVDIRes && nr == 0x22 && regs.regs[0] == 0x73) + if (nr == 0x22) { - if(!VDI()) + /* Intercept VDI & AES exceptions (Trap #2) */ + if(bVdiAesIntercept && VDI_AES_Entry()) { - /* 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 */ + /* 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; } } - - if (bBiosIntercept) + else if (nr == 0x2d) { - /* Intercept BIOS or XBIOS trap (Trap #13 or #14) */ - if (nr == 0x2d) - { - /* Intercept BIOS calls */ - if (Bios()) return; - } - else if (nr == 0x2e) - { - /* Intercept XBIOS calls */ - if (XBios()) return; - } + /* Intercept BIOS (Trap #13) calls */ + if (Bios()) return; + } + else if (nr == 0x2e) + { + /* Intercept XBIOS (Trap #14) calls */ + if (XBios()) return; } } @@ -938,6 +985,7 @@ void Exception(int nr, uaecptr oldpc, in /* 68000 bus/address errors: */ 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) @@ -949,48 +997,96 @@ void Exception(int nr, uaecptr oldpc, in 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 (bExceptionDebugging) { + 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 */ - specialstatus |= ( get_word(BusErrorPC) & (~0x1f) ); /* [NP] unused bits of special status are those of the last opcode ! */ + /* 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 ( get_word(BusErrorPC) == 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 */ + 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 (bExceptionDebugging) - DebugUI(); + if (ExceptionDebugMask & EXCEPT_BUS) + DebugUI(REASON_CPU_EXCEPTION); else - DlgAlert_Notice("Detected double bus error => CPU halted!\nEmulation needs to be reseted.\n"); + DlgAlert_Notice("Detected double bus error => CPU halted!\nEmulation needs to be reset.\n"); regs.intmask = 7; m68k_setstopped(true); return; } - if (bExceptionDebugging && 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 (bExceptionDebugging && get_long (regs.vbr + 4*nr) == 0) { - write_log("Uninitialized exception handler #%i!\n", nr); - DebugUI(); + 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 (); /* Handle trace flags depending on current state */ @@ -999,20 +1095,16 @@ void Exception(int nr, uaecptr oldpc, in /* Handle exception cycles (special case for MFP) */ if (ExceptionSource == M68000_EXC_SRC_INT_MFP) { - M68000_AddCycles(44+12); /* MFP interrupt, 'nr' can be in a different range depending on $fffa17 */ + 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) { - if ( nr == 26 ) /* HBL */ - { - /* store current cycle pos when then interrupt was received (see video.c) */ - LastCycleHblException = Cycles_GetCounter(CYCLES_COUNTER_VIDEO); - M68000_AddCycles(44+12); /* Video Interrupt */ - } - else if ( nr == 28 ) /* VBL */ - M68000_AddCycles(44+12); /* Video 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 */ + M68000_AddCycles(44+4); /* Other Interrupts */ } else if(nr >= 32 && nr <= 47) { @@ -1117,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: 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; @@ -1485,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 */ @@ -1517,9 +1609,17 @@ static void do_trace (void) static bool do_specialties_interrupt (int Pending) { - /* Check for MFP ints first (level 6) */ +#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_CheckPendingInterrupts() == true) + if (MFP_ProcessIRQ() == true) return true; /* MFP exception was generated, no higher interrupt can happen */ } @@ -1563,26 +1663,14 @@ static int do_specialties (void) /* 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 immediatly leave the STOP state */ + /* 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 ); } -#if 0 - if (regs.spcflags & SPCFLAG_MFP) /* MFP int */ - MFP_CheckPendingInterrupts(); - - if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)) { /* VBL/HBL ints */ - int intr = intlev (); - unset_special (SPCFLAG_INT | SPCFLAG_DOINT); - if (intr != -1 && intr > regs.intmask) { - Interrupt (intr , true); /* process the interrupt and add pending jitter */ - regs.stopped = 0; - unset_special (SPCFLAG_STOP); - } - } -#endif /* No pending int, we have to wait for the next matching int */ while (regs.spcflags & SPCFLAG_STOP) { @@ -1594,33 +1682,16 @@ static int do_specialties (void) M68000_AddCycles(4); /* It is possible one or more ints happen at the same time */ - /* We must process them during the same cpu cycle until the special INT flag is set */ - while (PendingInterruptCount<=0 && PendingInterruptFunction) { - /* 1st, we call the interrupt handler */ + /* We must process them during the same cpu cycle then choose the highest priority one */ + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) CALL_VAR(PendingInterruptFunction); - - /* Then we check if this handler triggered an interrupt to process */ - if ( do_specialties_interrupt(false) ) { /* test if there's an interrupt and add non pending jitter */ - regs.stopped = 0; - unset_special (SPCFLAG_STOP); - break; - } -#if 0 - /* Then we check if this handler triggered an MFP int to process */ - 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 , false); /* process the interrupt and add non pending jitter */ - regs.stopped = 0; - unset_special (SPCFLAG_STOP); - break; - } - } -#endif + 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); } } } @@ -1640,26 +1711,6 @@ static int do_specialties (void) unset_special (SPCFLAG_INT); set_special (SPCFLAG_DOINT); } -#if 0 - 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 , false); /* call Interrupt() with Pending=false, not necessarily true but harmless */ - 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(); - } -#endif if (regs.spcflags & SPCFLAG_DEBUGGER) DebugCpu_Check(); @@ -1679,19 +1730,20 @@ 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 @@ -1704,7 +1756,7 @@ static void m68k_run_1 (void) Video_GetPosition ( &FrameCycles , &HblCounterVideo , &LineCycles ); LOG_TRACE_PRINT ( "cpu video_cyc=%6d %3d@%3d : " , FrameCycles, LineCycles, HblCounterVideo ); - m68k_disasm(stderr, m68k_getpc (), NULL, 1); + Disasm(stderr, m68k_getpc (), NULL, 1); } /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ @@ -1720,19 +1772,24 @@ static void m68k_run_1 (void) /* 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 %x.\n" , m68k_getpc() ); - set_special (SPCFLAG_BRK); - debugging = 1; +// set_special (SPCFLAG_BRK); +// debugging = 1; } #endif - if (bDspEnabled) - Cycles_SetCounter(CYCLES_COUNTER_CPU, 0); /* to measure the total number of cycles spent in the cpu */ - M68000_AddCyclesWithPairing(cycles); if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { /* Add some extra cycles to simulate a wait state */ @@ -1741,27 +1798,18 @@ static void m68k_run_1 (void) nWaitStateCycles = 0; } -#if 0 - while (PendingInterruptCount <= 0 && PendingInterruptFunction) - CALL_VAR(PendingInterruptFunction); -#else /* 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 */ - while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) && ( ( regs.spcflags & SPCFLAG_STOP ) == 0 ) ) - { - CALL_VAR(PendingInterruptFunction); /* call the interrupt handler */ - do_specialties_interrupt(false); /* test if there's an mfp/video interrupt and add non pending jitter */ -#if 0 - if ( regs.spcflags & ( SPCFLAG_MFP | SPCFLAG_INT ) ) { /* only check mfp/video interrupts */ - if (do_specialties ()) /* check if this latest int has higher priority */ - return; - } -#endif - } -#endif + 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 ()) @@ -1770,7 +1818,7 @@ static void m68k_run_1 (void) /* Run DSP 56k code if necessary */ if (bDspEnabled) { - DSP_Run( Cycles_GetCounter(CYCLES_COUNTER_CPU) ); + DSP_Run( Cycles_GetCounter(CYCLES_COUNTER_CPU) * 2); } } } @@ -1791,7 +1839,7 @@ static void m68k_run_2 (void) Video_GetPosition ( &FrameCycles , &HblCounterVideo , &LineCycles ); LOG_TRACE_PRINT ( "cpu video_cyc=%6d %3d@%3d : " , FrameCycles, LineCycles, HblCounterVideo ); - m68k_disasm(stderr, m68k_getpc (), NULL, 1); + Disasm(stderr, m68k_getpc (), NULL, 1); } /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ @@ -1803,6 +1851,10 @@ 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) @@ -1816,8 +1868,13 @@ static void m68k_run_2 (void) nWaitStateCycles = 0; } - while (PendingInterruptCount <= 0 && PendingInterruptFunction) - CALL_VAR(PendingInterruptFunction); + if ( PendingInterruptCount <= 0 ) + { + while ( ( PendingInterruptCount <= 0 ) && ( PendingInterruptFunction ) ) + CALL_VAR(PendingInterruptFunction); + if ( MFP_UpdateNeeded == true ) + MFP_UpdateIRQ ( 0 ); + } if (regs.spcflags) { if (do_specialties ())