[Gnash-commit] gnash ChangeLog doc/C/debugger.xml server/debug...

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/04/25 06:58:57

Modified files:
        .              : ChangeLog 
        doc/C          : debugger.xml 
        server         : debugger.cpp debugger.h 
        server/vm      : ActionExec.cpp 

Log message:
        Fix spello: dissasemble -> disassemble

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2990&r2=1.2991
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/debugger.xml?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2990
retrieving revision 1.2991
diff -u -b -r1.2990 -r1.2991
--- ChangeLog   24 Apr 2007 22:22:48 -0000      1.2990
+++ ChangeLog   25 Apr 2007 06:58:54 -0000      1.2991
@@ -1,3 +1,8 @@
+2007-04-25 Martin Guy <address@hidden>
+
+       * ChangeLog,server/debugger.{cpp,h},server/vm/ActionExec.cpp:
+         spello dissasemble -> disassemble
+
 2007-04-24 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (sprite_hit_test): implement
@@ -39,6 +44,7 @@
        * extensions/fileio/fileio.cpp: Use intrusive pointers instead of
        explicit pointers.
 
+>>>>>>> 1.2990
 2007-04-24 Udo Giacomozzi <address@hidden>
 
        * libgeometry/Range2d.h: added expandToCircle()
@@ -4473,13 +4479,13 @@
 
 2007-02-06 Sandro Santilli <address@hidden>
 
-       * server/debugger.{h,cpp}: (dissasemble): first argument
+       * server/debugger.{h,cpp}: (disassemble): 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.
+         for Debugger::disassemble.
 
 2007-02-06 Martin Guy <address@hidden>
 
@@ -15568,7 +15574,7 @@
        reduce the chance of name collision. Use the new library names to
        link.
        
-       * server/action.cpp: Add missing opcodes to dissasembler table,a
+       * server/action.cpp: Add missing opcodes to disassembler table,a
        and rename the unsupported ones to have a "_fixme" attached when
        printing debug information.
        * backend/Makefile.am (AM_LDFLAGS): Add $(X_LIBS) so we can link

Index: doc/C/debugger.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/debugger.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- doc/C/debugger.xml  10 Feb 2007 04:30:51 -0000      1.1
+++ doc/C/debugger.xml  25 Apr 2007 06:58:56 -0000      1.2
@@ -52,7 +52,7 @@
       <term>t</term>
       <listitem>
        <para>
-         Toggle Trace Mode on or off. Trace mode prints a dissasemble
+         Toggle Trace Mode on or off. Trace mode prints a disassemble
          for each opcode as it executes in a similar fashion to the
          <emphasis>-va</emphasis> option.
        </para>

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/debugger.cpp 20 Apr 2007 12:13:34 -0000      1.17
+++ server/debugger.cpp 25 Apr 2007 06:58:56 -0000      1.18
@@ -194,7 +194,7 @@
              cin >> var;
              switch (var[0]) {
                case 'd':
-                   this->dissasemble();
+                   this->disassemble();
                  break;
                case 'i':
                    this->dumpMovieInfo();
@@ -314,14 +314,14 @@
 }
 
 void
-Debugger::dissasemble()
+Debugger::disassemble()
 {
 //    GNASH_REPORT_FUNCTION;
-    this->dissasemble(_pc);
+    this->disassemble(_pc);
 }
 
 void
-Debugger::dissasemble(const unsigned char *data)
+Debugger::disassemble(const unsigned char *data)
 {
 //    GNASH_REPORT_FUNCTION;
     as_arg_t fmt = ARG_HEX;

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/debugger.h   16 Apr 2007 18:23:05 -0000      1.11
+++ server/debugger.h   25 Apr 2007 06:58:56 -0000      1.12
@@ -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.11 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: debugger.h,v 1.12 2007/04/25 06:58:56 martinwguy Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -48,8 +48,8 @@
 
     void dumpMovieInfo();
 
-    void dissasemble(const unsigned char *data);
-    void dissasemble();
+    void disassemble(const unsigned char *data);
+    void disassemble();
     void setBreakPoint(const std::string &var, bool enabled);
     void removeBreakPoint(const std::string &var);
     void dumpBreakPoints();

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/vm/ActionExec.cpp    24 Apr 2007 20:38:26 -0000      1.29
+++ server/vm/ActionExec.cpp    25 Apr 2007 06:58:57 -0000      1.30
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.29 2007/04/24 20:38:26 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.30 2007/04/25 06:58:57 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -203,7 +203,7 @@
        debugger.setFramePointer(code.getFramePointer(pc));
        debugger.setEnvStack(&env);
        if (debugger.isTracing()) {
-           debugger.dissasemble();
+           debugger.disassemble();
        }
 #endif