[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/15 00:06:02

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp as_environment.h 
        server/vm      : ActionExec.cpp 

Log message:
                * server/as_environment.{cpp,h}: add dump_local_variables
                  method.
                * server/vm/ActionExec.cpp: include dump of local variables
                  IF_VERBOSE_ACTION.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1941&r2=1.1942
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1941
retrieving revision 1.1942
diff -u -b -r1.1941 -r1.1942
--- ChangeLog   14 Dec 2006 19:48:30 -0000      1.1941
+++ ChangeLog   15 Dec 2006 00:06:02 -0000      1.1942
@@ -1,5 +1,12 @@
 2006-12-14 Sandro Santilli <address@hidden>
 
+       * server/as_environment.{cpp,h}: add dump_local_variables
+         method.
+       * server/vm/ActionExec.cpp: include dump of local variables
+         IF_VERBOSE_ACTION.
+
+2006-12-14 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/Function.as: re-enabled
          lots of tests that were commented out with previous
          commit of this file (Oops).

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/as_environment.cpp   14 Dec 2006 14:06:06 -0000      1.41
+++ server/as_environment.cpp   15 Dec 2006 00:06:02 -0000      1.42
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.41 2006/12/14 14:06:06 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.42 2006/12/15 00:06:02 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -545,6 +545,26 @@
 }
 
 void
+as_environment::dump_local_variables(std::ostream& out) const
+{
+       out << "Local variables:";
+       size_t cnt=0;
+       for (size_t i = 0, n=m_local_frames.size(); i < n; ++i)
+       {
+               const frame_slot& slot = m_local_frames[i];
+               if ( slot.m_name.empty() ) {
+                       out << " |";
+                       cnt=0;
+               } else {
+                       if (cnt) out << "," << slot.m_name;
+                       else out << " " << slot.m_name;
+                       ++cnt;
+               }
+       }
+       out << std::endl;
+}
+
+void
 as_environment::dump_global_registers(std::ostream& out) const
 {
        std::string registers;

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/as_environment.h     14 Dec 2006 14:06:06 -0000      1.31
+++ server/as_environment.h     15 Dec 2006 00:06:02 -0000      1.32
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: as_environment.h,v 1.31 2006/12/14 14:06:06 strk Exp $ */
+/* $Id: as_environment.h,v 1.32 2006/12/15 00:06:02 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -260,6 +260,9 @@
        /// Dump the global registers to a std::ostream
        void dump_global_registers(std::ostream& out=std::cerr) const;
 
+       /// Dump the local variables to a std::ostream
+       void dump_local_variables(std::ostream& out=std::cerr) const;
+
        /// Return the SWF version we're running for.
        //
        /// TODO: check what to return when playing multiple

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/vm/ActionExec.cpp    14 Dec 2006 19:47:08 -0000      1.5
+++ server/vm/ActionExec.cpp    15 Dec 2006 00:06:02 -0000      1.6
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ActionExec.cpp,v 1.5 2006/12/14 19:47:08 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.6 2006/12/15 00:06:02 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -132,6 +132,7 @@
                env.dump_stack(ss);
                env.dump_global_registers(ss);
                env.dump_local_registers(ss);
+               env.dump_local_variables(ss);
                log_action("%s", ss.str().c_str());
        );
 #endif
@@ -182,6 +183,7 @@
                env.dump_stack(ss);
                env.dump_global_registers(ss);
                env.dump_local_registers(ss);
+               env.dump_local_variables(ss);
                log_action("%s", ss.str().c_str());
        );
 #endif