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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/02 15:50:42

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

Log message:
                * server/debugger.{cpp,h}: proxy local variables and
                  registers dumping to as_environment funx.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2513&r2=1.2514
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2513
retrieving revision 1.2514
diff -u -b -r1.2513 -r1.2514
--- ChangeLog   2 Mar 2007 15:30:04 -0000       1.2513
+++ ChangeLog   2 Mar 2007 15:50:41 -0000       1.2514
@@ -1,3 +1,8 @@
+2007-03-02 Sandro Santilli <address@hidden>
+
+       * server/debugger.{cpp,h}: proxy local variables and
+         registers dumping to as_environment funx.
+
 2007-03-02 Udo Giacomozzi <address@hidden>
 
        * testsuite/libgeometry/snappingrangetest.cpp: Testcase for snapping 

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/debugger.cpp 11 Feb 2007 06:21:29 -0000      1.11
+++ server/debugger.cpp 2 Mar 2007 15:50:42 -0000       1.12
@@ -605,18 +605,7 @@
 Debugger::dumpLocalRegisters(as_environment &env)
 {
 //    GNASH_REPORT_FUNCTION;
-    if (!_env) {
-       dbglogfile << "WARNING: environment not set in " << __PRETTY_FUNCTION__ 
<< endl;
-       return;
-    }
-    size_t n=env.num_local_registers();
-    if ( ! n ) {
-        return;
-    }
-    dbglogfile << "Local Register Dump: " << endl;
-    for (unsigned int i=0; i<n; i++) {
-        cerr << "\treg #" << i << ": \"" << env.local_register(i).to_string() 
<< "\"" << endl;
-    }
+       env.dump_local_registers(cerr);
 }
 
 void
@@ -701,25 +690,7 @@
 void
 Debugger::dumpLocalVariables(as_environment &env)
 {
-//    GNASH_REPORT_FUNCTION;
-    if (!_env) {
-       dbglogfile << "WARNING: environment not set in " << __PRETTY_FUNCTION__ 
<< endl;
-       return;
-    }
-    int index = 0;
-    dbglogfile << "Local variable Dump:" << endl;
-    as_environment::frame_slot slot;
-    for (size_t i = 0, n=env.get_local_frame_top(); i < n; ++i) {
-        slot  = env.m_local_frames[i];
-       string var = slot.m_value.to_std_string();
-       cerr << "\tvar #" << index << ": ";
-       if (slot.m_name.size()) {
-           cerr << slot.m_name << " = \"" << var << "\"" << endl;
-       } else {
-           cerr << "\"null\"" << " = " << var << endl;
-       }
-       index++;
-    }
+       env.dump_local_variables(cerr);
 }
 
 /// Get the address associated with a name

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/debugger.h   12 Feb 2007 12:20:07 -0000      1.6
+++ server/debugger.h   2 Mar 2007 15:50:42 -0000       1.7
@@ -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.6 2007/02/12 12:20:07 nihilus Exp $ */
+/* $Id: debugger.h,v 1.7 2007/03/02 15:50:42 strk Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -72,11 +72,11 @@
     // These functions manipulate the environment stack
     void dumpStackFrame(as_environment &env);
     void dumpStackFrame();
-    void dumpLocalRegisters(as_environment &env);
+    static void dumpLocalRegisters(as_environment &env);
     void dumpLocalRegisters();
     void dumpGlobalRegisters(as_environment &env);
     void dumpGlobalRegisters();
-    void dumpLocalVariables(as_environment &env);
+    static void dumpLocalVariables(as_environment &env);
     void dumpLocalVariables();
     void setEnvStack(as_environment *x) { _env = x; };
     as_environment *getEnvStack() { return _env; };