--- hatari/src/uae-cpu/newcpu.c 2019/04/01 07:09:30 1.1.1.2 +++ hatari/src/uae-cpu/newcpu.c 2019/04/01 07:10:42 1.1.1.6 @@ -7,7 +7,10 @@ * * 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. */ +static char rcsid[] = "Hatari $Id: newcpu.c,v 1.1.1.6 2019/04/01 07:10:42 root Exp $"; #include "sysdeps.h" #include "hatari-glue.h" @@ -16,12 +19,13 @@ #include "newcpu.h" #include "compiler.h" #include "events.h" +#include "../includes/main.h" #include "../includes/tos.h" +#include "../includes/vdi.h" +#include "../includes/cart.h" +#include "../includes/debugui.h" -/*int crashtrace=0;*/ -int quit_program = 0; -int debugging = 0; struct flag_struct regflags; int lastInstructionCycles; /* how many cycles last instruction took to execute */ @@ -46,6 +50,9 @@ int fpp_movem_next[256]; cpuop_func *cpufunctbl[65536]; +static uae_u32 busAddressErrPC = 0; /* Needed to store the right PC when bus-/address error occurs */ + + #define COUNT_INSTRS 0 #if COUNT_INSTRS @@ -100,24 +107,16 @@ void dump_counts (void) int broken_in; -static __inline__ unsigned int cft_map (unsigned int f) -{ -#ifndef HAVE_GET_WORD_UNSWAPPED - return f; -#else - return ((f >> 8) & 255) | ((f & 255) << 8); -#endif -} - static unsigned long op_illg_1 (uae_u32 opcode) REGPARAM; static unsigned long REGPARAM2 op_illg_1 (uae_u32 opcode) { - op_illg (cft_map (opcode)); + op_illg (opcode); return 4; } -static void build_cpufunctbl (void) + +void build_cpufunctbl(void) { int i; unsigned long opcode; @@ -132,10 +131,10 @@ static void build_cpufunctbl (void) cpu_level, cpu_compatible, address_space_24); for (opcode = 0; opcode < 65536; opcode++) - cpufunctbl[cft_map(opcode)] = op_illg_1; + cpufunctbl[opcode] = op_illg_1; for (i = 0; tbl[i].handler != NULL; i++) { if (! tbl[i].specific) - cpufunctbl[cft_map (tbl[i].opcode)] = tbl[i].handler; + cpufunctbl[tbl[i].opcode] = tbl[i].handler; } for (opcode = 0; opcode < 65536; opcode++) { cpuop_func *f; @@ -144,41 +143,27 @@ static void build_cpufunctbl (void) continue; if (table68k[opcode].handler != -1) { - f = cpufunctbl[cft_map (table68k[opcode].handler)]; + f = cpufunctbl[table68k[opcode].handler]; if (f == op_illg_1) abort(); - cpufunctbl[cft_map(opcode)] = f; + cpufunctbl[opcode] = f; } } for (i = 0; tbl[i].handler != NULL; i++) { if (tbl[i].specific) - cpufunctbl[cft_map(tbl[i].opcode)] = tbl[i].handler; + cpufunctbl[tbl[i].opcode] = tbl[i].handler; } - /* Hataris illegal opcodes: */ - cpufunctbl[cft_map(CONDRV_OPCODE)] = OpCode_ConnectedDrive; - cpufunctbl[cft_map(TIMERD_OPCODE)] = OpCode_TimerD; + /* Hatari's illegal opcodes: */ + cpufunctbl[GEMDOS_OPCODE] = OpCode_GemDos; + cpufunctbl[RUNOLDGEMDOS_OPCODE] = OpCode_OldGemDos; + cpufunctbl[CONDRV_OPCODE] = OpCode_ConnectedDrive; + cpufunctbl[TIMERD_OPCODE] = OpCode_TimerD; + cpufunctbl[VDI_OPCODE] = OpCode_VDI; } -/* -void check_prefs_changed_cpu (void) -{ - if (currprefs.cpu_level != changed_prefs.cpu_level - || currprefs.cpu_compatible != changed_prefs.cpu_compatible) { - currprefs.cpu_level = changed_prefs.cpu_level; - currprefs.cpu_compatible = changed_prefs.cpu_compatible; - build_cpufunctbl (); - } - if (currprefs.m68k_speed != changed_prefs.m68k_speed) { - currprefs.m68k_speed = changed_prefs.m68k_speed; - reset_frame_rate_hack (); - update_68k_cycles (); - } -} -*/ - void init_m68k (void) { int i; @@ -250,6 +235,7 @@ void init_m68k (void) build_cpufunctbl (); } + struct regstruct regs, lastint_regs; static struct regstruct regs_backup[16]; static int backup_pointer = 0; @@ -323,8 +309,7 @@ uae_s32 ShowEA (FILE *f, int reg, amodes sprintf (buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), - disp,outer, - (unsigned long)addr); + (long)disp, (long)outer, (unsigned long)addr); } else { addr = m68k_areg(regs,reg) + (uae_s32)((uae_s8)disp8) + dispreg; sprintf (buffer,"(A%d, %c%d.%c*%d, $%02x) == $%08lx", reg, @@ -370,8 +355,7 @@ uae_s32 ShowEA (FILE *f, int reg, amodes sprintf (buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), - disp,outer, - (unsigned long)addr); + (long)disp, (long)outer, (unsigned long)addr); } else { addr += (uae_s32)((uae_s8)disp8) + dispreg; sprintf (buffer,"(PC, %c%d.%c*%d, $%02x) == $%08lx", dp & 0x8000 ? 'A' : 'D', @@ -445,7 +429,7 @@ static int verify_ea (int reg, amodes mo int r; uae_u32 dispreg; uaecptr addr; - uae_s32 offset = 0; + /*uae_s32 offset = 0;*/ switch (mode){ case Dreg: @@ -681,15 +665,31 @@ void MakeFromSR (void) if (regs.t1 || regs.t0) set_special (SPCFLAG_TRACE); else - unset_special (SPCFLAG_TRACE | SPCFLAG_DOTRACE); + /* Keep SPCFLAG_DOTRACE, we still want a trace exception for + SR-modifying instructions (including STOP). */ + unset_special (SPCFLAG_TRACE); } + void Exception(int nr, uaecptr oldpc) { uae_u32 currpc = m68k_getpc (); /*if( nr>=2 && nr<10 ) fprintf(stderr,"Exception (-> %i bombs)!\n",nr);*/ + /* Intercept exceptions... - FIXME: Find a better way to do this! */ + if(bUseVDIRes && nr == 0x22) /* Trap 2 - intercept VDI call */ + { + if(!VDI()) + { + /* 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; + } + } + compiler_flush_jsr_stack(); MakeSR(); @@ -732,30 +732,48 @@ void Exception(int nr, uaecptr oldpc) m68k_areg(regs, 7) -= 2; put_word (m68k_areg(regs, 7), nr * 4); } - } else { - if (nr == 2 || nr == 3) { - /*crashtrace=4;*/ - /*sleep(1);*/ - m68k_areg(regs, 7) -= 12; - /* ??????? */ - if (nr == 3) { - put_long (m68k_areg(regs, 7), last_fault_for_exception_3); - put_word (m68k_areg(regs, 7)+4, last_op_for_exception_3); - put_long (m68k_areg(regs, 7)+8, last_addr_for_exception_3); - } - /*write_log ("UAE CPU Exception.\n");*/ - goto kludge_me_do; - } } + + /* Push PC on stack: */ m68k_areg(regs, 7) -= 4; put_long (m68k_areg(regs, 7), currpc); -kludge_me_do: + /* Push SR on stack: */ m68k_areg(regs, 7) -= 2; put_word (m68k_areg(regs, 7), regs.sr); + + /* 68000 bus/address errors: */ + if (cpu_level==0 && (nr==2 || nr==3)) { + m68k_areg(regs, 7) -= 8; + if (nr == 3) { /* Address error */ + put_word (m68k_areg(regs, 7), regs.sr); /*?*/ + 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 ) { + fprintf(stderr,"Address Error at address $%x, PC=$%x\n",last_fault_for_exception_3,currpc); + DebugUI(); + } + } + else { /* Bus error */ + put_word (m68k_areg(regs, 7), regs.sr); /*?*/ + put_long (m68k_areg(regs, 7)+2, BusAddressLocation); + put_word (m68k_areg(regs, 7)+6, get_word(currpc)); + if( bEnableDebug && BusAddressLocation!=0xff8a00) { + fprintf(stderr,"Bus Error at address $%lx, PC=$%lx\n",BusAddressLocation,(long)currpc); + DebugUI(); + } + } + } + m68k_setpc (get_long (regs.vbr + 4*nr)); fill_prefetch_0 (); regs.t1 = regs.t0 = regs.m = 0; unset_special (SPCFLAG_TRACE | SPCFLAG_DOTRACE); + + /* Store a backup of the PC after bus-/address error: */ + if(nr==2 || nr==3) { + busAddressErrPC = regs.pc; + } } static void Interrupt(int nr) @@ -769,7 +787,7 @@ static void Interrupt(int nr) set_special (SPCFLAG_INT); } -static uae_u32 caar, cacr, itt0, itt1, dtt0, dtt1, tc, mmusr; +static uae_u32 caar, cacr, itt0, itt1, dtt0, dtt1, tc, mmusr, urp, srp; int m68k_move2c (int regno, uae_u32 *regp) { @@ -796,6 +814,9 @@ int m68k_move2c (int regno, uae_u32 *reg case 0x802: caar = *regp & 0xfc; 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; + case 0x806: urp = *regp; break; + case 0x807: srp = *regp; break; default: op_illg (0x4E7B); return 0; @@ -828,6 +849,8 @@ int m68k_movec2 (int regno, uae_u32 *reg 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; + case 0x806: *regp = urp; break; + case 0x807: *regp = srp; break; default: op_illg (0x4E7A); return 0; @@ -1087,15 +1110,16 @@ void m68k_mull (uae_u32 opcode, uae_u32 } #endif } + static char* ccnames[] = { "T ","F ","HI","LS","CC","CS","NE","EQ", "VC","VS","PL","MI","GE","LT","GT","LE" }; void m68k_reset (void) { - m68k_areg (regs, 7) = get_long (ROMmem_start); - m68k_setpc (get_long (ROMmem_start+4)); - fill_prefetch_0 (); + m68k_areg(regs, 7) = get_long(0); + m68k_setpc(get_long(4)); + refill_prefetch (m68k_getpc (), 0); regs.s = 1; regs.m = 0; regs.stopped = 0; @@ -1115,66 +1139,26 @@ void m68k_reset (void) unsigned long REGPARAM2 op_illg (uae_u32 opcode) { uaecptr pc = m68k_getpc (); -/* - if (cloanto_rom && (opcode & 0xF100) == 0x7100) { - m68k_dreg (regs, (opcode >> 9) & 7) = (uae_s8)(opcode & 0xFF); - m68k_incpc (2); - fill_prefetch_0 (); - return 4; - } -*/ + compiler_flush_jsr_stack (); - if (opcode == 0x4E7B && get_long (0x10) == 0 ) - { + if (opcode == 0x4E7B && get_long (0x10) == 0 ) { write_log ("This program requires a 68020 CPU!\n"); broken_in = 1; set_special (SPCFLAG_BRK); - quit_program = 1; - } -/* - if (opcode == 0xFF0D) { - if ((pc & 0xF80000) == 0xF80000) { - // This is from the dummy Kickstart replacement - uae_u16 arg = get_iword (2); - m68k_incpc (4); - ersatz_perform (arg); - fill_prefetch_0 (); - return 4; - } else if ((pc & 0xF80000) == 0xF00000) { - // User-mode STOP replacement - m68k_setstopped (1); - return 4; - } - } -*/ -/* - if ((opcode & 0xF000) == 0xA000 && (pc & 0xF80000) == 0xF00000) { - // Calltrap. - m68k_incpc(2); - call_calltrap (opcode & 0xFFF); - fill_prefetch_0 (); - return 4; + bQuitProgram = 1; } -*/ - if ((opcode & 0xF000) == 0xF000) - { + + if ((opcode & 0xF000) == 0xF000) { Exception(0xB,0); return 4; - } - if ((opcode & 0xF000) == 0xA000) - { -/* - if ((pc & 0xF80000) == 0xF00000) { - // Calltrap. - call_calltrap (opcode & 0xFFF); - } -*/ + } + if ((opcode & 0xF000) == 0xA000) { Exception(0xA,0); return 4; - } + } -#if 1 - write_log ("Illegal instruction: %04x at %08lx\n", opcode, pc); +#if 0 + write_log ("Illegal instruction: %04x at %08lx\n", opcode, (long)pc); #endif Exception (4,0); return 4; @@ -1239,10 +1223,13 @@ static int do_specialties (void) Exception (9,last_trace_ad); } while (regs.spcflags & SPCFLAG_STOP) { - do_cycles (4); - /*if (regs.spcflags & SPCFLAG_COPPER) - do_copper ();*/ - if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)){ + do_cycles (8); + if (regs.intmask>5) { + /* We still have to care about events when IPL==7 ! */ + Main_EventHandler(); + if(bQuitProgram) unset_special(SPCFLAG_STOP); + } + if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)) { int intr = intlev (); unset_special (SPCFLAG_INT | SPCFLAG_DOINT); if (intr != -1 && intr > regs.intmask) { @@ -1274,6 +1261,7 @@ static int do_specialties (void) return 0; } + /* It's really sad to have two almost identical functions for this, but we do it all for performance... :( */ static void m68k_run_1 (void) @@ -1282,7 +1270,7 @@ static void m68k_run_1 (void) uae_u8 saved_bytes[20]; uae_u16 *oldpcp; #endif - while(!quit_program) { + while(!bQuitProgram) { int cycles; uae_u32 opcode = get_iword_prefetch (0); #ifdef DEBUG_PREFETCH @@ -1296,8 +1284,7 @@ static void m68k_run_1 (void) #endif /*m68k_dumpstate(stderr, NULL);*/ - m68k_disasm(stderr, m68k_getpc (), NULL, 1); - /*if( opcode == 0 ) sleep(1);*/ + /*m68k_disasm(stderr, m68k_getpc (), NULL, 1);*/ /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ /* regs_backup[backup_pointer = (backup_pointer + 1) % 16] = regs;*/ @@ -1308,7 +1295,16 @@ static void m68k_run_1 (void) instrcount[opcode]++; #endif - cycles = (*cpufunctbl[cft_map(opcode)])(opcode); + cycles = (*cpufunctbl[opcode])(opcode); + + /* Unfortunately needed at the moment: */ + /* Check if we had an bus/address error and correct the PC then... */ + if(busAddressErrPC) { + /*write_log("Fixed PC to $%x instead of $%x after bus-/address error!\n", + busAddressErrPC, m68k_getpc());*/ + m68k_setpc(busAddressErrPC); + busAddressErrPC = 0; + } #ifdef DEBUG_PREFETCH if (memcmp (saved_bytes, oldpcp, 20) != 0) { @@ -1326,23 +1322,16 @@ static void m68k_run_1 (void) } } -#define DEBUG_PREFETCH /* Same thing, but don't use prefetch to get opcode. */ static void m68k_run_2 (void) { - while(!quit_program) { + while(!bQuitProgram) { int cycles; -#ifdef HAVE_GET_WORD_UNSWAPPED - uae_u32 opcode = do_get_mem_word_unswapped (regs.pc_p); -#else uae_u32 opcode = get_iword (0); -#endif /*m68k_dumpstate(stderr, NULL);*/ - /*if(crashtrace) - { --crashtrace ; m68k_disasm(stderr, m68k_getpc (), NULL, 1); }*/ - /*if( opcode == 0 ) sleep(1); */ + /*m68k_disasm(stderr, m68k_getpc (), NULL, 1);*/ /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ /* regs_backup[backup_pointer = (backup_pointer + 1) % 16] = regs;*/ @@ -1353,7 +1342,16 @@ static void m68k_run_2 (void) instrcount[opcode]++; #endif - cycles = (*cpufunctbl[cft_map(opcode)])(opcode); + cycles = (*cpufunctbl[opcode])(opcode); + + /* Unfortunately needed at the moment: */ + /* Check if we had an bus/address error and correct the PC then... */ + if(busAddressErrPC) { + /*write_log("Fixed PC to $%x instead of $%x after bus-/address error!\n", + busAddressErrPC, m68k_getpc());*/ + m68k_setpc(busAddressErrPC); + busAddressErrPC = 0; + } do_cycles (cycles); if (regs.spcflags) { @@ -1374,21 +1372,7 @@ void m68k_go (int may_quit) } in_m68k_go++; - while(!quit_program) { -/* - if (quit_program > 0) { - if (quit_program == 1) - break; - quit_program = 0; - m68k_reset (); - //reset_all_systems (); - customreset (); - } -*/ -/* - if (debugging) - debug (); -*/ + while(!bQuitProgram) { if(cpu_compatible) m68k_run_1(); else @@ -1406,7 +1390,7 @@ static void m68k_verify (uaecptr addr, u last_op_for_exception_3 = opcode; m68kpc_offset = 2; - if (cpufunctbl[cft_map(opcode)] == op_illg_1) { + if (cpufunctbl[opcode] == op_illg_1) { opcode = 0x4AFC; } dp = table68k + opcode; @@ -1441,7 +1425,7 @@ void m68k_disasm (FILE *f, uaecptr addr, } opcode = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; - if (cpufunctbl[cft_map(opcode)] == op_illg_1) { + if (cpufunctbl[opcode] == op_illg_1) { opcode = 0x4AFC; } dp = table68k + opcode; @@ -1473,11 +1457,11 @@ void m68k_disasm (FILE *f, uaecptr addr, } if (ccpt != 0) { if (cctrue(dp->cc)) - fprintf (f, " == %08lx (TRUE)", newpc); + fprintf (f, " == %08lx (TRUE)", (long)newpc); else - fprintf (f, " == %08lx (FALSE)", newpc); + fprintf (f, " == %08lx (FALSE)", (long)newpc); } else if ((opcode & 0xff00) == 0x6100) /* BSR */ - fprintf (f, " == %08lx", newpc); + fprintf (f, " == %08lx", (long)newpc); fprintf (f, "\n"); } if (nextpc) @@ -1488,18 +1472,18 @@ void m68k_dumpstate (FILE *f, uaecptr *n { int i; for (i = 0; i < 8; i++){ - fprintf (f, "D%d: %08lx ", i, m68k_dreg(regs, i)); + fprintf (f, "D%d: %08lx ", i, (long)m68k_dreg(regs, i)); if ((i & 3) == 3) fprintf (f, "\n"); } for (i = 0; i < 8; i++){ - fprintf (f, "A%d: %08lx ", i, m68k_areg(regs, i)); + fprintf (f, "A%d: %08lx ", i, (long)m68k_areg(regs, i)); if ((i & 3) == 3) fprintf (f, "\n"); } if (regs.s == 0) regs.usp = m68k_areg(regs, 7); if (regs.s && regs.m) regs.msp = m68k_areg(regs, 7); if (regs.s && regs.m == 0) regs.isp = m68k_areg(regs, 7); fprintf (f, "USP=%08lx ISP=%08lx MSP=%08lx VBR=%08lx\n", - regs.usp,regs.isp,regs.msp,regs.vbr); + (long)regs.usp,(long)regs.isp,(long)regs.msp,(long)regs.vbr); fprintf (f, "T=%d%d S=%d M=%d X=%d N=%d Z=%d V=%d C=%d IMASK=%d\n", regs.t1, regs.t0, regs.s, regs.m, GET_XFLG, GET_NFLG, GET_ZFLG, GET_VFLG, GET_CFLG, regs.intmask); @@ -1517,5 +1501,5 @@ void m68k_dumpstate (FILE *f, uaecptr *n m68k_disasm (f, m68k_getpc (), nextpc, 1); if (nextpc) - fprintf (f, "next PC: %08lx\n", *nextpc); + fprintf (f, "next PC: %08lx\n", (long)*nextpc); }