--- hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:14:56 1.1.1.12 +++ hatari/src/uae-cpu/hatari-glue.c 2019/04/09 08:55:50 1.1.1.20 @@ -1,173 +1,254 @@ /* Hatari - hatari-glue.c - 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. This file contains some code to glue the UAE CPU core to the rest of the emulator and Hatari's "illegal" opcodes. */ -const char HatariGlue_rcsid[] = "Hatari $Id: hatari-glue.c,v 1.1.1.12 2019/04/01 07:14:56 root Exp $"; +const char HatariGlue_fileid[] = "Hatari hatari-glue.c : " __DATE__ " " __TIME__; #include -#include "../includes/main.h" -#include "../includes/configuration.h" -#include "../includes/int.h" -#include "../includes/tos.h" -#include "../includes/gemdos.h" -#include "../includes/cart.h" -#include "../includes/vdi.h" -#include "../includes/stMemory.h" -#include "../includes/ikbd.h" +#include "main.h" +#include "configuration.h" +#include "cycInt.h" +#include "tos.h" +#include "gemdos.h" +#include "natfeats.h" +#include "cart.h" +#include "vdi.h" +#include "stMemory.h" +#include "ikbd.h" +#include "screen.h" +#include "video.h" +#include "psg.h" +#include "mfp.h" +#include "fdc.h" #include "sysdeps.h" #include "maccess.h" #include "memory.h" +#include "m68000.h" #include "newcpu.h" #include "hatari-glue.h" -#ifndef FALSE -#define FALSE 0 -#define TRUE 1 -#endif - struct uae_prefs currprefs, changed_prefs; int pendingInterrupts = 0; -/* Reset custom chips */ +/** + * Reset custom chips + * In case the RESET instruction is called, we must reset all the peripherals + * connected to the CPU's reset pin. + */ void customreset(void) { - pendingInterrupts = 0; + pendingInterrupts = 0; + + /* Reset the IKBD */ + IKBD_Reset ( false ); + + /* Reseting the GLUE video chip should also set freq/res register to 0 */ + Video_Reset_Glue (); + + /* Reset the YM2149 (stop any sound) */ + PSG_Reset (); + + /* Reset the MFP */ + MFP_Reset (); - /* In case the 6301 was executing a custom program from its RAM */ - /* we must turn it back to the 'normal' mode. */ - IKBD_Reset_ExeMode (); + /* Reset the FDC */ + FDC_Reset ( false ); } -/* Return interrupt number (1 - 7), -1 means no interrupt. +/** + * Return interrupt number (1 - 7), -1 means no interrupt. * Note that the interrupt stays pending if it can't be executed yet - * due to the interrupt level field in the SR. */ + * due to the interrupt level field in the SR. + */ int intlev(void) { - /* There are only VBL and HBL autovector interrupts in the ST... */ - assert((pendingInterrupts & ~((1<<4)|(1<<2))) == 0); + /* There are only VBL and HBL autovector interrupts in the ST... */ + assert((pendingInterrupts & ~((1<<4)|(1<<2))) == 0); - if(pendingInterrupts & (1 << 4)) /* VBL interrupt? */ - { - if(regs.intmask < 4) - pendingInterrupts &= ~(1 << 4); - return 4; - } - else if(pendingInterrupts & (1 << 2)) /* HBL interrupt? */ - { - if(regs.intmask < 2) - pendingInterrupts &= ~(1 << 2); - return 2; - } +#if 0 + if (pendingInterrupts & (1 << 4)) /* VBL interrupt? */ + { + if (regs.intmask < 4) + pendingInterrupts &= ~(1 << 4); + return 4; + } + else if (pendingInterrupts & (1 << 2)) /* HBL interrupt? */ + { + if (regs.intmask < 2) + pendingInterrupts &= ~(1 << 2); + return 2; + } +#else + if ( pendingInterrupts & (1 << 4) ) /* VBL interrupt ? */ + return 4; + else if ( pendingInterrupts & (1 << 2) ) /* HBL interrupt ? */ + return 2; +#endif - return -1; + return -1; } -/* Initialize 680x0 emulation */ +/** + * Initialize 680x0 emulation + */ int Init680x0(void) { - currprefs.cpu_level = changed_prefs.cpu_level = ConfigureParams.System.nCpuLevel; - currprefs.cpu_compatible = changed_prefs.cpu_compatible = ConfigureParams.System.bCompatibleCpu; - currprefs.address_space_24 = changed_prefs.address_space_24 = TRUE; + currprefs.cpu_level = changed_prefs.cpu_level = ConfigureParams.System.nCpuLevel; + currprefs.cpu_compatible = changed_prefs.cpu_compatible = ConfigureParams.System.bCompatibleCpu; + currprefs.address_space_24 = changed_prefs.address_space_24 = true; + + init_m68k(); - init_m68k(); - return TRUE; + return true; } -/* Deinitialize 680x0 emulation */ +/** + * Deinitialize 680x0 emulation + */ void Exit680x0(void) { - memory_uninit(); + memory_uninit(); - free(table68k); - table68k = NULL; + free(table68k); + table68k = NULL; } -/* Check if the CPU type has been changed */ -void check_prefs_changed_cpu(void) +/** + * Execute a 'NOP' opcode (increment PC by 2 bytes and take care + * of prefetch at the CPU level depending on the current CPU mode) + * This is used to return from Gemdos / Natfeats interception, by ignoring + * the intercepted opcode and executing a NOP instead once the work has been done. + */ +static void CpuDoNOP ( 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; - set_special(SPCFLAG_MODE_CHANGE); - build_cpufunctbl (); - } + (*cpufunctbl[0X4E71])(0x4E71); } -/* ----------------------------------------------------------------------- */ -/* - This function will be called at system init by the cartridge routine - (after gemdos init, before booting floppies). - - The GEMDOS vector (#$84) is setup and we also initialize the connected - drive mask and Line-A variables (for an extended VDI resolution) from here. -*/ -unsigned long OpCode_SysInit(uae_u32 opcode) +/** + * Check if the CPU type has been changed + */ +void check_prefs_changed_cpu(void) { - /* Initialize the connected drive mask */ - STMemory_WriteLong(0x4c2, ConnectedDriveMask); - - if(!bInitGemDOS) - { - /* Init on boot - see cart.c */ - GemDOS_Boot(); + 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; + set_special(SPCFLAG_MODE_CHANGE); + build_cpufunctbl (); + } +} - /* Update LineA for extended VDI res - * D0: LineA base, A1: Font base - */ - VDI_LineA(regs.regs[0], regs.regs[9]); - } - m68k_incpc(2); - fill_prefetch_0(); - return 4; +/** + * This function will be called at system init by the cartridge routine + * (after gemdos init, before booting floppies). + * The GEMDOS vector (#$84) is setup and we also initialize the connected + * drive mask and Line-A variables (for an extended VDI resolution) from here. + */ +unsigned long OpCode_SysInit(uae_u32 opcode) +{ + /* Add any drives mapped by TOS in the interim */ + ConnectedDriveMask |= STMemory_ReadLong(0x4c2); + /* Initialize the connected drive mask */ + STMemory_WriteLong(0x4c2, ConnectedDriveMask); + + if (!bInitGemDOS) + { + /* Init on boot - see cart.c */ + GemDOS_Boot(); + + /* Update LineA for extended VDI res + * D0: LineA base, A1: Font base + */ + VDI_LineA(regs.regs[0], regs.regs[9]); + } + + CpuDoNOP (); + return 4; } -/* ----------------------------------------------------------------------- */ -/* - Intercept GEMDOS calls - - Used for GEMDOS HD emulation (see gemdos.c). -*/ +/** + * Intercept GEMDOS calls. + * Used for GEMDOS HD emulation (see gemdos.c). + */ unsigned long OpCode_GemDos(uae_u32 opcode) { - GemDOS_OpCode(); /* handler code in gemdos.c */ + GemDOS_OpCode(); /* handler code in gemdos.c */ - m68k_incpc(2); - fill_prefetch_0(); - return 4; + CpuDoNOP (); + return 4; } -/*-----------------------------------------------------------------------*/ -/* - This is called after completion of each VDI call -*/ +/** + * This is called after completion of each VDI call + */ unsigned long OpCode_VDI(uae_u32 opcode) { - VDI_Complete(); + Uint32 pc = M68000_GetPC(); + + /* this is valid only after VDI trap, called from cartridge code */ + if (VDI_OldPC && pc >= 0xfa0000 && pc < 0xfc0000) + { + VDI_Complete(); + + /* Set PC back to where originated from to continue instruction decoding */ + m68k_setpc(VDI_OldPC); + VDI_OldPC = 0; + } + else + { + /* illegal instruction */ + op_illg(opcode); + } + fill_prefetch_0(); + return 4; +} - /* Set PC back to where originated from to continue instruction decoding */ - m68k_setpc(VDI_OldPC); - fill_prefetch_0(); - return 4; +/** + * Emulator Native Features ID opcode interception. + */ +unsigned long OpCode_NatFeat_ID(uae_u32 opcode) +{ + Uint32 stack = Regs[REG_A7] + SIZE_LONG; /* skip return address */ + + if (NatFeat_ID(stack, &(Regs[REG_D0]))) { + CpuDoNOP (); + } + return 4; +} + +/** + * Emulator Native Features call opcode interception. + */ +unsigned long OpCode_NatFeat_Call(uae_u32 opcode) +{ + Uint32 stack = Regs[REG_A7] + SIZE_LONG; /* skip return address */ + Uint16 SR = M68000_GetSR(); + bool super; + + super = ((SR & SR_SUPERMODE) == SR_SUPERMODE); + if (NatFeat_Call(stack, super, &(Regs[REG_D0]))) { + CpuDoNOP (); + } + return 4; }