[Gnash-commit] gnash ChangeLog server/debugger.cpp server/debu...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/06 08:22:44

Modified files:
        .              : ChangeLog 
        server         : debugger.cpp debugger.h 

Log message:
                * server/debugger.{h,cpp}: use unsigned types for register 
indexes;
                  properly accept *const* string refs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2542&r2=1.2543
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2542
retrieving revision 1.2543
diff -u -b -r1.2542 -r1.2543
--- ChangeLog   5 Mar 2007 22:58:51 -0000       1.2542
+++ ChangeLog   6 Mar 2007 08:22:43 -0000       1.2543
@@ -1,3 +1,8 @@
+2007-03-06 Sandro Santilli <address@hidden>
+
+       * server/debugger.{h,cpp}: use unsigned types for register indexes;
+         properly accept *const* string refs.
+
 2007-03-05 Sandro Santilli <address@hidden>
 
        * utilities/processor.cpp: don't call gnash::clear, I suspect

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/debugger.cpp 2 Mar 2007 15:50:42 -0000       1.12
+++ server/debugger.cpp 6 Mar 2007 08:22:43 -0000       1.13
@@ -406,14 +406,14 @@
 }
 
 void
-Debugger::setBreakPoint(std::string &func, bool enabled)
+Debugger::setBreakPoint(const std::string &func, bool enabled)
 {
 //    GNASH_REPORT_FUNCTION;
     _breakpoints[func] = enabled;
 }
 
 void
-Debugger::removeBreakPoint(std::string &func)
+Debugger::removeBreakPoint(const std::string &func)
 {
 //    GNASH_REPORT_FUNCTION;
     
@@ -445,7 +445,7 @@
 }
 
 bool
-Debugger::matchBreakPoint(std::string &func, bool state)
+Debugger::matchBreakPoint(const std::string &func, bool state)
 {
 //    GNASH_REPORT_FUNCTION;
     std::map<std::string, bool>::const_iterator it;
@@ -650,31 +650,29 @@
 
 // Change the value of a local variable
 void
-Debugger::changeLocalRegister(int index, as_value &val)
+Debugger::changeLocalRegister(unsigned index, as_value &val)
 {
 //    GNASH_REPORT_FUNCTION;
-    this->changeLocalRegister(*_env, index, val);
+    changeLocalRegister(*_env, index, val);
 }
 
 void
-Debugger::changeLocalRegister(as_environment &env, int index, as_value &val)
+Debugger::changeLocalRegister(as_environment &env, unsigned index, as_value 
&val)
 {
 //    GNASH_REPORT_FUNCTION;
-    if (index <= env.num_local_registers()) {
-       env.set_local_register(static_cast<uint8_t>(index), val);
-    }
+       env.set_local_register(index, val);
 }   
 
 // Change the value of a global variable
 void
-Debugger::changeGlobalRegister(int index, as_value &val)
+Debugger::changeGlobalRegister(unsigned index, as_value &val)
 {
 //    GNASH_REPORT_FUNCTION;
     this->changeLocalRegister(*_env, index, val);
 }
 
 void
-Debugger::changeGlobalRegister(as_environment &env, int index, as_value &val)
+Debugger::changeGlobalRegister(as_environment &env, unsigned index, as_value 
&val)
 {
 //    GNASH_REPORT_FUNCTION;
     env.set_global_register(index, val);

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/debugger.h   2 Mar 2007 15:50:42 -0000       1.7
+++ server/debugger.h   6 Mar 2007 08:22:44 -0000       1.8
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: debugger.h,v 1.7 2007/03/02 15:50:42 strk Exp $ */
+/* $Id: debugger.h,v 1.8 2007/03/06 08:22:44 strk Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -50,11 +50,11 @@
 
     void dissasemble(const unsigned char *data);
     void dissasemble();
-    void setBreakPoint(std::string &var, bool enabled);
-    void removeBreakPoint(std::string &var);
+    void setBreakPoint(const std::string &var, bool enabled);
+    void removeBreakPoint(const std::string &var);
     void dumpBreakPoints();
     /// Does the function name match any breakpoints ?
-    bool matchBreakPoint(std::string &var, bool);
+    bool matchBreakPoint(const std::string &var, bool);
 
     /// Set a watchpoint of a variable. Gnash stops and generates a
     /// command prompt when there is a match.
@@ -122,14 +122,14 @@
     void changeLocalVariable(as_environment &env, std::string &var, as_value 
&val);
     
     // Change the value of a local variable
-    void changeLocalRegister(int index, as_value &val);
-    void changeLocalRegister(as_environment &env, int index, as_value &val);
+    void changeLocalRegister(unsigned index, as_value &val);
+    void changeLocalRegister(as_environment &env, unsigned index, as_value 
&val);
     
     // Change the value of a local variable
-    void changeGlobalRegister(int index, as_value &val);
-    void changeGlobalRegister(as_environment &env, int index, as_value &val);
+    void changeGlobalRegister(unsigned index, as_value &val);
+    void changeGlobalRegister(as_environment &env, unsigned index, as_value 
&val);
 
-    void callStackPush(std::string &str) { _callstack.push_back(str); };
+    void callStackPush(const std::string &str) { _callstack.push_back(str); };
     void callStackPop() { _callstack.pop_back(); };
     void callStackDump();
     std::string &callStackFrame() { return _callstack.back(); };