--- hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:09:47 1.1.1.3 +++ hatari/src/uae-cpu/hatari-glue.c 2019/04/01 07:10:40 1.1.1.6 @@ -1,3 +1,14 @@ +/* + 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 contains some code to glue the UAE CPU core to the rest of the + emulator and Hatari's "illegal" opcodes. +*/ +static char rcsid[] = "Hatari $Id: hatari-glue.c,v 1.1.1.6 2019/04/01 07:10:40 root Exp $"; + #include @@ -6,14 +17,12 @@ #include "../includes/tos.h" #include "../includes/gemdos.h" #include "../includes/cart.h" +#include "../includes/vdi.h" +#include "../includes/stMemory.h" -#ifndef UAESYSDEPS #include "sysdeps.h" -#endif -#ifndef UAEMEMORY -#include "memory.h" -#endif #include "maccess.h" +#include "memory.h" #include "newcpu.h" #ifndef FALSE @@ -23,45 +32,43 @@ int illegal_mem = FALSE; -int address_space_24 = 1; +int address_space_24 = TRUE; int cpu_level = 0; /* 68000 (default) */ -int cpu_compatible = 0; +int cpu_compatible = FALSE; -long STmem_size = 0x100000; /* 1MB */ +int requestedInterrupt = -1; + +long STmem_size = 0x400000; /* 4MB */ long TTmem_size = 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); + requestedInterrupt = -1; } -/* Initialize 680x0 emulation, CheckROM() must have been called first */ +/* Return interrupt number (1 - 7), -1 means no interrupt. */ +int intlev(void) +{ + int ret = requestedInterrupt; + requestedInterrupt = -1; + + return ret; +} + + +/* 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)); + memory_init(); - init_m68k(); + init_m68k(); #ifdef USE_COMPILER - compiler_init(); + compiler_init(); #endif - return TRUE; + return TRUE; } @@ -74,29 +81,47 @@ void Exit680x0(void) /* 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; + build_cpufunctbl (); + } } + /* ----------------------------------------------------------------------- */ /* - We use an illegal opcode to set ConnectedDrives, as TOS clears this - value we cannot set it on init. + We use an illegal opcode to set ConnectedDrives, as TOS (or an HD driver) + alters this value we cannot set it on init. + This opcode replaces the RTS at the end of the DMA bus boot routine */ unsigned long OpCode_ConnectedDrive(uae_u32 opcode) { - /*fprintf(stderr, "OpCode_ConnectedDrive handled\n");*/ - /* Set connected drives */ - STMemory_WriteWord(0x4c2, ConnectedDriveMask); - m68k_incpc(2); - fill_prefetch_0(); - return 4; + fprintf(stderr, "OpCode_ConnectedDrive handled (%x)\n",ConnectedDriveMask ); + /* Set connected drives */ + STMemory_WriteLong(0x4c2, ConnectedDriveMask); + /* do an RTS (the opcode we replaced) */ + m68k_setpc(longget(m68k_areg(regs, 7))); + m68k_areg(regs, 7) += 4; + + fill_prefetch_0(); + return 4; } + /* ----------------------------------------------------------------------- */ /* - Re-direct execution to old GEM calls, used in 'cart.s' + Re-direct execution to old GEMDOS calls, used in 'cart.s' */ unsigned long OpCode_OldGemDos(uae_u32 opcode) { @@ -105,6 +130,7 @@ unsigned long OpCode_OldGemDos(uae_u32 o return 4; } + /* ----------------------------------------------------------------------- */ /* Intercept GEMDOS calls (setup vector $84) @@ -116,17 +142,28 @@ unsigned long OpCode_OldGemDos(uae_u32 o */ unsigned long OpCode_GemDos(uae_u32 opcode) { - - if(!bInitGemDOS) - GemDOS_Boot(); /* Init on boot - see cartimg.c */ - else + if(!bInitGemDOS) + { + /* Init on boot - see cartimg.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(); + } + else + { GemDOS_OpCode(); /* handler code in gemdos.c */ + } - m68k_incpc(2); - fill_prefetch_0(); - return 4; + m68k_incpc(2); + fill_prefetch_0(); + return 4; } + /* ----------------------------------------------------------------------- */ /* Modify TimerD in GEMDos to gain more desktop performance @@ -140,11 +177,27 @@ unsigned long OpCode_GemDos(uae_u32 opco */ unsigned long OpCode_TimerD(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); - fill_prefetch_0(); - return 4; + /*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); + 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; }