--- hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:09:16 1.1 +++ hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:11:55 1.1.1.9 @@ -1,13 +1,30 @@ +/* + Hatari - hatari-glue.c -#include + 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 "newcpu.h" + This file contains some code to glue the UAE CPU core to the rest of the + emulator and Hatari's "illegal" opcodes. +*/ +char HatariGlue_rcsid[] = "Hatari $Id: hatari-glue.c,v 1.1.1.9 2019/04/01 07:11:55 root Exp $"; + + +#include #include "../includes/main.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 "sysdeps.h" +#include "maccess.h" +#include "memory.h" +#include "newcpu.h" +#include "hatari-glue.h" #ifndef FALSE #define FALSE 0 @@ -15,100 +32,146 @@ #endif -int illegal_mem = FALSE; -int address_space_24 = 1; +int illegal_mem = TRUE; +int address_space_24 = TRUE; int cpu_level = 0; /* 68000 (default) */ -int cpu_compatible = 0; -int m68k_speed = 0; +int cpu_compatible = FALSE; -long STmem_size = 0x100000; /* 1MB */ -long TTmem_size = 0; +int pendingInterrupts = 0; /* 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 - - // 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); + pendingInterrupts = 0; } -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) +{ + /* 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)); - - init_m68k(); -#ifdef USE_COMPILER - compiler_init(); -#endif - return TRUE; + /* Note: memory_init() is now done in tos.c */ + + init_m68k(); + return TRUE; } /* Deinitialize 680x0 emulation */ void Exit680x0(void) { + memory_uninit(); + + free(table68k); + table68k = NULL; } /* Reset and start 680x0 emulation */ void Start680x0(void) { - m68k_reset(); - m68k_go(TRUE); + m68k_reset(); + m68k_go(TRUE); +} + + +/* Check if the CPU type has been changed */ +void check_prefs_changed_cpu(int new_level, int new_compatible) +{ + if(cpu_level!=new_level || cpu_compatible!=new_compatible) + { + cpu_level = new_level; + cpu_compatible = new_compatible; + set_special(SPCFLAG_MODE_CHANGE); + if (table68k) + build_cpufunctbl (); + } } /* ----------------------------------------------------------------------- */ /* - We use an illegal opcode to set ConnectedDrives, as TOS clears this - value we cannot set it on init. + 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_ConnectedDrive(uae_u32 opcode) +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; + /* Initialize the connected drive mask */ + STMemory_WriteLong(0x4c2, ConnectedDriveMask); + + if(!bInitGemDOS) + { + /* Init on boot - see cart.c */ + GemDOS_Boot(); + + /* We use this to get pointer to Line-A structure details + * (to fix for extended VDI res) */ + LineABase = regs.regs[0]; /* D0 */ + FontBase = regs.regs[9]; /* A1 */ + VDI_LineA(); + } + + m68k_incpc(2); + fill_prefetch_0(); + return 4; } + /* ----------------------------------------------------------------------- */ /* - Modify TimerD in GEMDos to gain more desktop performance + Intercept GEMDOS calls - 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 + Used for GEMDOS HD emulation (see gemdos.c). */ -unsigned long OpCode_TimerD(uae_u32 opcode) +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; }