mirror of https://github.com/stella-emu/stella.git
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
This commit is contained in:
parent
b492f93be7
commit
e5275949d4
|
@ -135,7 +135,7 @@ export PATH=<your arm-linux compiler path>:$PATH
|
||||||
This is what my configure line looks like:
|
This is what my configure line looks like:
|
||||||
./configure
|
./configure
|
||||||
--enable-cheats
|
--enable-cheats
|
||||||
--disable-developer
|
--disable-debugger
|
||||||
--host=gp2x
|
--host=gp2x
|
||||||
--with-zlib-prefix=<your gp2x zlib path>
|
--with-zlib-prefix=<your gp2x zlib path>
|
||||||
--with-sdl-prefix=<your sdl config path>
|
--with-sdl-prefix=<your sdl config path>
|
||||||
|
|
|
@ -7,7 +7,7 @@ Building
|
||||||
--------
|
--------
|
||||||
To build for the PSP, make sure psp-config is in the path and run:
|
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
|
||||||
make psp-upload
|
make psp-upload
|
||||||
make psp-layout
|
make psp-layout
|
||||||
|
|
|
@ -20,7 +20,7 @@ _zlib=auto
|
||||||
# default option behaviour yes/no
|
# default option behaviour yes/no
|
||||||
_build_gl=yes
|
_build_gl=yes
|
||||||
_build_sound=yes
|
_build_sound=yes
|
||||||
_build_developer=yes
|
_build_debugger=yes
|
||||||
_build_snapshot=yes
|
_build_snapshot=yes
|
||||||
_build_joystick=yes
|
_build_joystick=yes
|
||||||
_build_cheats=yes
|
_build_cheats=yes
|
||||||
|
@ -257,8 +257,8 @@ Optional Features:
|
||||||
--disable-gl
|
--disable-gl
|
||||||
--enable-sound enable/disable sound support [enabled]
|
--enable-sound enable/disable sound support [enabled]
|
||||||
--disable-sound
|
--disable-sound
|
||||||
--enable-developer enable/disable all developer/debugger options [enabled]
|
--enable-debugger enable/disable all debugger options [enabled]
|
||||||
--disable-developer
|
--disable-debugger
|
||||||
--enable-snapshot enable/disable snapshot support [enabled]
|
--enable-snapshot enable/disable snapshot support [enabled]
|
||||||
--disable-snapshot
|
--disable-snapshot
|
||||||
--enable-joystick enable/disable joystick support [enabled]
|
--enable-joystick enable/disable joystick support [enabled]
|
||||||
|
@ -302,8 +302,8 @@ for ac_option in $@; do
|
||||||
--disable-gl) _build_gl=no ;;
|
--disable-gl) _build_gl=no ;;
|
||||||
--enable-sound) _build_sound=yes ;;
|
--enable-sound) _build_sound=yes ;;
|
||||||
--disable-sound) _build_sound=no ;;
|
--disable-sound) _build_sound=no ;;
|
||||||
--enable-developer) _build_developer=yes ;;
|
--enable-debugger) _build_debugger=yes ;;
|
||||||
--disable-developer) _build_developer=no ;;
|
--disable-debugger) _build_debugger=no ;;
|
||||||
--enable-snapshot) _build_snapshot=yes ;;
|
--enable-snapshot) _build_snapshot=yes ;;
|
||||||
--disable-snapshot) _build_snapshot=no ;;
|
--disable-snapshot) _build_snapshot=no ;;
|
||||||
--enable-joystick) _build_joystick=yes ;;
|
--enable-joystick) _build_joystick=yes ;;
|
||||||
|
@ -701,11 +701,11 @@ else
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$_build_developer" = "yes" ; then
|
if test "$_build_debugger" = "yes" ; then
|
||||||
echo_n " Developer/debugger support enabled"
|
echo_n " Debugger support enabled"
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
echo_n " Developer/debugger support disabled"
|
echo_n " Debugger support disabled"
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -734,10 +734,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$_build_atarivox" = yes ; then
|
if test "$_build_atarivox" = yes ; then
|
||||||
echo_n " AtariVox support enabled"
|
echo_n " AtariVox support enabled (not yet working)"
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
echo_n " AtariVox support disabled"
|
echo_n " AtariVox support disabled (not yet working)"
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -860,8 +860,8 @@ if test "$_build_sound" = yes ; then
|
||||||
DEFINES="$DEFINES -DSOUND_SUPPORT"
|
DEFINES="$DEFINES -DSOUND_SUPPORT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$_build_developer" = yes ; then
|
if test "$_build_debugger" = yes ; then
|
||||||
DEFINES="$DEFINES -DDEVELOPER_SUPPORT"
|
DEFINES="$DEFINES -DDEBUGGER_SUPPORT"
|
||||||
MODULES="$MODULES $DBG $DBGGUI $YACC"
|
MODULES="$MODULES $DBG $DBGGUI $YACC"
|
||||||
INCLUDES="$INCLUDES -I$DBG -I$DBGGUI -I$YACC"
|
INCLUDES="$INCLUDES -I$DBG -I$DBGGUI -I$YACC"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -829,9 +829,9 @@ scaling.</li>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<p>If developer support was included in Stella, the following developer
|
<p>The following are useful to developers. Only use them if you know what
|
||||||
commandline arguments are also available. Note that in all cases,
|
you're doing! Note that in all cases, the values supplied to the arguments
|
||||||
the values supplied to the arguments are <b>not</b> case sensitive.</p>
|
are <b>not</b> case sensitive.</p>
|
||||||
|
|
||||||
<table BORDER=2>
|
<table BORDER=2>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -1572,9 +1572,6 @@ scaling.</li>
|
||||||
|
|
||||||
<p><b>Developer Keys (can't be remapped)</b></p>
|
<p><b>Developer Keys (can't be remapped)</b></p>
|
||||||
|
|
||||||
<p>The following keys are activated only if <b>developer</b> support has
|
|
||||||
been included:</p>
|
|
||||||
|
|
||||||
<table BORDER=2>
|
<table BORDER=2>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Function</th>
|
<th>Function</th>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <SDL.h>
|
#include <SDL.h>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
#error Unsupported platform!
|
#error Unsupported platform!
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ int main(int argc, char* argv[])
|
||||||
if(theOSystem->settings().getBool("holdbutton0"))
|
if(theOSystem->settings().getBool("holdbutton0"))
|
||||||
theOSystem->eventHandler().handleEvent(Event::JoystickZeroFire, 1);
|
theOSystem->eventHandler().handleEvent(Event::JoystickZeroFire, 1);
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
Debugger& dbg = theOSystem->debugger();
|
Debugger& dbg = theOSystem->debugger();
|
||||||
|
|
||||||
// Set up any breakpoint that was on the command line
|
// Set up any breakpoint that was on the command line
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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"
|
#include "bspf.hxx"
|
||||||
|
@ -252,7 +252,7 @@ string Debugger::loadListFile(string f) {
|
||||||
buffer[8] == ' ' &&
|
buffer[8] == ' ' &&
|
||||||
isxdigit(buffer[9]) &&
|
isxdigit(buffer[9]) &&
|
||||||
isxdigit(buffer[12]) &&
|
isxdigit(buffer[12]) &&
|
||||||
IS_BLANK(buffer[13]))
|
BSPF_isblank(buffer[13]))
|
||||||
{
|
{
|
||||||
count++;
|
count++;
|
||||||
char addr[5];
|
char addr[5];
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <fstream>
|
#include <fstream>
|
||||||
|
@ -177,7 +177,7 @@ int DebuggerParser::countCompletions(const char *in)
|
||||||
{
|
{
|
||||||
const char *l = commands[i].cmdString.c_str();
|
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 == "")
|
if(compPrefix == "")
|
||||||
compPrefix += l;
|
compPrefix += l;
|
||||||
else {
|
else {
|
||||||
|
@ -939,7 +939,7 @@ void DebuggerParser::executeHelp()
|
||||||
static char buf[256];
|
static char buf[256];
|
||||||
for(int i = 0; i < kNumCommands; ++i)
|
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].cmdString.c_str(),
|
||||||
commands[i].description.c_str());
|
commands[i].description.c_str());
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <fstream>
|
#include <fstream>
|
||||||
|
@ -444,7 +444,7 @@ int EquateList::countCompletions(const char *in)
|
||||||
{
|
{
|
||||||
const char *l = iter->first.c_str();
|
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 == "")
|
if(compPrefix == "")
|
||||||
compPrefix += l;
|
compPrefix += l;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
// Based on code from ScummVM - Scumm Interpreter
|
||||||
// Copyright (C) 2002-2004 The ScummVM project
|
// 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)
|
int PromptWidget::vprintf(const char *format, va_list argptr)
|
||||||
{
|
{
|
||||||
char buf[2048];
|
char buf[2048];
|
||||||
int count = VSNPRINTF(buf, sizeof(buf), format, argptr);
|
int count = BSPF_vsnprintf(buf, sizeof(buf), format, argptr);
|
||||||
|
|
||||||
print(buf);
|
print(buf);
|
||||||
return count;
|
return count;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <assert.h>
|
#include <assert.h>
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
#include "Snapshot.hxx"
|
#include "Snapshot.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
|
||||||
m6502 = new M6502Low(1);
|
m6502 = new M6502Low(1);
|
||||||
else
|
else
|
||||||
m6502 = new M6502High(1);
|
m6502 = new M6502High(1);
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
m6502->attach(myOSystem->debugger());
|
m6502->attach(myOSystem->debugger());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -419,7 +419,7 @@ void Console::initialize()
|
||||||
// Initialize the command menu system with updated values from the framebuffer
|
// Initialize the command menu system with updated values from the framebuffer
|
||||||
myOSystem->commandMenu().initialize();
|
myOSystem->commandMenu().initialize();
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
// Finally, initialize the debugging system, since it depends on the current ROM
|
// Finally, initialize the debugging system, since it depends on the current ROM
|
||||||
myOSystem->debugger().setConsole(this);
|
myOSystem->debugger().setConsole(this);
|
||||||
myOSystem->debugger().initialize();
|
myOSystem->debugger().initialize();
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <sstream>
|
#include <sstream>
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
#include "PropsSet.hxx"
|
#include "PropsSet.hxx"
|
||||||
#include "bspf.hxx"
|
#include "bspf.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -2246,7 +2246,7 @@ void EventHandler::leaveMenuMode()
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
bool EventHandler::enterDebugMode()
|
bool EventHandler::enterDebugMode()
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myState == S_DEBUGGER)
|
if(myState == S_DEBUGGER)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -2275,7 +2275,7 @@ bool EventHandler::enterDebugMode()
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
void EventHandler::leaveDebugMode()
|
void EventHandler::leaveDebugMode()
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
// paranoia: this should never happen:
|
// paranoia: this should never happen:
|
||||||
if(myState != S_DEBUGGER)
|
if(myState != S_DEBUGGER)
|
||||||
return;
|
return;
|
||||||
|
@ -2324,7 +2324,7 @@ void EventHandler::setEventState(State state)
|
||||||
myOverlay = &myOSystem->launcher();
|
myOverlay = &myOSystem->launcher();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
case S_DEBUGGER:
|
case S_DEBUGGER:
|
||||||
myOverlay = &myOSystem->debugger();
|
myOverlay = &myOSystem->debugger();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <sstream>
|
#include <sstream>
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
#include "Launcher.hxx"
|
#include "Launcher.hxx"
|
||||||
#include "OSystem.hxx"
|
#include "OSystem.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -195,7 +195,7 @@ void FrameBuffer::update()
|
||||||
break; // S_LAUNCHER
|
break; // S_LAUNCHER
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
case EventHandler::S_DEBUGGER:
|
case EventHandler::S_DEBUGGER:
|
||||||
{
|
{
|
||||||
myOSystem->debugger().draw();
|
myOSystem->debugger().draw();
|
||||||
|
@ -714,7 +714,7 @@ void FrameBuffer::getScaler(Scaler& scaler, int direction, const string& name)
|
||||||
int pos = -1;
|
int pos = -1;
|
||||||
for(unsigned int i = 0; i < myScalerList.size(); ++i)
|
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;
|
pos = i;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
#ifndef MEDIASOURCE_HXX
|
||||||
|
@ -30,7 +30,7 @@ class Sound;
|
||||||
This class provides an interface for accessing graphics and audio data.
|
This class provides an interface for accessing graphics and audio data.
|
||||||
|
|
||||||
@author Bradford W. Mott
|
@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
|
class MediaSource
|
||||||
{
|
{
|
||||||
|
@ -68,7 +68,7 @@ class MediaSource
|
||||||
*/
|
*/
|
||||||
virtual uInt8* previousFrameBuffer() const = 0;
|
virtual uInt8* previousFrameBuffer() const = 0;
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
/**
|
/**
|
||||||
This method should be called whenever a new scanline is to be drawn.
|
This method should be called whenever a new scanline is to be drawn.
|
||||||
Invoking this method will update the graphics buffer and generate
|
Invoking this method will update the graphics buffer and generate
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <cassert>
|
#include <cassert>
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include "MediaFactory.hxx"
|
#include "MediaFactory.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -116,7 +116,7 @@ OSystem::~OSystem()
|
||||||
// These must be deleted after all the others
|
// These must be deleted after all the others
|
||||||
// This is a bit hacky, since it depends on ordering
|
// This is a bit hacky, since it depends on ordering
|
||||||
// of d'tor calls
|
// of d'tor calls
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
delete myDebugger;
|
delete myDebugger;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CHEATCODE_SUPPORT
|
#ifdef CHEATCODE_SUPPORT
|
||||||
|
@ -139,7 +139,7 @@ bool OSystem::create()
|
||||||
myMenu = new Menu(this);
|
myMenu = new Menu(this);
|
||||||
myCommandMenu = new CommandMenu(this);
|
myCommandMenu = new CommandMenu(this);
|
||||||
myLauncher = new Launcher(this);
|
myLauncher = new Launcher(this);
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myDebugger = new Debugger(this);
|
myDebugger = new Debugger(this);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CHEATCODE_SUPPORT
|
#ifdef CHEATCODE_SUPPORT
|
||||||
|
@ -172,7 +172,7 @@ bool OSystem::create()
|
||||||
#ifdef SNAPSHOT_SUPPORT
|
#ifdef SNAPSHOT_SUPPORT
|
||||||
myFeatures += "Snapshot ";
|
myFeatures += "Snapshot ";
|
||||||
#endif
|
#endif
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myFeatures += "Debugger ";
|
myFeatures += "Debugger ";
|
||||||
#endif
|
#endif
|
||||||
#ifdef CHEATCODE_SUPPORT
|
#ifdef CHEATCODE_SUPPORT
|
||||||
|
@ -262,7 +262,7 @@ bool OSystem::createFrameBuffer(bool showmessage)
|
||||||
myLauncher->initializeVideo();
|
myLauncher->initializeVideo();
|
||||||
break; // S_LAUNCHER
|
break; // S_LAUNCHER
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
case EventHandler::S_DEBUGGER:
|
case EventHandler::S_DEBUGGER:
|
||||||
myDebugger->initializeVideo();
|
myDebugger->initializeVideo();
|
||||||
break; // S_DEBUGGER
|
break; // S_DEBUGGER
|
||||||
|
@ -453,7 +453,7 @@ bool OSystem::openROM(const string& rom, string& md5, uInt8** image, int* size)
|
||||||
// Grab 3-character extension
|
// Grab 3-character extension
|
||||||
char* ext = filename + strlen(filename) - 4;
|
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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
#ifndef OSYSTEM_HXX
|
||||||
|
@ -45,7 +45,7 @@ class VideoDialog;
|
||||||
other objects belong.
|
other objects belong.
|
||||||
|
|
||||||
@author Stephen Anthony
|
@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
|
class OSystem
|
||||||
{
|
{
|
||||||
|
@ -139,7 +139,7 @@ class OSystem
|
||||||
*/
|
*/
|
||||||
inline Launcher& launcher(void) const { return *myLauncher; }
|
inline Launcher& launcher(void) const { return *myLauncher; }
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
/**
|
/**
|
||||||
Get the ROM debugger of the system.
|
Get the ROM debugger of the system.
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <cassert>
|
#include <cassert>
|
||||||
|
@ -359,7 +359,7 @@ void Settings::usage()
|
||||||
#endif
|
#endif
|
||||||
<< " -listrominfo Display contents of stella.pro, one line per ROM entry\n"
|
<< " -listrominfo Display contents of stella.pro, one line per ROM entry\n"
|
||||||
<< " -help Show the text you're now reading\n"
|
<< " -help Show the text you're now reading\n"
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
<< endl
|
<< endl
|
||||||
<< " The following options are meant for developers\n"
|
<< " The following options are meant for developers\n"
|
||||||
<< " Arguments are more fully explained in the manual\n"
|
<< " Arguments are more fully explained in the manual\n"
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <cassert>
|
#include <cassert>
|
||||||
|
@ -589,7 +589,7 @@ inline void TIA::endFrame()
|
||||||
myFrameGreyed = false;
|
myFrameGreyed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
void TIA::updateScanline()
|
void TIA::updateScanline()
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
#ifndef TIA_HXX
|
||||||
|
@ -42,7 +42,7 @@ class Settings;
|
||||||
be displayed on screen.
|
be displayed on screen.
|
||||||
|
|
||||||
@author Bradford W. Mott
|
@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
|
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; }
|
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
|
This method should be called to update the media source with
|
||||||
a new scanline.
|
a new scanline.
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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"
|
#include "M6502.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Expression.hxx"
|
#include "Expression.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ M6502::M6502(uInt32 systemCyclesPerProcessorCycle)
|
||||||
mySystem(0),
|
mySystem(0),
|
||||||
mySystemCyclesPerProcessorCycle(systemCyclesPerProcessorCycle)
|
mySystemCyclesPerProcessorCycle(systemCyclesPerProcessorCycle)
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myDebugger = NULL;
|
myDebugger = NULL;
|
||||||
myBreakPoints = NULL;
|
myBreakPoints = NULL;
|
||||||
myReadTraps = NULL;
|
myReadTraps = NULL;
|
||||||
|
@ -56,7 +56,7 @@ M6502::M6502(uInt32 systemCyclesPerProcessorCycle)
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
M6502::~M6502()
|
M6502::~M6502()
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myBreakConds.clear();
|
myBreakConds.clear();
|
||||||
myBreakCondNames.clear();
|
myBreakCondNames.clear();
|
||||||
#endif
|
#endif
|
||||||
|
@ -352,7 +352,7 @@ const char* M6502::ourInstructionMnemonicTable[256] = {
|
||||||
"SED", "SBC", "nop", "isb", "nop", "SBC", "INC", "isb"
|
"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
|
// 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
|
// access they do (read, write, read/modify/write, or none). The
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
#ifndef M6502_HXX
|
||||||
|
@ -41,7 +41,7 @@ typedef Common::Array<Expression*> ExpressionList;
|
||||||
has a 64K addressing space.
|
has a 64K addressing space.
|
||||||
|
|
||||||
@author Bradford W. Mott
|
@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
|
class M6502
|
||||||
{
|
{
|
||||||
|
@ -188,7 +188,7 @@ class M6502
|
||||||
friend ostream& operator<<(ostream& out, const AddressingMode& mode);
|
friend ostream& operator<<(ostream& out, const AddressingMode& mode);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
/**
|
/**
|
||||||
Attach the specified debugger.
|
Attach the specified debugger.
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ class M6502
|
||||||
bool notZ; // Z flag complement for processor status register
|
bool notZ; // Z flag complement for processor status register
|
||||||
bool C; // C flag 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
|
/// Pointer to the debugger for this processor or the null pointer
|
||||||
Debugger* myDebugger;
|
Debugger* myDebugger;
|
||||||
|
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 "M6502Hi.hxx"
|
||||||
#include "Serializer.hxx"
|
#include "Serializer.hxx"
|
||||||
#include "Deserializer.hxx"
|
#include "Deserializer.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ M6502High::M6502High(uInt32 systemCyclesPerProcessorCycle)
|
||||||
myNumberOfDistinctAccesses = 0;
|
myNumberOfDistinctAccesses = 0;
|
||||||
myLastAddress = 0;
|
myLastAddress = 0;
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myJustHitTrapFlag = false;
|
myJustHitTrapFlag = false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ inline uInt8 M6502High::peek(uInt16 address)
|
||||||
}
|
}
|
||||||
mySystem->incrementCycles(mySystemCyclesPerProcessorCycle);
|
mySystem->incrementCycles(mySystemCyclesPerProcessorCycle);
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myReadTraps != NULL && myReadTraps->isSet(address))
|
if(myReadTraps != NULL && myReadTraps->isSet(address))
|
||||||
{
|
{
|
||||||
myJustHitTrapFlag = true;
|
myJustHitTrapFlag = true;
|
||||||
|
@ -78,7 +78,7 @@ inline void M6502High::poke(uInt16 address, uInt8 value)
|
||||||
}
|
}
|
||||||
mySystem->incrementCycles(mySystemCyclesPerProcessorCycle);
|
mySystem->incrementCycles(mySystemCyclesPerProcessorCycle);
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myWriteTraps != NULL && myWriteTraps->isSet(address))
|
if(myWriteTraps != NULL && myWriteTraps->isSet(address))
|
||||||
{
|
{
|
||||||
myJustHitTrapFlag = true;
|
myJustHitTrapFlag = true;
|
||||||
|
@ -105,7 +105,7 @@ bool M6502High::execute(uInt32 number)
|
||||||
uInt16 operandAddress = 0;
|
uInt16 operandAddress = 0;
|
||||||
uInt8 operand = 0;
|
uInt8 operand = 0;
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myJustHitTrapFlag)
|
if(myJustHitTrapFlag)
|
||||||
{
|
{
|
||||||
if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address))
|
if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address))
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 "M6502Low.hxx"
|
||||||
#include "Serializer.hxx"
|
#include "Serializer.hxx"
|
||||||
#include "Deserializer.hxx"
|
#include "Deserializer.hxx"
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
#include "Debugger.hxx"
|
#include "Debugger.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
M6502Low::M6502Low(uInt32 systemCyclesPerProcessorCycle)
|
M6502Low::M6502Low(uInt32 systemCyclesPerProcessorCycle)
|
||||||
: M6502(systemCyclesPerProcessorCycle)
|
: M6502(systemCyclesPerProcessorCycle)
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
myJustHitTrapFlag = false;
|
myJustHitTrapFlag = false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ M6502Low::~M6502Low()
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
inline uInt8 M6502Low::peek(uInt16 address)
|
inline uInt8 M6502Low::peek(uInt16 address)
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myReadTraps != NULL && myReadTraps->isSet(address))
|
if(myReadTraps != NULL && myReadTraps->isSet(address))
|
||||||
{
|
{
|
||||||
myJustHitTrapFlag = true;
|
myJustHitTrapFlag = true;
|
||||||
|
@ -60,7 +60,7 @@ inline uInt8 M6502Low::peek(uInt16 address)
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
inline void M6502Low::poke(uInt16 address, uInt8 value)
|
inline void M6502Low::poke(uInt16 address, uInt8 value)
|
||||||
{
|
{
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myWriteTraps != NULL && myWriteTraps->isSet(address))
|
if(myWriteTraps != NULL && myWriteTraps->isSet(address))
|
||||||
{
|
{
|
||||||
myJustHitTrapFlag = true;
|
myJustHitTrapFlag = true;
|
||||||
|
@ -87,7 +87,7 @@ bool M6502Low::execute(uInt32 number)
|
||||||
uInt16 operandAddress = 0;
|
uInt16 operandAddress = 0;
|
||||||
uInt8 operand = 0;
|
uInt8 operand = 0;
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(myJustHitTrapFlag)
|
if(myJustHitTrapFlag)
|
||||||
{
|
{
|
||||||
if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address))
|
if(myDebugger->start(myHitTrapInfo.message, myHitTrapInfo.address))
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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 <assert.h>
|
#include <assert.h>
|
||||||
|
@ -318,7 +318,7 @@ uInt8 System::peek(uInt16 addr)
|
||||||
result = access.device->peek(addr);
|
result = access.device->peek(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(!myDataBusLocked)
|
if(!myDataBusLocked)
|
||||||
#endif
|
#endif
|
||||||
myDataBusState = result;
|
myDataBusState = result;
|
||||||
|
@ -341,7 +341,7 @@ void System::poke(uInt16 addr, uInt8 value)
|
||||||
access.device->poke(addr, value);
|
access.device->poke(addr, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEVELOPER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
if(!myDataBusLocked)
|
if(!myDataBusLocked)
|
||||||
#endif
|
#endif
|
||||||
myDataBusState = value;
|
myDataBusState = value;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// See the file "license" for information on usage and redistribution of
|
// See the file "license" for information on usage and redistribution of
|
||||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
// 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
|
#ifndef BSPF_HXX
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
that need to be defined for different operating systems.
|
that need to be defined for different operating systems.
|
||||||
|
|
||||||
@author Bradford W. Mott
|
@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
|
// Types for 8-bit signed and unsigned integers
|
||||||
|
@ -75,20 +75,19 @@ typedef unsigned int uInt32;
|
||||||
|
|
||||||
// I wish Windows had a complete POSIX layer
|
// I wish Windows had a complete POSIX layer
|
||||||
#ifdef BSPF_WIN32
|
#ifdef BSPF_WIN32
|
||||||
#define STR_CASE_CMP stricmp
|
#define BSPF_strcasecmp stricmp
|
||||||
#define STR_N_CASE_CMP strnicmp
|
#define BSPF_strncasecmp strnicmp
|
||||||
#define IS_BLANK(c) ((c == ' ') || (c == '\t'))
|
#define BSPF_isblank(c) ((c == ' ') || (c == '\t'))
|
||||||
#define SNPRINTF _snprintf
|
#define BSPF_snprintf _snprintf
|
||||||
#define VSNPRINTF _vsnprintf
|
#define BSPF_vsnprintf _vsnprintf
|
||||||
#else
|
#else
|
||||||
#define STR_CASE_CMP strcasecmp
|
#define BSPF_strcasecmp strcasecmp
|
||||||
#define STR_N_CASE_CMP strncasecmp
|
#define BSPF_strncasecmp strncasecmp
|
||||||
#define IS_BLANK(c) isblank(c)
|
#define BSPF_isblank(c) isblank(c)
|
||||||
#define SNPRINTF snprintf
|
#define BSPF_snprintf snprintf
|
||||||
#define VSNPRINTF vsnprintf
|
#define BSPF_vsnprintf vsnprintf
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32_WCE
|
#ifdef _WIN32_WCE
|
||||||
#include "missing.h"
|
#include "missing.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -242,7 +242,7 @@
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = "$(HOME)/Applications";
|
||||||
LIBRARY_SEARCH_PATHS = .;
|
LIBRARY_SEARCH_PATHS = .;
|
||||||
OPTIMIZATION_CFLAGS = "-O3";
|
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";
|
OTHER_LDFLAGS = "-framework SDL -lz";
|
||||||
PRODUCT_NAME = StellaOSX;
|
PRODUCT_NAME = StellaOSX;
|
||||||
SECTORDER_FLAGS = "";
|
SECTORDER_FLAGS = "";
|
||||||
|
|
|
@ -1729,7 +1729,7 @@
|
||||||
SOUND_SUPPORT,
|
SOUND_SUPPORT,
|
||||||
DISPLAY_OPENGL,
|
DISPLAY_OPENGL,
|
||||||
CHEATCODE_SUPPORT,
|
CHEATCODE_SUPPORT,
|
||||||
DEVELOPER_SUPPORT,
|
DEBUGGER_SUPPORT,
|
||||||
HAVE_GETTIMEOFDAY,
|
HAVE_GETTIMEOFDAY,
|
||||||
SNAPSHOT_SUPPORT,
|
SNAPSHOT_SUPPORT,
|
||||||
BSPF_MAC_OSX,
|
BSPF_MAC_OSX,
|
||||||
|
@ -1787,7 +1787,7 @@
|
||||||
SOUND_SUPPORT,
|
SOUND_SUPPORT,
|
||||||
DISPLAY_OPENGL,
|
DISPLAY_OPENGL,
|
||||||
CHEATCODE_SUPPORT,
|
CHEATCODE_SUPPORT,
|
||||||
DEVELOPER_SUPPORT,
|
DEBUGGER_SUPPORT,
|
||||||
HAVE_GETTIMEOFDAY,
|
HAVE_GETTIMEOFDAY,
|
||||||
SNAPSHOT_SUPPORT,
|
SNAPSHOT_SUPPORT,
|
||||||
BSPF_MAC_OSX,
|
BSPF_MAC_OSX,
|
||||||
|
@ -1843,7 +1843,7 @@
|
||||||
SOUND_SUPPORT,
|
SOUND_SUPPORT,
|
||||||
DISPLAY_OPENGL,
|
DISPLAY_OPENGL,
|
||||||
CHEATCODE_SUPPORT,
|
CHEATCODE_SUPPORT,
|
||||||
DEVELOPER_SUPPORT,
|
DEBUGGER_SUPPORT,
|
||||||
HAVE_GETTIMEOFDAY,
|
HAVE_GETTIMEOFDAY,
|
||||||
SNAPSHOT_SUPPORT,
|
SNAPSHOT_SUPPORT,
|
||||||
BSPF_MAC_OSX,
|
BSPF_MAC_OSX,
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
%define enable_gl 1
|
%define enable_gl 1
|
||||||
%define enable_sound 1
|
%define enable_sound 1
|
||||||
%define enable_developer 1
|
%define enable_debugger 1
|
||||||
%define enable_snapshot 1
|
%define enable_snapshot 1
|
||||||
%define enable_joystick 1
|
%define enable_joystick 1
|
||||||
%define enable_cheats 1
|
%define enable_cheats 1
|
||||||
|
@ -58,10 +58,10 @@ export CXXFLAGS=$RPM_OPT_FLAGS
|
||||||
%else
|
%else
|
||||||
--disable-sound \
|
--disable-sound \
|
||||||
%endif
|
%endif
|
||||||
%if %enable_developer
|
%if %enable_debugger
|
||||||
--enable-developer \
|
--enable-debugger \
|
||||||
%else
|
%else
|
||||||
--disable-developer \
|
--disable-debugger \
|
||||||
%endif
|
%endif
|
||||||
%if %enable_snapshot
|
%if %enable_snapshot
|
||||||
--enable-snapshot \
|
--enable-snapshot \
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
|
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"
|
MinimalRebuild="TRUE"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
|
@ -73,7 +73,7 @@ SDLmain.lib
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
|
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
|
||||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="2"
|
WarningLevel="2"
|
||||||
|
|
Loading…
Reference in New Issue