From e5275949d40233d5f54303a54d5eec0e96add712 Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 15 Dec 2006 16:43:12 +0000 Subject: [PATCH] Sorry for another huge commit :) Changed all functions #define'ed in bspf.hxx to be named more consistently (BSPF_functionname...), to make it more obvious what they are. Changed 'DEVELOPER_SUPPORT' to 'DEBUGGER_SUPPORT' everywhere. Originally, developer support was to encompass more than just the debugger, but since there's no longer a reason to exclude the other stuff (due to most of it being very useful even for non-developers), it makes sense to rename the option. Those ports using 'configure' will need to update the arguments used. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1216 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/README-GP2X.txt | 2 +- stella/README-PSP.txt | 2 +- stella/configure | 24 +++++++++--------- stella/docs/index.html | 9 +++---- stella/src/common/mainSDL.cxx | 6 ++--- stella/src/debugger/Debugger.cxx | 4 +-- stella/src/debugger/DebuggerParser.cxx | 6 ++--- stella/src/debugger/EquateList.cxx | 4 +-- stella/src/debugger/gui/PromptWidget.cxx | 4 +-- stella/src/emucore/Console.cxx | 8 +++--- stella/src/emucore/EventHandler.cxx | 10 ++++---- stella/src/emucore/FrameBuffer.cxx | 8 +++--- stella/src/emucore/MediaSrc.hxx | 6 ++--- stella/src/emucore/OSystem.cxx | 14 +++++------ stella/src/emucore/OSystem.hxx | 6 ++--- stella/src/emucore/Settings.cxx | 4 +-- stella/src/emucore/TIA.cxx | 4 +-- stella/src/emucore/TIA.hxx | 6 ++--- stella/src/emucore/m6502/src/M6502.cxx | 10 ++++---- stella/src/emucore/m6502/src/M6502.hxx | 8 +++--- stella/src/emucore/m6502/src/M6502Hi.cxx | 12 ++++----- stella/src/emucore/m6502/src/M6502Low.cxx | 12 ++++----- stella/src/emucore/m6502/src/System.cxx | 6 ++--- .../src/emucore/m6502/src/bspf/src/bspf.hxx | 25 +++++++++---------- .../src/macosx/stella.pbproj/project.pbxproj | 2 +- .../macosx/stella.xcodeproj/project.pbxproj | 6 ++--- stella/src/unix/stella.spec | 8 +++--- stella/src/win32/Stella.vcproj | 4 +-- 28 files changed, 108 insertions(+), 112 deletions(-) diff --git a/stella/README-GP2X.txt b/stella/README-GP2X.txt index 8fe5ef33e..d31f4b44f 100644 --- a/stella/README-GP2X.txt +++ b/stella/README-GP2X.txt @@ -135,7 +135,7 @@ export PATH=:$PATH This is what my configure line looks like: ./configure --enable-cheats - --disable-developer + --disable-debugger --host=gp2x --with-zlib-prefix= --with-sdl-prefix= diff --git a/stella/README-PSP.txt b/stella/README-PSP.txt index 3166e78f1..4967cbbed 100644 --- a/stella/README-PSP.txt +++ b/stella/README-PSP.txt @@ -7,7 +7,7 @@ Building -------- To build for the PSP, make sure psp-config is in the path and run: - ./configure --host=psp --disable-developer + ./configure --host=psp --disable-debugger make make psp-upload make psp-layout diff --git a/stella/configure b/stella/configure index 8a41fc06a..df1261e8a 100755 --- a/stella/configure +++ b/stella/configure @@ -20,7 +20,7 @@ _zlib=auto # default option behaviour yes/no _build_gl=yes _build_sound=yes -_build_developer=yes +_build_debugger=yes _build_snapshot=yes _build_joystick=yes _build_cheats=yes @@ -257,8 +257,8 @@ Optional Features: --disable-gl --enable-sound enable/disable sound support [enabled] --disable-sound - --enable-developer enable/disable all developer/debugger options [enabled] - --disable-developer + --enable-debugger enable/disable all debugger options [enabled] + --disable-debugger --enable-snapshot enable/disable snapshot support [enabled] --disable-snapshot --enable-joystick enable/disable joystick support [enabled] @@ -302,8 +302,8 @@ for ac_option in $@; do --disable-gl) _build_gl=no ;; --enable-sound) _build_sound=yes ;; --disable-sound) _build_sound=no ;; - --enable-developer) _build_developer=yes ;; - --disable-developer) _build_developer=no ;; + --enable-debugger) _build_debugger=yes ;; + --disable-debugger) _build_debugger=no ;; --enable-snapshot) _build_snapshot=yes ;; --disable-snapshot) _build_snapshot=no ;; --enable-joystick) _build_joystick=yes ;; @@ -701,11 +701,11 @@ else echo fi -if test "$_build_developer" = "yes" ; then - echo_n " Developer/debugger support enabled" +if test "$_build_debugger" = "yes" ; then + echo_n " Debugger support enabled" echo else - echo_n " Developer/debugger support disabled" + echo_n " Debugger support disabled" echo fi @@ -734,10 +734,10 @@ else fi if test "$_build_atarivox" = yes ; then - echo_n " AtariVox support enabled" + echo_n " AtariVox support enabled (not yet working)" echo else - echo_n " AtariVox support disabled" + echo_n " AtariVox support disabled (not yet working)" echo fi @@ -860,8 +860,8 @@ if test "$_build_sound" = yes ; then DEFINES="$DEFINES -DSOUND_SUPPORT" fi -if test "$_build_developer" = yes ; then - DEFINES="$DEFINES -DDEVELOPER_SUPPORT" +if test "$_build_debugger" = yes ; then + DEFINES="$DEFINES -DDEBUGGER_SUPPORT" MODULES="$MODULES $DBG $DBGGUI $YACC" INCLUDES="$INCLUDES -I$DBG -I$DBGGUI -I$YACC" fi diff --git a/stella/docs/index.html b/stella/docs/index.html index 9360bc0ae..6f36c58ac 100644 --- a/stella/docs/index.html +++ b/stella/docs/index.html @@ -829,9 +829,9 @@ scaling. -

If developer support was included in Stella, the following developer - commandline arguments are also available. Note that in all cases, - the values supplied to the arguments are not case sensitive.

+

The following are useful to developers. Only use them if you know what + you're doing! Note that in all cases, the values supplied to the arguments + are not case sensitive.

@@ -1572,9 +1572,6 @@ scaling.

Developer Keys (can't be remapped)

-

The following keys are activated only if developer support has - been included:

-
diff --git a/stella/src/common/mainSDL.cxx b/stella/src/common/mainSDL.cxx index 0b0033731..d936ede22 100644 --- a/stella/src/common/mainSDL.cxx +++ b/stella/src/common/mainSDL.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: mainSDL.cxx,v 1.69 2006-12-08 16:48:56 stephena Exp $ +// $Id: mainSDL.cxx,v 1.70 2006-12-15 16:42:53 stephena Exp $ //============================================================================ #include @@ -55,7 +55,7 @@ #error Unsupported platform! #endif -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -164,7 +164,7 @@ int main(int argc, char* argv[]) if(theOSystem->settings().getBool("holdbutton0")) theOSystem->eventHandler().handleEvent(Event::JoystickZeroFire, 1); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT Debugger& dbg = theOSystem->debugger(); // Set up any breakpoint that was on the command line diff --git a/stella/src/debugger/Debugger.cxx b/stella/src/debugger/Debugger.cxx index 8d4cde16c..1f0d21193 100644 --- a/stella/src/debugger/Debugger.cxx +++ b/stella/src/debugger/Debugger.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Debugger.cxx,v 1.107 2006-12-08 16:48:59 stephena Exp $ +// $Id: Debugger.cxx,v 1.108 2006-12-15 16:42:53 stephena Exp $ //============================================================================ #include "bspf.hxx" @@ -252,7 +252,7 @@ string Debugger::loadListFile(string f) { buffer[8] == ' ' && isxdigit(buffer[9]) && isxdigit(buffer[12]) && - IS_BLANK(buffer[13])) + BSPF_isblank(buffer[13])) { count++; char addr[5]; diff --git a/stella/src/debugger/DebuggerParser.cxx b/stella/src/debugger/DebuggerParser.cxx index bc0598946..dcde27c25 100644 --- a/stella/src/debugger/DebuggerParser.cxx +++ b/stella/src/debugger/DebuggerParser.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: DebuggerParser.cxx,v 1.93 2006-12-14 00:07:47 stephena Exp $ +// $Id: DebuggerParser.cxx,v 1.94 2006-12-15 16:42:54 stephena Exp $ //============================================================================ #include @@ -177,7 +177,7 @@ int DebuggerParser::countCompletions(const char *in) { const char *l = commands[i].cmdString.c_str(); - if(STR_N_CASE_CMP(l, in, strlen(in)) == 0) { + if(BSPF_strncasecmp(l, in, strlen(in)) == 0) { if(compPrefix == "") compPrefix += l; else { @@ -939,7 +939,7 @@ void DebuggerParser::executeHelp() static char buf[256]; for(int i = 0; i < kNumCommands; ++i) { - SNPRINTF(buf, 255, "%13s - %s\n", + BSPF_snprintf(buf, 255, "%13s - %s\n", commands[i].cmdString.c_str(), commands[i].description.c_str()); diff --git a/stella/src/debugger/EquateList.cxx b/stella/src/debugger/EquateList.cxx index dd5b99e42..db9e0346a 100644 --- a/stella/src/debugger/EquateList.cxx +++ b/stella/src/debugger/EquateList.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: EquateList.cxx,v 1.23 2006-12-08 16:49:00 stephena Exp $ +// $Id: EquateList.cxx,v 1.24 2006-12-15 16:42:54 stephena Exp $ //============================================================================ #include @@ -444,7 +444,7 @@ int EquateList::countCompletions(const char *in) { const char *l = iter->first.c_str(); - if(STR_N_CASE_CMP(l, in, strlen(in)) == 0) + if(BSPF_strncasecmp(l, in, strlen(in)) == 0) { if(compPrefix == "") compPrefix += l; diff --git a/stella/src/debugger/gui/PromptWidget.cxx b/stella/src/debugger/gui/PromptWidget.cxx index e1291f06a..966c0f38f 100644 --- a/stella/src/debugger/gui/PromptWidget.cxx +++ b/stella/src/debugger/gui/PromptWidget.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: PromptWidget.cxx,v 1.12 2006-12-08 16:49:11 stephena Exp $ +// $Id: PromptWidget.cxx,v 1.13 2006-12-15 16:42:55 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -761,7 +761,7 @@ int PromptWidget::printf(const char *format, ...) int PromptWidget::vprintf(const char *format, va_list argptr) { char buf[2048]; - int count = VSNPRINTF(buf, sizeof(buf), format, argptr); + int count = BSPF_vsnprintf(buf, sizeof(buf), format, argptr); print(buf); return count; diff --git a/stella/src/emucore/Console.cxx b/stella/src/emucore/Console.cxx index 6bb8fc613..9d081f6df 100644 --- a/stella/src/emucore/Console.cxx +++ b/stella/src/emucore/Console.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Console.cxx,v 1.107 2006-12-13 00:05:46 stephena Exp $ +// $Id: Console.cxx,v 1.108 2006-12-15 16:42:55 stephena Exp $ //============================================================================ #include @@ -53,7 +53,7 @@ #include "Snapshot.hxx" #endif -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -196,7 +196,7 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5, m6502 = new M6502Low(1); else m6502 = new M6502High(1); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT m6502->attach(myOSystem->debugger()); #endif @@ -419,7 +419,7 @@ void Console::initialize() // Initialize the command menu system with updated values from the framebuffer myOSystem->commandMenu().initialize(); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT // Finally, initialize the debugging system, since it depends on the current ROM myOSystem->debugger().setConsole(this); myOSystem->debugger().initialize(); diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx index c780ab0b9..2c9877af9 100644 --- a/stella/src/emucore/EventHandler.cxx +++ b/stella/src/emucore/EventHandler.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: EventHandler.cxx,v 1.186 2006-12-12 01:02:12 stephena Exp $ +// $Id: EventHandler.cxx,v 1.187 2006-12-15 16:42:57 stephena Exp $ //============================================================================ #include @@ -38,7 +38,7 @@ #include "PropsSet.hxx" #include "bspf.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -2246,7 +2246,7 @@ void EventHandler::leaveMenuMode() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool EventHandler::enterDebugMode() { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myState == S_DEBUGGER) return false; @@ -2275,7 +2275,7 @@ bool EventHandler::enterDebugMode() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void EventHandler::leaveDebugMode() { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT // paranoia: this should never happen: if(myState != S_DEBUGGER) return; @@ -2324,7 +2324,7 @@ void EventHandler::setEventState(State state) myOverlay = &myOSystem->launcher(); break; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT case S_DEBUGGER: myOverlay = &myOSystem->debugger(); break; diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx index 1232628a9..2791314a8 100644 --- a/stella/src/emucore/FrameBuffer.cxx +++ b/stella/src/emucore/FrameBuffer.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FrameBuffer.cxx,v 1.109 2006-12-13 22:46:28 stephena Exp $ +// $Id: FrameBuffer.cxx,v 1.110 2006-12-15 16:42:57 stephena Exp $ //============================================================================ #include @@ -32,7 +32,7 @@ #include "Launcher.hxx" #include "OSystem.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -195,7 +195,7 @@ void FrameBuffer::update() break; // S_LAUNCHER } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT case EventHandler::S_DEBUGGER: { myOSystem->debugger().draw(); @@ -714,7 +714,7 @@ void FrameBuffer::getScaler(Scaler& scaler, int direction, const string& name) int pos = -1; for(unsigned int i = 0; i < myScalerList.size(); ++i) { - if(STR_CASE_CMP(myScalerList[i]->name, name.c_str()) == 0) + if(BSPF_strcasecmp(myScalerList[i]->name, name.c_str()) == 0) { pos = i; break; diff --git a/stella/src/emucore/MediaSrc.hxx b/stella/src/emucore/MediaSrc.hxx index 16cdfd064..534c60c92 100644 --- a/stella/src/emucore/MediaSrc.hxx +++ b/stella/src/emucore/MediaSrc.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: MediaSrc.hxx,v 1.15 2006-12-08 16:49:27 stephena Exp $ +// $Id: MediaSrc.hxx,v 1.16 2006-12-15 16:42:57 stephena Exp $ //============================================================================ #ifndef MEDIASOURCE_HXX @@ -30,7 +30,7 @@ class Sound; This class provides an interface for accessing graphics and audio data. @author Bradford W. Mott - @version $Id: MediaSrc.hxx,v 1.15 2006-12-08 16:49:27 stephena Exp $ + @version $Id: MediaSrc.hxx,v 1.16 2006-12-15 16:42:57 stephena Exp $ */ class MediaSource { @@ -68,7 +68,7 @@ class MediaSource */ virtual uInt8* previousFrameBuffer() const = 0; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT /** This method should be called whenever a new scanline is to be drawn. Invoking this method will update the graphics buffer and generate diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx index 4b93dbcf5..67cef03c6 100644 --- a/stella/src/emucore/OSystem.cxx +++ b/stella/src/emucore/OSystem.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.cxx,v 1.79 2006-12-13 17:09:10 stephena Exp $ +// $Id: OSystem.cxx,v 1.80 2006-12-15 16:42:58 stephena Exp $ //============================================================================ #include @@ -22,7 +22,7 @@ #include "MediaFactory.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -116,7 +116,7 @@ OSystem::~OSystem() // These must be deleted after all the others // This is a bit hacky, since it depends on ordering // of d'tor calls -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT delete myDebugger; #endif #ifdef CHEATCODE_SUPPORT @@ -139,7 +139,7 @@ bool OSystem::create() myMenu = new Menu(this); myCommandMenu = new CommandMenu(this); myLauncher = new Launcher(this); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myDebugger = new Debugger(this); #endif #ifdef CHEATCODE_SUPPORT @@ -172,7 +172,7 @@ bool OSystem::create() #ifdef SNAPSHOT_SUPPORT myFeatures += "Snapshot "; #endif -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myFeatures += "Debugger "; #endif #ifdef CHEATCODE_SUPPORT @@ -262,7 +262,7 @@ bool OSystem::createFrameBuffer(bool showmessage) myLauncher->initializeVideo(); break; // S_LAUNCHER -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT case EventHandler::S_DEBUGGER: myDebugger->initializeVideo(); break; // S_DEBUGGER @@ -453,7 +453,7 @@ bool OSystem::openROM(const string& rom, string& md5, uInt8** image, int* size) // Grab 3-character extension char* ext = filename + strlen(filename) - 4; - if(!STR_CASE_CMP(ext, ".bin") || !STR_CASE_CMP(ext, ".a26")) + if(!BSPF_strcasecmp(ext, ".bin") || !BSPF_strcasecmp(ext, ".a26")) break; } diff --git a/stella/src/emucore/OSystem.hxx b/stella/src/emucore/OSystem.hxx index 18395fa4c..48a772188 100644 --- a/stella/src/emucore/OSystem.hxx +++ b/stella/src/emucore/OSystem.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.hxx,v 1.45 2006-12-08 16:49:27 stephena Exp $ +// $Id: OSystem.hxx,v 1.46 2006-12-15 16:42:58 stephena Exp $ //============================================================================ #ifndef OSYSTEM_HXX @@ -45,7 +45,7 @@ class VideoDialog; other objects belong. @author Stephen Anthony - @version $Id: OSystem.hxx,v 1.45 2006-12-08 16:49:27 stephena Exp $ + @version $Id: OSystem.hxx,v 1.46 2006-12-15 16:42:58 stephena Exp $ */ class OSystem { @@ -139,7 +139,7 @@ class OSystem */ inline Launcher& launcher(void) const { return *myLauncher; } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT /** Get the ROM debugger of the system. diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx index fc7deb0ad..ace7a96ec 100644 --- a/stella/src/emucore/Settings.cxx +++ b/stella/src/emucore/Settings.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Settings.cxx,v 1.100 2006-12-15 16:12:35 stephena Exp $ +// $Id: Settings.cxx,v 1.101 2006-12-15 16:42:58 stephena Exp $ //============================================================================ #include @@ -359,7 +359,7 @@ void Settings::usage() #endif << " -listrominfo Display contents of stella.pro, one line per ROM entry\n" << " -help Show the text you're now reading\n" - #ifdef DEVELOPER_SUPPORT + #ifdef DEBUGGER_SUPPORT << endl << " The following options are meant for developers\n" << " Arguments are more fully explained in the manual\n" diff --git a/stella/src/emucore/TIA.cxx b/stella/src/emucore/TIA.cxx index 421cfbe27..0004e33f4 100644 --- a/stella/src/emucore/TIA.cxx +++ b/stella/src/emucore/TIA.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: TIA.cxx,v 1.73 2006-12-08 16:49:28 stephena Exp $ +// $Id: TIA.cxx,v 1.74 2006-12-15 16:43:02 stephena Exp $ //============================================================================ #include @@ -589,7 +589,7 @@ inline void TIA::endFrame() myFrameGreyed = false; } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void TIA::updateScanline() { diff --git a/stella/src/emucore/TIA.hxx b/stella/src/emucore/TIA.hxx index 7c2d9a0e3..ad7968a82 100644 --- a/stella/src/emucore/TIA.hxx +++ b/stella/src/emucore/TIA.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: TIA.hxx,v 1.37 2006-12-08 16:49:28 stephena Exp $ +// $Id: TIA.hxx,v 1.38 2006-12-15 16:43:03 stephena Exp $ //============================================================================ #ifndef TIA_HXX @@ -42,7 +42,7 @@ class Settings; be displayed on screen. @author Bradford W. Mott - @version $Id: TIA.hxx,v 1.37 2006-12-08 16:49:28 stephena Exp $ + @version $Id: TIA.hxx,v 1.38 2006-12-15 16:43:03 stephena Exp $ */ class TIA : public Device , public MediaSource { @@ -208,7 +208,7 @@ class TIA : public Device , public MediaSource */ void enableBits(bool mode) { for(uInt8 i = 0; i < 6; ++i) myBitEnabled[i] = mode; } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT /** This method should be called to update the media source with a new scanline. diff --git a/stella/src/emucore/m6502/src/M6502.cxx b/stella/src/emucore/m6502/src/M6502.cxx index cbfd65b6e..82c4891f0 100644 --- a/stella/src/emucore/m6502/src/M6502.cxx +++ b/stella/src/emucore/m6502/src/M6502.cxx @@ -13,12 +13,12 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: M6502.cxx,v 1.19 2006-12-08 16:49:29 stephena Exp $ +// $Id: M6502.cxx,v 1.20 2006-12-15 16:43:03 stephena Exp $ //============================================================================ #include "M6502.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Expression.hxx" #endif @@ -28,7 +28,7 @@ M6502::M6502(uInt32 systemCyclesPerProcessorCycle) mySystem(0), mySystemCyclesPerProcessorCycle(systemCyclesPerProcessorCycle) { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myDebugger = NULL; myBreakPoints = NULL; myReadTraps = NULL; @@ -56,7 +56,7 @@ M6502::M6502(uInt32 systemCyclesPerProcessorCycle) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - M6502::~M6502() { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myBreakConds.clear(); myBreakCondNames.clear(); #endif @@ -352,7 +352,7 @@ const char* M6502::ourInstructionMnemonicTable[256] = { "SED", "SBC", "nop", "isb", "nop", "SBC", "INC", "isb" }; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // This needs to be a list of all 256 opcodes and the type of memory // access they do (read, write, read/modify/write, or none). The diff --git a/stella/src/emucore/m6502/src/M6502.hxx b/stella/src/emucore/m6502/src/M6502.hxx index c9a85653c..2db019daa 100644 --- a/stella/src/emucore/m6502/src/M6502.hxx +++ b/stella/src/emucore/m6502/src/M6502.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: M6502.hxx,v 1.18 2006-12-08 16:49:30 stephena Exp $ +// $Id: M6502.hxx,v 1.19 2006-12-15 16:43:03 stephena Exp $ //============================================================================ #ifndef M6502_HXX @@ -41,7 +41,7 @@ typedef Common::Array ExpressionList; has a 64K addressing space. @author Bradford W. Mott - @version $Id: M6502.hxx,v 1.18 2006-12-08 16:49:30 stephena Exp $ + @version $Id: M6502.hxx,v 1.19 2006-12-15 16:43:03 stephena Exp $ */ class M6502 { @@ -188,7 +188,7 @@ class M6502 friend ostream& operator<<(ostream& out, const AddressingMode& mode); public: -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT /** Attach the specified debugger. @@ -239,7 +239,7 @@ class M6502 bool notZ; // Z flag complement for processor status register bool C; // C flag for processor status register -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT /// Pointer to the debugger for this processor or the null pointer Debugger* myDebugger; diff --git a/stella/src/emucore/m6502/src/M6502Hi.cxx b/stella/src/emucore/m6502/src/M6502Hi.cxx index c3cda0a48..37e4c05bc 100644 --- a/stella/src/emucore/m6502/src/M6502Hi.cxx +++ b/stella/src/emucore/m6502/src/M6502Hi.cxx @@ -13,14 +13,14 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: M6502Hi.cxx,v 1.17 2006-12-08 16:49:30 stephena Exp $ +// $Id: M6502Hi.cxx,v 1.18 2006-12-15 16:43:07 stephena Exp $ //============================================================================ #include "M6502Hi.hxx" #include "Serializer.hxx" #include "Deserializer.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -33,7 +33,7 @@ M6502High::M6502High(uInt32 systemCyclesPerProcessorCycle) myNumberOfDistinctAccesses = 0; myLastAddress = 0; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myJustHitTrapFlag = false; #endif } @@ -53,7 +53,7 @@ inline uInt8 M6502High::peek(uInt16 address) } mySystem->incrementCycles(mySystemCyclesPerProcessorCycle); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myReadTraps != NULL && myReadTraps->isSet(address)) { myJustHitTrapFlag = true; @@ -78,7 +78,7 @@ inline void M6502High::poke(uInt16 address, uInt8 value) } mySystem->incrementCycles(mySystemCyclesPerProcessorCycle); -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myWriteTraps != NULL && myWriteTraps->isSet(address)) { myJustHitTrapFlag = true; @@ -105,7 +105,7 @@ bool M6502High::execute(uInt32 number) uInt16 operandAddress = 0; uInt8 operand = 0; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myJustHitTrapFlag) { if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address)) diff --git a/stella/src/emucore/m6502/src/M6502Low.cxx b/stella/src/emucore/m6502/src/M6502Low.cxx index fe637c3f8..2a3d0f77b 100644 --- a/stella/src/emucore/m6502/src/M6502Low.cxx +++ b/stella/src/emucore/m6502/src/M6502Low.cxx @@ -13,14 +13,14 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: M6502Low.cxx,v 1.10 2006-12-08 16:49:30 stephena Exp $ +// $Id: M6502Low.cxx,v 1.11 2006-12-15 16:43:08 stephena Exp $ //============================================================================ #include "M6502Low.hxx" #include "Serializer.hxx" #include "Deserializer.hxx" -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #endif @@ -30,7 +30,7 @@ M6502Low::M6502Low(uInt32 systemCyclesPerProcessorCycle) : M6502(systemCyclesPerProcessorCycle) { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT myJustHitTrapFlag = false; #endif } @@ -43,7 +43,7 @@ M6502Low::~M6502Low() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inline uInt8 M6502Low::peek(uInt16 address) { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myReadTraps != NULL && myReadTraps->isSet(address)) { myJustHitTrapFlag = true; @@ -60,7 +60,7 @@ inline uInt8 M6502Low::peek(uInt16 address) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inline void M6502Low::poke(uInt16 address, uInt8 value) { -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myWriteTraps != NULL && myWriteTraps->isSet(address)) { myJustHitTrapFlag = true; @@ -87,7 +87,7 @@ bool M6502Low::execute(uInt32 number) uInt16 operandAddress = 0; uInt8 operand = 0; -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(myJustHitTrapFlag) { if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address)) diff --git a/stella/src/emucore/m6502/src/System.cxx b/stella/src/emucore/m6502/src/System.cxx index f0d9d3620..6ae248547 100644 --- a/stella/src/emucore/m6502/src/System.cxx +++ b/stella/src/emucore/m6502/src/System.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: System.cxx,v 1.19 2006-12-08 16:49:30 stephena Exp $ +// $Id: System.cxx,v 1.20 2006-12-15 16:43:11 stephena Exp $ //============================================================================ #include @@ -318,7 +318,7 @@ uInt8 System::peek(uInt16 addr) result = access.device->peek(addr); } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(!myDataBusLocked) #endif myDataBusState = result; @@ -341,7 +341,7 @@ void System::poke(uInt16 addr, uInt8 value) access.device->poke(addr, value); } -#ifdef DEVELOPER_SUPPORT +#ifdef DEBUGGER_SUPPORT if(!myDataBusLocked) #endif myDataBusState = value; diff --git a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx index acd0296ca..918f69dfc 100644 --- a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx +++ b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: bspf.hxx,v 1.14 2006-12-14 00:07:47 stephena Exp $ +// $Id: bspf.hxx,v 1.15 2006-12-15 16:43:11 stephena Exp $ //============================================================================ #ifndef BSPF_HXX @@ -24,7 +24,7 @@ that need to be defined for different operating systems. @author Bradford W. Mott - @version $Id: bspf.hxx,v 1.14 2006-12-14 00:07:47 stephena Exp $ + @version $Id: bspf.hxx,v 1.15 2006-12-15 16:43:11 stephena Exp $ */ // Types for 8-bit signed and unsigned integers @@ -75,20 +75,19 @@ typedef unsigned int uInt32; // I wish Windows had a complete POSIX layer #ifdef BSPF_WIN32 - #define STR_CASE_CMP stricmp - #define STR_N_CASE_CMP strnicmp - #define IS_BLANK(c) ((c == ' ') || (c == '\t')) - #define SNPRINTF _snprintf - #define VSNPRINTF _vsnprintf + #define BSPF_strcasecmp stricmp + #define BSPF_strncasecmp strnicmp + #define BSPF_isblank(c) ((c == ' ') || (c == '\t')) + #define BSPF_snprintf _snprintf + #define BSPF_vsnprintf _vsnprintf #else - #define STR_CASE_CMP strcasecmp - #define STR_N_CASE_CMP strncasecmp - #define IS_BLANK(c) isblank(c) - #define SNPRINTF snprintf - #define VSNPRINTF vsnprintf + #define BSPF_strcasecmp strcasecmp + #define BSPF_strncasecmp strncasecmp + #define BSPF_isblank(c) isblank(c) + #define BSPF_snprintf snprintf + #define BSPF_vsnprintf vsnprintf #endif - #ifdef _WIN32_WCE #include "missing.h" #endif diff --git a/stella/src/macosx/stella.pbproj/project.pbxproj b/stella/src/macosx/stella.pbproj/project.pbxproj index 8675093db..e03a2fc8f 100755 --- a/stella/src/macosx/stella.pbproj/project.pbxproj +++ b/stella/src/macosx/stella.pbproj/project.pbxproj @@ -242,7 +242,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = .; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DDEVELOPER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DSNAPSHOT_SUPPORT -DBSPF_MAC_OSX -DHAVE_INTTYPES "; + OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DDEBUGGER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DSNAPSHOT_SUPPORT -DBSPF_MAC_OSX -DHAVE_INTTYPES "; OTHER_LDFLAGS = "-framework SDL -lz"; PRODUCT_NAME = StellaOSX; SECTORDER_FLAGS = ""; diff --git a/stella/src/macosx/stella.xcodeproj/project.pbxproj b/stella/src/macosx/stella.xcodeproj/project.pbxproj index 4af49dbba..27dd150e1 100644 --- a/stella/src/macosx/stella.xcodeproj/project.pbxproj +++ b/stella/src/macosx/stella.xcodeproj/project.pbxproj @@ -1729,7 +1729,7 @@ SOUND_SUPPORT, DISPLAY_OPENGL, CHEATCODE_SUPPORT, - DEVELOPER_SUPPORT, + DEBUGGER_SUPPORT, HAVE_GETTIMEOFDAY, SNAPSHOT_SUPPORT, BSPF_MAC_OSX, @@ -1787,7 +1787,7 @@ SOUND_SUPPORT, DISPLAY_OPENGL, CHEATCODE_SUPPORT, - DEVELOPER_SUPPORT, + DEBUGGER_SUPPORT, HAVE_GETTIMEOFDAY, SNAPSHOT_SUPPORT, BSPF_MAC_OSX, @@ -1843,7 +1843,7 @@ SOUND_SUPPORT, DISPLAY_OPENGL, CHEATCODE_SUPPORT, - DEVELOPER_SUPPORT, + DEBUGGER_SUPPORT, HAVE_GETTIMEOFDAY, SNAPSHOT_SUPPORT, BSPF_MAC_OSX, diff --git a/stella/src/unix/stella.spec b/stella/src/unix/stella.spec index 41d3f7b31..25f5b0149 100644 --- a/stella/src/unix/stella.spec +++ b/stella/src/unix/stella.spec @@ -6,7 +6,7 @@ %define enable_gl 1 %define enable_sound 1 -%define enable_developer 1 +%define enable_debugger 1 %define enable_snapshot 1 %define enable_joystick 1 %define enable_cheats 1 @@ -58,10 +58,10 @@ export CXXFLAGS=$RPM_OPT_FLAGS %else --disable-sound \ %endif -%if %enable_developer - --enable-developer \ +%if %enable_debugger + --enable-debugger \ %else - --disable-developer \ + --disable-debugger \ %endif %if %enable_snapshot --enable-snapshot \ diff --git a/stella/src/win32/Stella.vcproj b/stella/src/win32/Stella.vcproj index 991c0e520..e403a8219 100755 --- a/stella/src/win32/Stella.vcproj +++ b/stella/src/win32/Stella.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat" - PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;DISPLAY_OPENGL;SNAPSHOT_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT" + PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SNAPSHOT_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="2" @@ -73,7 +73,7 @@ SDLmain.lib
Function