--- hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:09:16 1.1.1.1 +++ hatari/src/uae-cpu/hatari-glue.c 2019/04/09 08:49:40 1.1.1.16 @@ -1,114 +1,181 @@ +/* + Hatari - hatari-glue.c -#include - -#include "newcpu.h" + 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. -#include "../includes/main.h" -#include "../includes/int.h" -#include "../includes/tos.h" + 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_fileid[] = "Hatari hatari-glue.c : " __DATE__ " " __TIME__; +#include -#ifndef FALSE -#define FALSE 0 -#define TRUE 1 -#endif +#include "main.h" +#include "configuration.h" +#include "cycInt.h" +#include "tos.h" +#include "gemdos.h" +#include "cart.h" +#include "vdi.h" +#include "stMemory.h" +#include "ikbd.h" +#include "screen.h" +#include "video.h" + +#include "sysdeps.h" +#include "maccess.h" +#include "memory.h" +#include "newcpu.h" +#include "hatari-glue.h" -int illegal_mem = FALSE; -int address_space_24 = 1; -int cpu_level = 0; /* 68000 (default) */ -int cpu_compatible = 0; -int m68k_speed = 0; +struct uae_prefs currprefs, changed_prefs; -long STmem_size = 0x100000; /* 1MB */ -long TTmem_size = 0; +int pendingInterrupts = 0; -/* Reset custom chips */ +/** + * Reset custom chips + */ void customreset(void) { - /* Taken from Reset_ST in reset.c: */ - Int_Reset(); // Reset interrupts - MFP_Reset(); // Setup MFP chip - Video_Reset(); // Reset video - PSG_Reset(); // Reset PSG - Sound_Reset(); // Reset Sound - IKBD_Reset(FALSE); // Keyboard - Screen_Reset(); // Reset screen + pendingInterrupts = 0; - // And VBL interrupt, MUST always be one interrupt ready to trigger - Int_AddAbsoluteInterrupt(CYCLES_ENDLINE,INTERRUPT_VIDEO_ENDLINE); - Int_AddAbsoluteInterrupt(CYCLES_HBL,INTERRUPT_VIDEO_HBL); - Int_AddAbsoluteInterrupt(CYCLES_PER_FRAME,INTERRUPT_VIDEO_VBL); + /* In case the 6301 was executing a custom program from its RAM */ + /* we must turn it back to the 'normal' mode. */ + IKBD_Reset_ExeMode (); + + /* Reseting the GLUE video chip should also set freq/res register to 0 */ + Video_Reset_Glue (); } -int intlev (void) /* ??? */ + +/** + * 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. + */ +int intlev(void) { - return -1; + /* 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; + } + + return -1; } -/* Initialize 680x0 emulation, CheckROM() must have been called first */ +/** + * Initialize 680x0 emulation + */ int Init680x0(void) { - memory_init(); -fprintf(stderr, "TOS version: %x.%x\n", STMemory_ReadByte(2), STMemory_ReadByte(3)); -fprintf(stderr, "PC start: $%lx\n", STMemory_ReadLong(4)); + 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(); -#ifdef USE_COMPILER - compiler_init(); -#endif - return TRUE; + init_m68k(); + + return true; } -/* Deinitialize 680x0 emulation */ +/** + * Deinitialize 680x0 emulation + */ void Exit680x0(void) { + memory_uninit(); + + free(table68k); + table68k = NULL; } -/* Reset and start 680x0 emulation */ -void Start680x0(void) +/** + * Check if the CPU type has been changed + */ +void check_prefs_changed_cpu(void) { - m68k_reset(); - m68k_go(TRUE); + 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 (); + } } -/* ----------------------------------------------------------------------- */ -/* - We use an illegal opcode to set ConnectedDrives, as TOS clears this - value we cannot set it on init. -*/ -unsigned long OpCode_ConnectedDrive(uae_u32 opcode) +/** + * 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) { - fprintf(stderr, "OpCode_ConnectedDrive handled\n"); - /* Set connected drives */ - STMemory_WriteWord(0x4c2, ConnectedDriveMask); - m68k_incpc(2); - return 2; + /* 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]); + } + + m68k_incpc(2); + fill_prefetch_0(); + return 4; } -/* ----------------------------------------------------------------------- */ -/* - Modify TimerD in GEMDos to gain more desktop performance - Obviously, we need to emulate all timers correctly but GemDOS set's up Timer D at a very - high rate(every couple of instructions). The interrupts isn't enabled but WinSTon still - needs to process the interrupt table and this HALVES our frame rate!!! (It causes a cache - reload each time). Some games actually reference this timer but don't set it up(eg Paradroid, - Speedball I) so we simply intercept the Timer D setup code in GemDOS and fix the numbers - with more 'laid-back' values. This still keeps 100% compatibility -*/ -unsigned long OpCode_TimerD(uae_u32 opcode) +/** + * Intercept GEMDOS calls. + * Used for GEMDOS HD emulation (see gemdos.c). + */ +unsigned long OpCode_GemDos(uae_u32 opcode) { - fprintf(stderr, "OpCode_TimerD handled\n"); - m68k_dreg(regs,0)=3; /* 3 = Select Timer D */ - m68k_dreg(regs,1)=7; /* 1 = /4 for 9600 baud(used /200) */ - m68k_dreg(regs,2)=100; /* 2 = 9600 baud(100) */ - m68k_incpc(2); - return 2; + GemDOS_OpCode(); /* handler code in gemdos.c */ + + m68k_incpc(2); + fill_prefetch_0(); + return 4; +} + + +/** + * This is called after completion of each VDI call + */ +unsigned long OpCode_VDI(uae_u32 opcode) +{ + VDI_Complete(); + + /* Set PC back to where originated from to continue instruction decoding */ + m68k_setpc(VDI_OldPC); + + fill_prefetch_0(); + return 4; }