diff -r 87990958bdea src/configuration.c --- a/src/configuration.c Tue Jan 13 23:42:16 2009 +0200 +++ b/src/configuration.c Fri Jan 16 12:14:16 2009 +0100 @@ -520,22 +520,13 @@ Audio_SetOutputAudioFreq(ConfigureParams.Sound.nPlaybackQuality); } /* CPU settings */ - if (ConfigureParams.System.nCpuFreq < 12) - { - ConfigureParams.System.nCpuFreq = 8; - nCpuFreqShift = 0; - } - else if (ConfigureParams.System.nCpuFreq > 26) - { - ConfigureParams.System.nCpuFreq = 32; - nCpuFreqShift = 2; - } - else - { - ConfigureParams.System.nCpuFreq = 16; - nCpuFreqShift = 1; - } - /* Change UAE cpu_level and cpu_compatible accordingly */ + nCpuFreqShift = log2(ConfigureParams.System.nCpuFreq) - 3; + if(nCpuFreqShift<0 || nCpuFreqShift>6) + nCpuFreqShift = 0; + ConfigureParams.System.nCpuFreq = 8< #include @@ -39,13 +39,13 @@ #define NON_PRINT_CHAR '.' /* character to display for non-printables */ #define DISASM_INSTS 5 /* disasm - number of instructions */ +bool bDebugStep=FALSE; /* Are we single stepping the CPU? */ + static bool bMemDump; /* has memdump been called? */ static unsigned long memdump_addr; /* memdump address */ static unsigned long disasm_addr; /* disasm address */ static FILE *debugOutput; - - /*-----------------------------------------------------------------------*/ /** @@ -570,6 +570,7 @@ " l filename address - load a file into memory starting at address. \n" " s filename address length - dump length bytes from memory to a file. \n" " o [command line] - set Hatari command line options\n\n" + " i - step one instruction\n" " q - quit emulator\n" " c - continue emulation\n\n" " Adresses may be given as a range e.g. fc0000-fc0100\nAll values in hexadecimal.\n" @@ -684,6 +685,11 @@ DebugUI_SaveBin(input); break; + case 'i': + //DebugUI_Step(); + retval = DEBUG_STEP; + break; + default: if (command[0]) fprintf(stderr," Unknown command: '%s'\n", command); @@ -722,20 +728,38 @@ return retval; } - /*-----------------------------------------------------------------------*/ /** * Debug UI */ void DebugUI(void) { + int cmd; bMemDump = FALSE; disasm_addr = 0; - fprintf(stderr, "\nYou have entered debug mode. Type c to continue emulation, h for help." + if(bDebugStep) + { + uaecptr disasm_addr = M68000_GetPC(); + uaecptr nextpc; + m68k_disasm(debugOutput, (uaecptr)disasm_addr, &nextpc, 1); + } + else + { + fprintf(stderr, "\nYou have entered debug mode. Type c to continue emulation, h for help." "\n----------------------------------------------------------------------\n"); - while (DebugUI_GetCommand() != DEBUG_QUIT) - ; + } + + while ( (cmd=DebugUI_GetCommand()) != DEBUG_QUIT) + { + if(cmd == DEBUG_STEP) + { + fprintf(stderr,"Stepping...\n"); + bDebugStep=TRUE; + return; + } + } + bDebugStep=FALSE; fprintf(stderr,"Returning to emulation...\n------------------------------\n\n"); DebugUI_SetLogDefault(); } diff -r 87990958bdea src/gui-osx/SDLMain.nib/classes.nib --- a/src/gui-osx/SDLMain.nib/classes.nib Tue Jan 13 23:42:16 2009 +0200 +++ b/src/gui-osx/SDLMain.nib/classes.nib Fri Jan 16 12:14:16 2009 +0100 @@ -1,129 +1,263 @@ -{ - IBClasses = ( - { - ACTIONS = {createFloppyImage = id; runModal = id; }; - CLASS = CreateFloppyController; - LANGUAGE = ObjC; - OUTLETS = { - sectors = NSMatrix; - sides = NSMatrix; - tracks = NSPopUpButton; - window = NSWindow; - }; - SUPERCLASS = NSObject; - }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSPanel; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, - { - ACTIONS = { - changeViewedJoystick = id; - chooseCartridgeImage = id; - chooseDefaultImagesLocation = id; - chooseFloppyImageA = id; - chooseFloppyImageB = id; - chooseGemdosImage = id; - chooseHdImage = id; - chooseKeyboardMappingFile = id; - chooseMidiOutputFile = id; - choosePrintToFile = id; - chooseRS232InputFile = id; - chooseRS232OutputFile = id; - chooseTosImage = id; - commitAndClose = id; - ejectFloppyA = id; - ejectFloppyB = id; - ejectGemdosImage = id; - ejectHdImage = id; - loadConfigFrom = id; - loadPrefs = id; - myAction = id; - saveConfigAs = id; - updateEnabledStates = id; - }; - CLASS = PrefsController; - LANGUAGE = ObjC; - OUTLETS = { - autoInsertB = NSButton; - blitter = NSButton; - bootFromHD = NSButton; - captureOnChange = NSButton; - cartridgeImage = NSTextField; - colorDepth = NSMatrix; - compatibleCpu = NSButton; - cpuClock = NSMatrix; - cpuType = NSMatrix; - currentJoystick = NSPopUpButton; - defaultImagesLocation = NSTextField; - enableAutoFire = NSButton; - enableDSP = NSPopUpButton; - enableMidi = NSButton; - enablePrinter = NSButton; - enableRS232 = NSButton; - enableSound = NSButton; - floppyImageA = NSTextField; - floppyImageB = NSTextField; - force8bpp = NSButton; - frameSkip = NSPopUpButton; - gemdosImage = NSTextField; - hdImage = NSTextField; - joystickDown = NSPopUpButton; - joystickFire = NSPopUpButton; - joystickLeft = NSPopUpButton; - joystickMode = NSMatrix; - joystickRight = NSPopUpButton; - joystickUp = NSPopUpButton; - keyboardMapping = NSMatrix; - keyboardMappingFile = NSTextField; - machineType = NSMatrix; - monitor = NSMatrix; - patchTimerD = NSButton; - playbackQuality = NSMatrix; - printToFile = NSTextField; - ramSize = NSMatrix; - readRS232FromFile = NSTextField; - realJoystick = NSPopUpButton; - realTime = NSButton; - resolution = NSMatrix; - showStatusBar = NSButton; - slowFDC = NSButton; - tosImage = NSTextField; - useBorders = NSButton; - useVDIResolution = NSButton; - window = NSWindow; - writeMidiToFile = NSTextField; - writeProtection = NSMatrix; - writeRS232ToFile = NSTextField; - zoomSTLowRes = NSButton; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - captureAnimation = id; - captureScreen = id; - captureSound = id; - coldReset = id; - doFullScreen = id; - endCaptureAnimation = id; - endCaptureSound = id; - help = id; - insertDiskA = id; - insertDiskB = id; - prefsMenu = id; - restoreMemorySnap = id; - saveMemorySnap = id; - warmReset = id; - }; - CLASS = SDLMain; - LANGUAGE = ObjC; - OUTLETS = { - beginCaptureAnim = NSMenuItem; - beginCaptureSound = NSMenuItem; - endCaptureAnim = NSMenuItem; - endCaptureSound = NSMenuItem; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + ACTIONS + + changeViewedJoystick + id + chooseCartridgeImage + id + chooseDefaultImagesLocation + id + chooseFloppyImageA + id + chooseFloppyImageB + id + chooseGemdosImage + id + chooseHdImage + id + chooseKeyboardMappingFile + id + chooseMidiOutputFile + id + choosePrintToFile + id + chooseRS232InputFile + id + chooseRS232OutputFile + id + chooseTosImage + id + commitAndClose + id + ejectFloppyA + id + ejectFloppyB + id + ejectGemdosImage + id + ejectHdImage + id + loadConfigFrom + id + loadPrefs + id + myAction + id + saveConfigAs + id + updateEnabledStates + id + + CLASS + PrefsController + LANGUAGE + ObjC + OUTLETS + + autoInsertB + NSButton + blitter + NSButton + bootFromHD + NSButton + captureOnChange + NSButton + cartridgeImage + NSTextField + colorDepth + NSMatrix + compatibleCpu + NSButton + configFile + NSTextField + cpuClock + NSMatrix + cpuType + NSMatrix + currentJoystick + NSPopUpButton + defaultImagesLocation + NSTextField + enableAutoFire + NSButton + enableDSP + NSPopUpButton + enableMidi + NSButton + enablePrinter + NSButton + enableRS232 + NSButton + enableSound + NSButton + floppyImageA + NSTextField + floppyImageB + NSTextField + force8bpp + NSButton + frameSkip + NSPopUpButton + gemdosImage + NSTextField + hdImage + NSTextField + interleaved + NSButton + joystickDown + NSPopUpButton + joystickFire + NSPopUpButton + joystickLeft + NSPopUpButton + joystickMode + NSMatrix + joystickRight + NSPopUpButton + joystickUp + NSPopUpButton + keyboardMapping + NSMatrix + keyboardMappingFile + NSTextField + machineType + NSMatrix + monitor + NSMatrix + nSpec512Treshold + NSSlider + patchTimerD + NSButton + playbackQuality + NSMatrix + printToFile + NSTextField + ramSize + NSMatrix + readRS232FromFile + NSTextField + realJoystick + NSPopUpButton + realTime + NSButton + resolution + NSMatrix + showStatusBar + NSButton + slowFDC + NSButton + tosImage + NSTextField + useBorders + NSButton + useVDIResolution + NSButton + window + NSWindow + writeMidiToFile + NSTextField + writeProtection + NSMatrix + writeRS232ToFile + NSTextField + zoomSTLowRes + NSButton + + SUPERCLASS + NSObject + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + ACTIONS + + captureAnimation + id + captureScreen + id + captureSound + id + coldReset + id + doFullScreen + id + endCaptureAnimation + id + endCaptureSound + id + help + id + insertDiskA + id + insertDiskB + id + prefsMenu + id + restoreMemorySnap + id + saveMemorySnap + id + warmReset + id + + CLASS + SDLMain + LANGUAGE + ObjC + OUTLETS + + beginCaptureAnim + NSMenuItem + beginCaptureSound + NSMenuItem + endCaptureAnim + NSMenuItem + endCaptureSound + NSMenuItem + + SUPERCLASS + NSObject + + + ACTIONS + + createFloppyImage + id + runModal + id + + CLASS + CreateFloppyController + LANGUAGE + ObjC + OUTLETS + + sectors + NSMatrix + sides + NSMatrix + tracks + NSPopUpButton + window + NSWindow + + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff -r 87990958bdea src/gui-osx/SDLMain.nib/info.nib --- a/src/gui-osx/SDLMain.nib/info.nib Tue Jan 13 23:42:16 2009 +0200 +++ b/src/gui-osx/SDLMain.nib/info.nib Fri Jan 16 12:14:16 2009 +0100 @@ -1,23 +1,19 @@ - + - IBDocumentLocation - 613 15 503 374 0 0 1680 1028 IBFramework Version - 489.0 + 629 IBLastKnownRelativeProjectPath - ../../Hatari.xcodeproj + ../../../Hatari.xcodeproj IBOldestOS - 3 + 5 IBOpenObjects - 326 + 398 IBSystem Version - 8S165 - IBUsesTextArchiving - + 9G55 targetFramework IBCocoaFramework diff -r 87990958bdea src/gui-osx/SDLMain.nib/keyedobjects.nib Binary file src/gui-osx/SDLMain.nib/keyedobjects.nib has changed diff -r 87990958bdea src/gui-sdl/dlgSystem.c --- a/src/gui-sdl/dlgSystem.c Tue Jan 13 23:42:16 2009 +0200 +++ b/src/gui-sdl/dlgSystem.c Fri Jan 16 12:14:16 2009 +0100 @@ -4,7 +4,7 @@ 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. */ -const char DlgSystem_rcsid[] = "Hatari $Id: dlgSystem.c,v 1.11 2008-06-08 16:07:42 eerot Exp $"; +const char DlgSystem_rcsid[] = "Hatari $Id: dlgSystem.c,v 1.11 2008/06/08 16:07:42 eerot Exp $"; #include "main.h" #include "configuration.h" @@ -24,12 +24,13 @@ #define DLGSYS_8MHZ 17 #define DLGSYS_16MHZ 18 #define DLGSYS_32MHZ 19 -#define DLGSYS_PREFETCH 20 -#define DLGSYS_BLITTER 21 -#define DLGSYS_RTC 22 -#define DLGSYS_TIMERD 23 -#define DLGSYS_SLOWFDC 24 - +#define DLGSYS_64MHZ 20 +#define DLGSYS_128MHZ 21 +#define DLGSYS_PREFETCH 22 +#define DLGSYS_BLITTER 23 +#define DLGSYS_RTC 24 +#define DLGSYS_TIMERD 25 +#define DLGSYS_SLOWFDC 26 /* The "System" dialog: */ static SGOBJ systemdlg[] = @@ -57,6 +58,8 @@ { SGRADIOBUT, 0, 0, 19,13, 3,1, "8" }, { SGRADIOBUT, 0, 0, 24,13, 4,1, "16" }, { SGRADIOBUT, 0, 0, 30,13, 4,1, "32" }, + { SGRADIOBUT, 0, 0, 19,14, 4,1, "64" }, + { SGRADIOBUT, 0, 0, 30,14, 4,1, "128" }, { SGCHECKBOX, 0, 0, 2,15, 32,1, "Slower but more compatible CPU" }, { SGCHECKBOX, 0, 0, 2,16, 20,1, "Blitter emulation" }, @@ -93,11 +96,15 @@ } systemdlg[DLGSYS_ST + ConfigureParams.System.nMachineType].state |= SG_SELECTED; - for (i = DLGSYS_8MHZ; i <= DLGSYS_16MHZ; i++) + for (i = DLGSYS_8MHZ; i <= DLGSYS_128MHZ; i++) { systemdlg[i].state &= ~SG_SELECTED; } - if (ConfigureParams.System.nCpuFreq == 32) + if (ConfigureParams.System.nCpuFreq == 128) + systemdlg[DLGSYS_128MHZ].state |= SG_SELECTED; + else if (ConfigureParams.System.nCpuFreq == 64) + systemdlg[DLGSYS_64MHZ].state |= SG_SELECTED; + else if (ConfigureParams.System.nCpuFreq == 32) systemdlg[DLGSYS_32MHZ].state |= SG_SELECTED; else if (ConfigureParams.System.nCpuFreq == 16) systemdlg[DLGSYS_16MHZ].state |= SG_SELECTED; @@ -152,7 +159,11 @@ } } - if (systemdlg[DLGSYS_32MHZ].state & SG_SELECTED) + if (systemdlg[DLGSYS_128MHZ].state & SG_SELECTED) + ConfigureParams.System.nCpuFreq = 128; + else if (systemdlg[DLGSYS_64MHZ].state & SG_SELECTED) + ConfigureParams.System.nCpuFreq = 64; + else if (systemdlg[DLGSYS_32MHZ].state & SG_SELECTED) ConfigureParams.System.nCpuFreq = 32; else if (systemdlg[DLGSYS_16MHZ].state & SG_SELECTED) ConfigureParams.System.nCpuFreq = 16; diff -r 87990958bdea src/includes/debugui.h --- a/src/includes/debugui.h Tue Jan 13 23:42:16 2009 +0200 +++ b/src/includes/debugui.h Fri Jan 16 12:14:16 2009 +0100 @@ -11,10 +11,13 @@ /* DebugUI_ParseCommand() return values */ enum { DEBUG_QUIT, - DEBUG_CMD + DEBUG_CMD, + DEBUG_STEP }; extern void DebugUI(void); extern int DebugUI_ParseCommand(char *input); +extern bool bDebugStep; + #endif /* HATARI_DEBUGUI_H */ diff -r 87990958bdea src/includes/m68000.h --- a/src/includes/m68000.h Tue Jan 13 23:42:16 2009 +0200 +++ b/src/includes/m68000.h Fri Jan 16 12:14:16 2009 +0100 @@ -147,11 +147,9 @@ #define BUS_ERROR_WRITE 0 #define BUS_ERROR_READ 1 - /* bus acces mode */ -#define BUS_MODE_CPU 0 /* bus is owned by the cpu */ -#define BUS_MODE_BLITTER 1 /* bus is owned by the blitter */ - +#define BUS_MODE_CPU 0 /* bus is owned by the cpu */ +#define BUS_MODE_BLITTER 1 /* bus is owned by the blitter */ extern Uint32 BusErrorAddress; extern Uint32 BusErrorPC; @@ -176,7 +174,9 @@ { cycles = (cycles + 3) & ~3; cycles = cycles >> nCpuFreqShift; - + /* we have to advance the cycle counter by at least one cycle! */ + if(cycles<1) cycles=1; + PendingInterruptCount -= INT_CONVERT_TO_INTERNAL(cycles, INT_CPU_CYCLE); nCyclesMainCounter += cycles; } @@ -232,6 +232,9 @@ cycles = cycles >> nCpuFreqShift; + /* we have to advance the cycle counter by at least one cycle! */ + if(cycles<1) cycles=1; + PendingInterruptCount -= INT_CONVERT_TO_INTERNAL ( cycles , INT_CPU_CYCLE ); nCyclesMainCounter += cycles; diff -r 87990958bdea src/options.c --- a/src/options.c Tue Jan 13 23:42:16 2009 +0200 +++ b/src/options.c Fri Jan 16 12:14:16 2009 +0100 @@ -46,7 +46,7 @@ bool bLoadAutoSave; /* Load autosave memory snapshot at startup */ bool bLoadMemorySave; /* Load memory snapshot provided via option at startup */ -bool bBiosIntercept; /* whether UAE should intercept Bios & XBios calls */ +bool bBiosIntercept=TRUE; /* whether UAE should intercept Bios & XBios calls */ /* List of supported options. */ diff -r 87990958bdea src/uae-cpu/newcpu.c --- a/src/uae-cpu/newcpu.c Tue Jan 13 23:42:16 2009 +0200 +++ b/src/uae-cpu/newcpu.c Fri Jan 16 12:14:16 2009 +0100 @@ -1660,10 +1660,11 @@ uae_u16 *oldpcp; #endif - for (;;) { - int cycles; - uae_u32 opcode = get_iword_prefetch (0); - + for (;;) { + int cycles; + uae_u32 opcode = get_iword_prefetch (0); + if(bDebugStep) DebugUI(); + #ifdef DEBUG_PREFETCH if (get_ilong (0) != do_get_mem_long (®s.prefetch)) { fprintf (stderr, "Prefetch differs from memory.\n"); @@ -1754,8 +1755,9 @@ static void m68k_run_2 (void) { for (;;) { - int cycles; - uae_u32 opcode = get_iword (0); + int cycles; + uae_u32 opcode = get_iword (0); + if(bDebugStep) DebugUI(); /*m68k_dumpstate(stderr, NULL);*/ if ( HATARI_TRACE_LEVEL ( HATARI_TRACE_CPU_DISASM ) ) diff -r 87990958bdea src/xbios.c --- a/src/xbios.c Tue Jan 13 23:42:16 2009 +0200 +++ b/src/xbios.c Fri Jan 16 12:14:16 2009 +0100 @@ -9,7 +9,7 @@ We intercept and direct some XBios calls to handle the RS-232 etc. and help with floppy debugging. */ -const char XBios_rcsid[] = "Hatari $Id: xbios.c,v 1.18 2008-11-03 20:24:25 thothy Exp $"; +const char XBios_rcsid[] = "Hatari $Id: xbios.c,v 1.18 2008/11/03 20:24:25 thothy Exp $"; #include "main.h" #include "configuration.h" @@ -20,10 +20,9 @@ #include "screenSnapShot.h" #include "stMemory.h" #include "xbios.h" - +#include "debugui.h" #define XBIOS_DEBUG 0 /* for floppy read/write */ - /* List of Atari ST RS-232 baud rates */ static const int BaudRates[] = @@ -161,6 +160,186 @@ } +/*----------------------------------------------------------------------- */ +/** + * XBIOS Prtblk + * Call 36 + */ +static bool XBios_Prtblk(Uint32 Params) +{ + /* Correct return code? */ + Regs[REG_D0] = 0; + + return TRUE; +} + +/*----------------------------------------------------------------------- */ +/** + * XBIOS Change Emulator Options + * Call 255 + */ +static bool XBios_HatariOption(Uint32 Params) +{ + int option = STMemory_ReadWord(Params+2); + fprintf(stderr, "Intercepted XBIOS HatariOption(), option=%d (%08x), ", option, Params); + + switch(option) + { + case 1: /* Min speed? */ + ConfigureParams.System.bFastForward = false; + //ConfigureParams.System.nMinMaxSpeed = MINMAXSPEED_MIN; + /* Reset the sound emulation variables: */ + Sound_ResetBufferIndex(); + fprintf(stderr, "Normal speed\n"); + Regs[REG_D0] = 0; + break; + case 2: /* Max speed? */ + ConfigureParams.System.bFastForward = true; + //ConfigureParams.System.nMinMaxSpeed = MINMAXSPEED_MAX; + fprintf(stderr, "Maximum speed!\n"); + Regs[REG_D0] = 0; + break; + case 3: /* Enable debugger? */ + bEnableDebug = TRUE; + fprintf(stderr, "Debugger enabled\n"); + Regs[REG_D0] = 0; + break; + case 4: /* Disable debugger? */ + bEnableDebug = FALSE; + fprintf(stderr, "Debugger disabled\n"); + Regs[REG_D0] = 0; + break; + default: + fprintf(stderr, "Unknown argument (%d)\n",Params); + Regs[REG_D0] = -1; + } + + return(TRUE); +} + +/*----------------------------------------------------------------------- */ +/** + * XBIOS Debug output to console + * Call 254 + * Parameters: memptr at -2(sp) and numbytes at -6(sp) + */ +static bool XBios_Debug(Uint32 Params) +{ + int i; + Uint32 memptr = STMemory_ReadLong(Params+2); + Uint32 length = STMemory_ReadLong(Params+6); + + fprintf(stderr, "Memory dump at 0x%08x (%d bytes): ", memptr, length); + if(length>256) + { + length = 256; + fprintf(stderr,"length truncated to 256 bytes! "); + } + for(i=0;i6) + nCpuFreqShift = 0; + ConfigureParams.System.nCpuFreq = 8<