[Gnash-commit] gnash ChangeLog server/swf_function.cpp testsui...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/15 18:37:08

Modified files:
        .              : ChangeLog 
        server         : swf_function.cpp 
        testsuite/swfdec: PASSING 

Log message:
                * server/swf_function.cpp: don't put 'this' into a register if
                  the SUPPRESS_THIS flag is on.
                * testsuite/swfdec/PASSING: definefunction2-this.swf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5934&r2=1.5935
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.104&r2=1.105

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5934
retrieving revision 1.5935
diff -u -b -r1.5934 -r1.5935
--- ChangeLog   15 Mar 2008 17:02:51 -0000      1.5934
+++ ChangeLog   15 Mar 2008 18:37:07 -0000      1.5935
@@ -1,5 +1,11 @@
 2008-03-15 Sandro Santilli <address@hidden>
 
+       * server/swf_function.cpp: don't put 'this' into a register if
+         the SUPPRESS_THIS flag is on.
+       * testsuite/swfdec/PASSING: definefunction2-this.swf
+
+2008-03-15 Sandro Santilli <address@hidden>
+
        * server/vm/ASHandlers.cpp (CommonGetUrl): cast uint8_t to int when
          printing, fixing a failure in misc-mtasc testsuite (output log
          considered binary).

Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/swf_function.cpp     10 Mar 2008 23:23:10 -0000      1.50
+++ server/swf_function.cpp     15 Mar 2008 18:37:08 -0000      1.51
@@ -202,7 +202,7 @@
                // @@ why start at 1 ? Note that starting at 0 makes    
                // intro.swf movie fail to play correctly.
                boost::uint8_t current_reg = 1;
-               if (m_function2_flags & PRELOAD_THIS)
+               if ( (m_function2_flags & PRELOAD_THIS) && ! (m_function2_flags 
& SUPPRESS_THIS) )
                {
                        // preload 'this' into a register.
                        
our_env->local_register(current_reg).set_as_object(fn.this_ptr); 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- testsuite/swfdec/PASSING    13 Mar 2008 16:26:34 -0000      1.104
+++ testsuite/swfdec/PASSING    15 Mar 2008 18:37:08 -0000      1.105
@@ -149,6 +149,7 @@
 definefunction2-registers-6.swf:336308a723b8d3f73286b4c206b78b99
 definefunction2-registers-7.swf:3f3beedf7c672e52718db68e8bae0a48
 definefunction2-registers-8.swf:fbdb48cd24755460f90b1e31560ef4d0
+definefunction2-this.swf:020d842f4a42ab11068652a4b12e4204
 definefunction-target-5.swf:9c305491a9b6c379938c607f246ea268
 definefunction-target-6.swf:ef3eab96ea46f557056b61c3ddd5fc2a
 definefunction-target-7.swf:f6517c6aa11a3d99ef3ae7f88ed91748