diff --git a/stella/src/debugger/BinAndExpression.cxx b/stella/src/debugger/BinAndExpression.cxx
new file mode 100644
index 000000000..138f4cafb
--- /dev/null
+++ b/stella/src/debugger/BinAndExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinAndExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "BinAndExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+BinAndExpression::BinAndExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/BinAndExpression.hxx b/stella/src/debugger/BinAndExpression.hxx
new file mode 100644
index 000000000..650485f39
--- /dev/null
+++ b/stella/src/debugger/BinAndExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinAndExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef BINAND_EXPRESSION_HXX
+#define BINAND_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: BinAndExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class BinAndExpression : public Expression
+{
+  public:
+    BinAndExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() & myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/BinOrExpression.cxx b/stella/src/debugger/BinOrExpression.cxx
new file mode 100644
index 000000000..2becf5d68
--- /dev/null
+++ b/stella/src/debugger/BinOrExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinOrExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "BinOrExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+BinOrExpression::BinOrExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/BinOrExpression.hxx b/stella/src/debugger/BinOrExpression.hxx
new file mode 100644
index 000000000..7e8cbca33
--- /dev/null
+++ b/stella/src/debugger/BinOrExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinOrExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef BINOR_EXPRESSION_HXX
+#define BINOR_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: BinOrExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class BinOrExpression : public Expression
+{
+  public:
+    BinOrExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() | myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/BinXorExpression.cxx b/stella/src/debugger/BinXorExpression.cxx
new file mode 100644
index 000000000..9eaee8b58
--- /dev/null
+++ b/stella/src/debugger/BinXorExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinXorExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "BinXorExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+BinXorExpression::BinXorExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/BinXorExpression.hxx b/stella/src/debugger/BinXorExpression.hxx
new file mode 100644
index 000000000..143a32095
--- /dev/null
+++ b/stella/src/debugger/BinXorExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: BinXorExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef BINXOR_EXPRESSION_HXX
+#define BINXOR_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: BinXorExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class BinXorExpression : public Expression
+{
+  public:
+    BinXorExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() ^ myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/DivExpression.cxx b/stella/src/debugger/DivExpression.cxx
new file mode 100644
index 000000000..5b03c6119
--- /dev/null
+++ b/stella/src/debugger/DivExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: DivExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "DivExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+DivExpression::DivExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/DivExpression.hxx b/stella/src/debugger/DivExpression.hxx
new file mode 100644
index 000000000..a4021d49d
--- /dev/null
+++ b/stella/src/debugger/DivExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: DivExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef DIV_EXPRESSION_HXX
+#define DIV_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: DivExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class DivExpression : public Expression
+{
+  public:
+    DivExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() / myRHS->evaluate(); } // FIXME: div by zero?
+};
+
+#endif
+
diff --git a/stella/src/debugger/EqualsExpression.hxx b/stella/src/debugger/EqualsExpression.hxx
index d7fdd4604..de2533520 100644
--- a/stella/src/debugger/EqualsExpression.hxx
+++ b/stella/src/debugger/EqualsExpression.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: EqualsExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+// $Id: EqualsExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 //============================================================================
 
 #ifndef EQUALS_EXPRESSION_HXX
@@ -22,11 +22,8 @@
 #include "Expression.hxx"
 
 /**
-  This class provides an implementation of an constant expression;
-  that is, one that consists solely of a constant integer value.
-
   @author  B. Watson
-  @version $Id: EqualsExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+  @version $Id: EqualsExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 */
 class EqualsExpression : public Expression
 {
diff --git a/stella/src/debugger/LogAndExpression.cxx b/stella/src/debugger/LogAndExpression.cxx
new file mode 100644
index 000000000..b48596604
--- /dev/null
+++ b/stella/src/debugger/LogAndExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: LogAndExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "LogAndExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+LogAndExpression::LogAndExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/LogAndExpression.hxx b/stella/src/debugger/LogAndExpression.hxx
new file mode 100644
index 000000000..aff1cab77
--- /dev/null
+++ b/stella/src/debugger/LogAndExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: LogAndExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef LOGAND_EXPRESSION_HXX
+#define LOGAND_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: LogAndExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class LogAndExpression : public Expression
+{
+  public:
+    LogAndExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() && myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/LogOrExpression.cxx b/stella/src/debugger/LogOrExpression.cxx
new file mode 100644
index 000000000..99e9bf5e4
--- /dev/null
+++ b/stella/src/debugger/LogOrExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: LogOrExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "LogOrExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+LogOrExpression::LogOrExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/LogOrExpression.hxx b/stella/src/debugger/LogOrExpression.hxx
new file mode 100644
index 000000000..85a098061
--- /dev/null
+++ b/stella/src/debugger/LogOrExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: LogOrExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef LOGOR_EXPRESSION_HXX
+#define LOGOR_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: LogOrExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class LogOrExpression : public Expression
+{
+  public:
+    LogOrExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() || myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/MinusExpression.hxx b/stella/src/debugger/MinusExpression.hxx
index 8cf197ba9..53832f936 100644
--- a/stella/src/debugger/MinusExpression.hxx
+++ b/stella/src/debugger/MinusExpression.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: MinusExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+// $Id: MinusExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 //============================================================================
 
 #ifndef MINUS_EXPRESSION_HXX
@@ -22,11 +22,8 @@
 #include "Expression.hxx"
 
 /**
-  This class provides an implementation of an constant expression;
-  that is, one that consists solely of a constant integer value.
-
   @author  B. Watson
-  @version $Id: MinusExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+  @version $Id: MinusExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 */
 class MinusExpression : public Expression
 {
diff --git a/stella/src/debugger/ModExpression.cxx b/stella/src/debugger/ModExpression.cxx
new file mode 100644
index 000000000..266959b56
--- /dev/null
+++ b/stella/src/debugger/ModExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: ModExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "ModExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ModExpression::ModExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/ModExpression.hxx b/stella/src/debugger/ModExpression.hxx
new file mode 100644
index 000000000..82a1e597e
--- /dev/null
+++ b/stella/src/debugger/ModExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: ModExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef MOD_EXPRESSION_HXX
+#define MOD_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: ModExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class ModExpression : public Expression
+{
+  public:
+    ModExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() % myRHS->evaluate(); } // FIXME: div by zero?
+};
+
+#endif
+
diff --git a/stella/src/debugger/MultExpression.cxx b/stella/src/debugger/MultExpression.cxx
new file mode 100644
index 000000000..7a19c4c40
--- /dev/null
+++ b/stella/src/debugger/MultExpression.cxx
@@ -0,0 +1,27 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: MultExpression.cxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#include "Expression.hxx"
+#include "MultExpression.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+MultExpression::MultExpression(Expression *left, Expression *right)
+  : Expression(left, right)
+{
+}
+
diff --git a/stella/src/debugger/MultExpression.hxx b/stella/src/debugger/MultExpression.hxx
new file mode 100644
index 000000000..7ea41e604
--- /dev/null
+++ b/stella/src/debugger/MultExpression.hxx
@@ -0,0 +1,36 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: MultExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+//============================================================================
+
+#ifndef MULT_EXPRESSION_HXX
+#define MULT_EXPRESSION_HXX
+
+#include "Expression.hxx"
+
+/**
+  @author  B. Watson
+  @version $Id: MultExpression.hxx,v 1.1 2005-07-13 04:26:19 urchlay Exp $
+*/
+class MultExpression : public Expression
+{
+  public:
+    MultExpression(Expression *left, Expression *right);
+    int evaluate() { return myLHS->evaluate() * myRHS->evaluate(); }
+};
+
+#endif
+
diff --git a/stella/src/debugger/PlusExpression.hxx b/stella/src/debugger/PlusExpression.hxx
index 95dc1810a..3a3ac5546 100644
--- a/stella/src/debugger/PlusExpression.hxx
+++ b/stella/src/debugger/PlusExpression.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: PlusExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+// $Id: PlusExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 //============================================================================
 
 #ifndef PLUS_EXPRESSION_HXX
@@ -22,11 +22,8 @@
 #include "Expression.hxx"
 
 /**
-  This class provides an implementation of an constant expression;
-  that is, one that consists solely of a constant integer value.
-
   @author  B. Watson
-  @version $Id: PlusExpression.hxx,v 1.1 2005-07-13 02:54:13 urchlay Exp $
+  @version $Id: PlusExpression.hxx,v 1.2 2005-07-13 04:26:19 urchlay Exp $
 */
 class PlusExpression : public Expression
 {
diff --git a/stella/src/debugger/module.mk b/stella/src/debugger/module.mk
index eb070438e..2c3cfb9ea 100644
--- a/stella/src/debugger/module.mk
+++ b/stella/src/debugger/module.mk
@@ -9,6 +9,14 @@ MODULE_OBJS := \
 	src/debugger/EqualsExpression.o \
 	src/debugger/PlusExpression.o \
 	src/debugger/MinusExpression.o \
+	src/debugger/MultExpression.o \
+	src/debugger/DivExpression.o \
+	src/debugger/ModExpression.o \
+	src/debugger/LogAndExpression.o \
+	src/debugger/LogOrExpression.o \
+	src/debugger/BinAndExpression.o \
+	src/debugger/BinOrExpression.o \
+	src/debugger/BinXorExpression.o \
 	src/debugger/PackedBitArray.o \
 	src/debugger/CpuDebug.o \
 	src/debugger/RamDebug.o \