[Gnash-commit] gnash/server debugger.cpp debugger.h parser/act...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/06 22:02:01

Modified files:
        server         : debugger.cpp debugger.h 
        server/parser  : action_buffer.h 
        server/vm      : ActionExec.cpp 

Log message:
                * server/debugger.{h,cpp}: (dissasemble): first argument
                  can safely be passed as a 'const' pointer.
                * server/parser/action_buffer.h: added get_buffer() to
                  return an unsugned char.
                * server/vm/ActionExec.cpp (operator()): use
                  action_buffer::get_buffer() to fetch an appropriate argument
                  for Debugger::dissasemble.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- debugger.cpp        6 Feb 2007 21:16:30 -0000       1.2
+++ debugger.cpp        6 Feb 2007 22:02:01 -0000       1.3
@@ -224,7 +224,7 @@
 }
 
 void
-Debugger::dissasemble(unsigned char *data)
+Debugger::dissasemble(const unsigned char *data)
 {
 //    GNASH_REPORT_FUNCTION;
     as_arg_t fmt = ARG_HEX;

Index: debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- debugger.h  6 Feb 2007 21:10:08 -0000       1.1
+++ debugger.h  6 Feb 2007 22:02:01 -0000       1.2
@@ -44,7 +44,7 @@
     void usage();
 //    bool command(const char cmd, as_environment &env);
 
-    void dissasemble(unsigned char *data);
+    void dissasemble(const unsigned char *data);
     void dissasemble();
     void setBreakPoint(std::string &var);
     void removeBreakPoint(std::string &var);

Index: parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- parser/action_buffer.h      6 Dec 2006 10:58:34 -0000       1.8
+++ parser/action_buffer.h      6 Feb 2007 22:02:01 -0000       1.9
@@ -120,9 +120,16 @@
        ///
        const char* read_string(size_t pc) const
        {
+               //assert(pc < m_buffer.size() );
                return (const char*)(&m_buffer[pc]);
        }
 
+       const unsigned char* get_buffer(size_t pc) const
+       {
+               //assert(pc < m_buffer.size() );
+               return (const unsigned char*)(&m_buffer[pc]);
+       }
+
        /// Get an integer value from given offset
        //
        /// Useful to hide complexity of underlying buffer access.

Index: vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- vm/ActionExec.cpp   6 Feb 2007 17:46:25 -0000       1.15
+++ vm/ActionExec.cpp   6 Feb 2007 22:02:01 -0000       1.16
@@ -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: ActionExec.cpp,v 1.15 2007/02/06 17:46:25 rsavoye Exp $ */
+/* $Id: ActionExec.cpp,v 1.16 2007/02/06 22:02:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -184,7 +184,7 @@
 #ifdef USE_DEBUGGER
        debugger.setEnvStack(&env);
        if (debugger.isTracing()) {
-           debugger.dissasemble(code.read_string(pc));
+           debugger.dissasemble(code.get_buffer(pc));
        }
 #endif