From 2f11619e78c411d5e7999c30b1e3bd2798550ddd Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 11 Oct 2010 23:32:37 +0000
Subject: [PATCH] The emulation core now tracks writes to PF0/PF1/PF2 as well
 as GRPx, marking them as GFX.  Still TODO is somehow differentiate these
 (based on block, colour, etc).  Also requires testing to see if this slows
 down the emulation too much.

Removed un-implemented debugger console commands to query the last
addresses used in the A/X/Y registers, since they're going to be added
to the debugger UI itself in the CPU area.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2153 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/debugger/DebuggerParser.cxx | 64 ---------------------------------
 src/debugger/DebuggerParser.hxx |  6 +---
 src/emucore/M6502.ins           |  8 +++--
 src/emucore/M6502.m4            |  4 ++-
 4 files changed, 9 insertions(+), 73 deletions(-)

diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx
index 57b23bde9..f1b485907 100644
--- a/src/debugger/DebuggerParser.cxx
+++ b/src/debugger/DebuggerParser.cxx
@@ -1043,34 +1043,6 @@ void DebuggerParser::executeJump()
     commandResult << "address $" << HEX4 << args[0] << " doesn't exist";
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// "lastaddr"
-void DebuggerParser::executeLastAddress()
-{
-  commandResult << red("not implemented yet");
-}
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// "lasta"
-void DebuggerParser::executeLastAccAddress()
-{
-  commandResult << red("not implemented yet");
-}
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// "lastx"
-void DebuggerParser::executeLastXAddress()
-{
-  commandResult << red("not implemented yet");
-}
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// "lasty"
-void DebuggerParser::executeLastYAddress()
-{
-  commandResult << red("not implemented yet");
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // "listbreaks"
 void DebuggerParser::executeListbreaks()
@@ -1834,42 +1806,6 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = {
     &DebuggerParser::executeJump
   },
 
-  {
-    "lastaddr",
-    "Show last accessed address",
-    false,
-    false,
-    { kARG_END_ARGS },
-    &DebuggerParser::executeLastAddress
-  },
-
-  {
-    "lasta",
-    "Show last accessed address for accumulator",
-    false,
-    false,
-    { kARG_END_ARGS },
-    &DebuggerParser::executeLastAccAddress
-  },
-
-  {
-    "lastx",
-    "Show last accessed address for register X",
-    false,
-    false,
-    { kARG_END_ARGS },
-    &DebuggerParser::executeLastXAddress
-  },
-
-  {
-    "lasty",
-    "Show last accessed address for register Y",
-    false,
-    false,
-    { kARG_END_ARGS },
-    &DebuggerParser::executeLastYAddress
-  },
-
   {
     "listbreaks",
     "List breakpoints",
diff --git a/src/debugger/DebuggerParser.hxx b/src/debugger/DebuggerParser.hxx
index c378a139b..ef4e15ec9 100644
--- a/src/debugger/DebuggerParser.hxx
+++ b/src/debugger/DebuggerParser.hxx
@@ -83,7 +83,7 @@ class DebuggerParser
 
   private:
     enum {
-      kNumCommands   = 70,
+      kNumCommands   = 66,
       kMAX_ARG_TYPES = 10
     };
 
@@ -162,10 +162,6 @@ class DebuggerParser
     void executeGfx();
     void executeHelp();
     void executeJump();
-    void executeLastAddress();
-    void executeLastAccAddress();
-    void executeLastXAddress();
-    void executeLastYAddress();
     void executeListbreaks();
     void executeListconfig();
     void executeListfunctions();
diff --git a/src/emucore/M6502.ins b/src/emucore/M6502.ins
index 1391b3c61..94f0f3691 100644
--- a/src/emucore/M6502.ins
+++ b/src/emucore/M6502.ins
@@ -14,7 +14,7 @@
 // See the file "License.txt" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: M6502.m4 2151 2010-10-11 15:11:10Z stephena $
+// $Id: M6502.m4 2152 2010-10-11 23:06:37Z stephena $
 //============================================================================
 
 /** 
@@ -24,7 +24,7 @@
     'm4 M6502.m4 > M6502.ins'
 
   @author  Bradford W. Mott
-  @version $Id: M6502.m4 2151 2010-10-11 15:11:10Z stephena $
+  @version $Id: M6502.m4 2152 2010-10-11 23:06:37Z stephena $
 */
 
 #ifndef NOTSAMEPAGE
@@ -50,7 +50,9 @@
 #ifndef CHECK_GFX_WRITE
   #ifdef DEBUGGER_SUPPORT
     #define CHECK_GFX_WRITE(_addr) \
-    if((operandAddress == 0x1B || operandAddress == 0x1C) && _addr) \
+    if((operandAddress == 0x1B || operandAddress == 0x1C || \
+        operandAddress == 0x0D || operandAddress == 0x0E || operandAddress == 0x0F) && \
+        _addr) \
       mySystem->setAddressDisasmType(_addr, DISASM_GFX);
   #else
     #define CHECK_GFX_WRITE(_addr)
diff --git a/src/emucore/M6502.m4 b/src/emucore/M6502.m4
index 57202b8ee..34ef7d7ab 100644
--- a/src/emucore/M6502.m4
+++ b/src/emucore/M6502.m4
@@ -50,7 +50,9 @@
 #ifndef CHECK_GFX_WRITE
   #ifdef DEBUGGER_SUPPORT
     #define CHECK_GFX_WRITE(_addr) \
-    if((operandAddress == 0x1B || operandAddress == 0x1C) && _addr) \
+    if((operandAddress == 0x1B || operandAddress == 0x1C || \
+        operandAddress == 0x0D || operandAddress == 0x0E || operandAddress == 0x0F) && \
+        _addr) \
       mySystem->setAddressDisasmType(_addr, DISASM_GFX);
   #else
     #define CHECK_GFX_WRITE(_addr)