[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog libbase/Makefile.am libbase/l...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog libbase/Makefile.am libbase/l... |
|
Date: |
Mon, 15 May 2006 03:21:07 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/05/15 03:21:07
Modified files:
. : ChangeLog
libbase : Makefile.am log.cpp log.h tu_random.cpp
server : Makefile.am action.cpp text.cpp
Added files:
server/swf : ASHandlers.cpp ASHandlers.h
Log message:
* libbase/Makefile.am: Remove OPENGL_LIBS from _LIBADD, it causes
OpenGL to hang on my Ubuntu system.
* libbase/log.cpp: Add hexify() for printing numbers. Trap '\n'
when coming in from log_msg() and convert to std::endl.
* libbase/log.h: Add hexify().
* server/Makefile.am: Add swf/ASHandlers to libgnashserver.
* server/action.cpp: Remove old switch table for processing
opcodes and use ASHandlers instead.
* server/swf/tag_loaders.cpp: Add dbglogfile instead of
log_msg().
* server/swf/ASHandlers.cpp, ASHandlers.cpp: New file for SWF
opcode handlers. These used to be part of action.cpp.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.318&tr2=1.319&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/log.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/log.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_random.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/swf/ASHandlers.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/swf/ASHandlers.h?rev=1.1
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.318 gnash/ChangeLog:1.319
--- gnash/ChangeLog:1.318 Sun May 14 22:47:01 2006
+++ gnash/ChangeLog Mon May 15 03:21:07 2006
@@ -1,3 +1,18 @@
+2006-05-14 Rob Savoye <address@hidden>
+
+ * libbase/Makefile.am: Remove OPENGL_LIBS from _LIBADD, it causes
+ OpenGL to hang on my Ubuntu system.
+ * libbase/log.cpp: Add hexify() for printing numbers. Trap '\n'
+ when coming in from log_msg() and convert to std::endl.
+ * libbase/log.h: Add hexify().
+ * server/Makefile.am: Add swf/ASHandlers to libgnashserver.
+ * server/action.cpp: Remove old switch table for processing
+ opcodes and use ASHandlers instead.
+ * server/swf/tag_loaders.cpp: Add dbglogfile instead of
+ log_msg().
+ * server/swf/ASHandlers.cpp, ASHandlers.cpp: New file for SWF
+ opcode handlers. These used to be part of action.cpp.
+
2006-05-14 Sandro Santilli <address@hidden>
* libbase/URL.{cpp,h}: handling of relative paths containing
@@ -39,15 +54,13 @@
* gui/gtk_glue_gtkglext.cpp: Unreference _glconfig and glcontext
so Firefox doesn't crash.
* gui/gtksup.h: Add unrealize event, remove resizeWindow.
- * gui/gui.cpp: Add method to resize the viewport.
- * gui/gui.h: Add method to resize the viewport.
+ * gui/gui.cpp, gui/gui.h: Add method to resize the viewport.
* gui/kde.cpp: Use setGeometry() instead of resize(). Handle the
resize event, and mouse events.
* gui/kde_glue_opengl.cpp: Set the view so it's oriented
correctly.
* gui/kdesup.h: Add mouse event handlers.
- * gui/sdl.cpp: Remove resizeWindow().
- * gui/sdlsup.h: Remove resizeWindow().
+ * gui/sdl.cpp, gui/sdlsup.h: Remove resizeWindow().
* server/impl.cpp: Don't assert, return NULL if not initilized so
we can use this to check the state.
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.25 gnash/libbase/Makefile.am:1.26
--- gnash/libbase/Makefile.am:1.25 Sat May 13 21:35:52 2006
+++ gnash/libbase/Makefile.am Mon May 15 03:21:07 2006
@@ -106,7 +106,6 @@
libgnashbase_la_LIBADD = \
$(JPEG_LIBS) \
$(ZLIB_LIBS) \
- $(OPENGL_LIBS) \
$(CURL_LIBS)
noinst_HEADERS = \
Index: gnash/libbase/log.cpp
diff -u gnash/libbase/log.cpp:1.5 gnash/libbase/log.cpp:1.6
--- gnash/libbase/log.cpp:1.5 Mon Apr 24 23:05:55 2006
+++ gnash/libbase/log.cpp Mon May 15 03:21:07 2006
@@ -75,6 +75,25 @@
// Workspace for vsnprintf formatting.
static const int BUFFER_SIZE = 500;
+// Convert each byte into it's hex represntation
+static const char hexchars[]="0123456789abcdef";
+unsigned char *
+hexify(unsigned char *p, const unsigned char *s, int length) {
+ int i;
+ unsigned char *p1 = p;
+
+ // convert some characters so it'll look right in the log
+ for (i=0 ; i<length; i++) {
+ // use the hex value
+ *p++ = hexchars[s[i] >> 4];
+ *p++ = hexchars[s[i] & 0xf];
+ }
+
+ *p = '\0';
+
+ return p1;
+}
+
ostream&
timestamp(ostream& x) {
time_t t;
@@ -123,10 +142,19 @@
{
va_list ap;
char tmp[BUFFER_SIZE];
+ memset(tmp, 0, BUFFER_SIZE);
- va_start (ap, fmt);
- vsprintf (tmp, fmt, ap);
+ // Drop any newlines on the end of the string. We'll supply
+ // endl later so it works correctly anyway.
+ char *newfmt = strdup(fmt);
+ char *ptr = strrchr(newfmt, '\n');
+ if (ptr) {
+ *ptr = 0;
+ }
+ va_start (ap, newfmt);
+ vsprintf (tmp, newfmt, ap);
+ free(newfmt);
dbglogfile << tmp << endl;
va_end (ap);
@@ -154,7 +182,8 @@
{
va_list ap;
char tmp[BUFFER_SIZE];
-
+ memset(tmp, 0, BUFFER_SIZE);
+
va_start (ap, fmt);
vsprintf (tmp, fmt, ap);
Index: gnash/libbase/log.h
diff -u gnash/libbase/log.h:1.5 gnash/libbase/log.h:1.6
--- gnash/libbase/log.h:1.5 Mon Apr 24 23:05:55 2006
+++ gnash/libbase/log.h Mon May 15 03:21:07 2006
@@ -148,6 +148,10 @@
friend std::ostream & operator << (std::ostream &os, LogFile& e);
};
+
+unsigned char *hexify(unsigned char *p, const unsigned char *s, int length);
+
+
// Printf-style interfaces.
void log_msg(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
void log_error(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
Index: gnash/libbase/tu_random.cpp
diff -u gnash/libbase/tu_random.cpp:1.4 gnash/libbase/tu_random.cpp:1.5
--- gnash/libbase/tu_random.cpp:1.4 Mon May 8 21:12:24 2006
+++ gnash/libbase/tu_random.cpp Mon May 15 03:21:07 2006
@@ -144,7 +144,5 @@
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.38 gnash/server/Makefile.am:1.39
--- gnash/server/Makefile.am:1.38 Fri May 12 04:28:11 2006
+++ gnash/server/Makefile.am Mon May 15 03:21:07 2006
@@ -45,24 +45,24 @@
# noinst_SCRIPTS = gen-files.sh
# Only enable if we're configured with --enable-mp3
-INCLUDES = -I.. \
- -I$(top_srcdir) \
+INCLUDES = -I.. -I$(srcdir)/swf \
+ -I$(top_srcdir) \
-I$(top_srcdir)/libbase \
- -I$(top_srcdir) \
- $(PTHREAD_CFLAGS) \
- $(ENGINE_INCLUDE) \
- $(ZLIB_CFLAGS) \
- $(OGG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
- $(OPENGL_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(ATK_CFLAGS) \
- $(DMALLOC_CFLAGS) \
+ -I$(top_srcdir) \
+ $(PTHREAD_CFLAGS) \
+ $(ENGINE_INCLUDE) \
+ $(ZLIB_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(GTK2_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(CAIRO_CFLAGS) \
+ $(ATK_CFLAGS) \
+ $(DMALLOC_CFLAGS) \
$(LIBXML_CFLAGS)
if MP3
@@ -122,99 +122,101 @@
Video.h
libgnashserver_la_SOURCES = \
- character.cpp \
- textformat.cpp \
- timers.cpp \
- xml.cpp \
- xmlattrs.cpp \
- xmlnode.cpp \
+ character.cpp \
+ textformat.cpp \
+ timers.cpp \
+ xml.cpp \
+ xmlattrs.cpp \
+ xmlnode.cpp \
MovieClipLoader.cpp\
- movie_root.cpp \
- movie_def_impl.cpp \
- xmlsocket.cpp \
- string.cpp \
- action.cpp \
- button.cpp \
- dlist.cpp \
- font.cpp \
- fontlib.cpp \
- impl.cpp \
- morph2.cpp \
- network.cpp \
- MovieClip.cpp \
- render.cpp \
- shape.cpp \
+ movie_root.cpp \
+ movie_def_impl.cpp \
+ xmlsocket.cpp \
+ string.cpp \
+ action.cpp \
+ button.cpp \
+ dlist.cpp \
+ font.cpp \
+ fontlib.cpp \
+ impl.cpp \
+ morph2.cpp \
+ network.cpp \
+ MovieClip.cpp \
+ render.cpp \
+ shape.cpp \
shape_character_def.cpp \
- shm.cpp \
- sound.cpp \
- sprite_definition.cpp \
- sprite_instance.cpp \
- stream.cpp \
- styles.cpp \
- tesselate.cpp \
- text.cpp \
- array.cpp \
+ shm.cpp \
+ sound.cpp \
+ sprite_definition.cpp \
+ sprite_instance.cpp \
+ stream.cpp \
+ styles.cpp \
+ tesselate.cpp \
+ text.cpp \
+ array.cpp \
+ swf/ASHandlers.cpp \
swf/TagLoadersTable.cpp \
swf/tag_loaders.cpp \
types.cpp $(MP3_HANDLER)
noinst_HEADERS = $(as_incls) \
- action.h \
- array.h \
- as_value.h \
- as_member.h \
+ action.h \
+ array.h \
+ as_value.h \
+ as_member.h \
as_prop_flags.h \
- as_object.h \
- button.h \
- dlist.h \
- character.h \
+ as_object.h \
+ button.h \
+ dlist.h \
+ character.h \
character_def.h \
- generic_character.h \
- bitmap_character_def.h \
- execute_tag.h \
- font.h \
- fontlib.h \
- Global.h \
- gnash.h \
- gstring.h \
- impl.h \
- Key.h \
- morph2.h \
- morph.h \
- MovieClipLoader.h \
- MovieClip.h \
- movie.h \
- movie_definition.h \
- movie_def_impl.h \
- movie_interface.h \
- movie_root.h \
- network.h \
- Object.h \
- resource.h \
- ref_counted.h \
- render.h \
- shape.h \
- shape_character_def.h \
- shm.h \
- sound.h \
- ASSound.h \
- Sprite.h \
- sprite_definition.h \
- sprite_instance.h \
- stream.h \
- styles.h \
- swf.h \
- tesselate.h \
- textformat.h \
- text.h \
- thread.h \
- timers.h \
- types.h \
- xmlattrs.h \
- xml.h \
- xmlnode.h \
- swf/TagLoadersTable.h \
- swf/tag_loaders.h \
+ generic_character.h \
+ bitmap_character_def.h \
+ execute_tag.h \
+ font.h \
+ fontlib.h \
+ Global.h \
+ gnash.h \
+ gstring.h \
+ impl.h \
+ Key.h \
+ morph2.h \
+ morph.h \
+ MovieClipLoader.h \
+ MovieClip.h \
+ movie.h \
+ movie_definition.h \
+ movie_def_impl.h \
+ movie_interface.h \
+ movie_root.h \
+ network.h \
+ Object.h \
+ resource.h \
+ ref_counted.h \
+ render.h \
+ shape.h \
+ shape_character_def.h \
+ shm.h \
+ sound.h \
+ ASSound.h \
+ Sprite.h \
+ sprite_definition.h \
+ sprite_instance.h \
+ stream.h \
+ styles.h \
+ swf.h \
+ tesselate.h \
+ textformat.h \
+ text.h \
+ thread.h \
+ timers.h \
+ types.h \
+ xmlattrs.h \
+ xml.h \
+ xmlnode.h \
+ swf/ASHandlers.h \
+ swf/TagLoadersTable.h \
+ swf/tag_loaders.h \
xmlsocket.h
libgnashserver_la_LIBADD = \
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.71 gnash/server/action.cpp:1.72
--- gnash/server/action.cpp:1.71 Tue May 9 15:34:16 2006
+++ gnash/server/action.cpp Mon May 15 03:21:07 2006
@@ -1,7 +1,38 @@
-// action.cpp -- Thatcher Ulrich <address@hidden> 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
+//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -9,7 +40,7 @@
#include <typeinfo>
#include <pthread.h>
-#include <string>
+#include <string>
#include "action.h"
#include "as_object.h"
@@ -55,6 +86,7 @@
//#include "Video.h"
#include "Global.h"
#include "swf.h"
+#include "ASHandlers.h"
#ifndef HAVE_GTK2
int windowid = 0;
@@ -65,6 +97,9 @@
GdkNativeWindow windowid = 0;
#endif
+using namespace gnash;
+using namespace SWF;
+
#ifdef _WIN32
#define snprintf _snprintf
#endif // _WIN32
@@ -126,6 +161,8 @@
using namespace std;
namespace gnash {
+
+SWFHandlers ash;
//
// action stuff
@@ -467,9 +504,10 @@
return s_retval.c_str();
}
-void movie_load()
+void
+movie_load()
{
- IF_VERBOSE_ACTION(log_msg("-- start movie \n"));
+ IF_VERBOSE_ACTION(dbglogfile << "-- start movie" << endl);
}
//
@@ -477,7 +515,8 @@
//
-void event_test(const fn_call& fn)
+void
+event_test(const fn_call& fn)
{
log_msg("FIXME: %s\n", __FUNCTION__);
}
@@ -489,100 +528,42 @@
-void action_init()
+void
+action_init()
// Create/hook built-ins.
{
- if (s_inited == false)
- {
- s_inited = true;
-
- // @@ s_global should really be a
- // client-visible player object, which
- // contains one or more actual movie
- // instances. We're currently just hacking it
- // in as an app-global mutable object :(
- assert(s_global == NULL);
- s_global = new gnash::Global();
- }
-}
-
-
-void action_clear()
-{
- if (s_inited)
- {
- s_inited = false;
-
- s_global->clear();
- s_global = NULL;
- }
+ if (s_inited == false) {
+ s_inited = true;
+
+ // @@ s_global should really be a
+ // client-visible player object, which
+ // contains one or more actual movie
+ // instances. We're currently just hacking it
+ // in as an app-global mutable object :(
+ assert(s_global == NULL);
+ s_global = new gnash::Global();
+ }
}
-//
-// properties by number
-//
-
-static const tu_string s_property_names[] =
-{
- tu_string("_x"),
- tu_string("_y"),
- tu_string("_xscale"),
- tu_string("_yscale"),
- tu_string("_currentframe"),
- tu_string("_totalframes"),
- tu_string("_alpha"),
- tu_string("_visible"),
- tu_string("_width"),
- tu_string("_height"),
- tu_string("_rotation"),
- tu_string("_target"),
- tu_string("_framesloaded"),
- tu_string("_name"),
- tu_string("_droptarget"),
- tu_string("_url"),
- tu_string("_highquality"),
- tu_string("_focusrect"),
- tu_string("_soundbuftime"),
- tu_string("@@ mystery quality member"),
- tu_string("_xmouse"),
- tu_string("_ymouse"),
-};
-
-
-static as_value get_property(as_object* obj, int prop_number)
-{
- as_value val;
- if (prop_number >= 0 && prop_number <
int(sizeof(s_property_names)/sizeof(s_property_names[0])))
- {
- obj->get_member(s_property_names[prop_number], &val);
- }
- else
- {
- log_error("error: invalid property query, property number %d\n",
prop_number);
- }
- return val;
-}
-
-static void set_property(as_object* obj, int prop_number, const as_value&
val)
+void
+action_clear()
{
- if (prop_number >= 0 && prop_number <
int(sizeof(s_property_names)/sizeof(s_property_names[0])))
- {
- obj->set_member(s_property_names[prop_number], val);
- }
- else
- {
- log_error("error: invalid set_property, property number %d\n",
prop_number);
- }
+ if (s_inited) {
+ s_inited = false;
+
+ s_global->clear();
+ s_global = NULL;
+ }
}
-
//
// action_buffer
//
// Disassemble one instruction to the log.
-static void log_disasm(const unsigned char* instruction_data);
+static void
+log_disasm(const unsigned char* instruction_data);
action_buffer::action_buffer()
:
@@ -591,371 +572,137 @@
}
-void action_buffer::read(stream* in)
+void
+action_buffer::read(stream* in)
{
// Read action bytes.
- for (;;)
- {
- int instruction_start = m_buffer.size();
-
- int pc = m_buffer.size();
-
- int action_id = in->read_u8();
- m_buffer.push_back(action_id);
-
- if (action_id & 0x80)
- {
- // Action contains extra data. Read it.
- int length = in->read_u16();
- m_buffer.push_back(length & 0x0FF);
- m_buffer.push_back((length >> 8) & 0x0FF);
- for (int i = 0; i < length; i++)
- {
- unsigned char b = in->read_u8();
- m_buffer.push_back(b);
- }
- }
-
- IF_VERBOSE_ACTION(log_msg("%4d\t", pc);
log_disasm(&m_buffer[instruction_start]); );
+ for (;;) {
+ int instruction_start = m_buffer.size();
+
+ int pc = m_buffer.size();
+
+ int action_id = in->read_u8();
+ m_buffer.push_back(action_id);
+
+ if (action_id & 0x80) {
+ // Action contains extra data. Read it.
+ int length = in->read_u16();
+ m_buffer.push_back(length & 0x0FF);
+ m_buffer.push_back((length >> 8) & 0x0FF);
+ for (int i = 0; i < length; i++) {
+ unsigned char b = in->read_u8();
+ m_buffer.push_back(b);
+ }
+ }
- if (action_id == 0)
- {
- // end of action buffer.
- break;
- }
+ dbglogfile.setStamp(false);
+ IF_VERBOSE_ACTION(dbglogfile << "PC index: " << pc << ":\t";
+ log_disasm(&m_buffer[instruction_start]););
+
+ if (action_id == 0) {
+ // end of action buffer.
+ break;
}
+ }
}
/*private*/
-void action_buffer::process_decl_dict(int start_pc, int stop_pc)
- // Interpret the decl_dict opcode. Don't read stop_pc or
- // later. A dictionary is some static strings embedded in the
- // action buffer; there should only be one dictionary per
- // action buffer.
- //
- // NOTE: Normally the dictionary is declared as the first
- // action in an action buffer, but I've seen what looks like
- // some form of copy protection that amounts to:
- //
- // <start of action buffer>
- // push true
- // branch_if_true label
- // decl_dict [0] // this is never executed, but has lots of
orphan data declared in the opcode
- // label: // (embedded inside the previous opcode; looks like an invalid
jump)
- // ... "protected" code here, including the real decl_dict opcode
...
- // <end of the dummy decl_dict [0] opcode>
- //
- // So we just interpret the first decl_dict we come to, and
- // cache the results. If we ever hit a different decl_dict in
- // the same action_buffer, then we log an error and ignore it.
+// Interpret the decl_dict opcode. Don't read stop_pc or
+// later. A dictionary is some static strings embedded in the
+// action buffer; there should only be one dictionary per
+// action buffer.
+//
+// NOTE: Normally the dictionary is declared as the first
+// action in an action buffer, but I've seen what looks like
+// some form of copy protection that amounts to:
+//
+// <start of action buffer>
+// push true
+// branch_if_true label
+// decl_dict [0] // this is never executed, but has lots of
orphan data declared in the opcode
+// label: // (embedded inside the previous opcode; looks like an invalid
jump)
+// ... "protected" code here, including the real decl_dict opcode ...
+// <end of the dummy decl_dict [0] opcode>
+//
+// So we just interpret the first decl_dict we come to, and
+// cache the results. If we ever hit a different decl_dict in
+// the same action_buffer, then we log an error and ignore it.
+void
+action_buffer::process_decl_dict(int start_pc, int stop_pc)
{
assert(stop_pc <= (int) m_buffer.size());
-
- if (m_decl_dict_processed_at == start_pc)
- {
- // We've already processed this decl_dict.
- int count = m_buffer[start_pc + 3] | (m_buffer[start_pc + 4] << 8);
- assert((int) m_dictionary.size() == count);
- UNUSED(count);
- return;
- }
-
- if (m_decl_dict_processed_at != -1)
- {
- log_error("error: process_decl_dict(%d, %d): decl_dict was already
processed at %d\n",
- start_pc,
- stop_pc,
- m_decl_dict_processed_at);
- return;
- }
-
+
+ if (m_decl_dict_processed_at == start_pc) {
+ // We've already processed this decl_dict.
+ int count = m_buffer[start_pc + 3] | (m_buffer[start_pc + 4] << 8);
+ assert((int) m_dictionary.size() == count);
+ UNUSED(count);
+ return;
+ }
+
+ if (m_decl_dict_processed_at != -1) {
+ log_error("error: process_decl_dict(%d, %d): decl_dict was already
processed at %d\n",
+ start_pc,
+ stop_pc,
+ m_decl_dict_processed_at);
+ return;
+ }
+
m_decl_dict_processed_at = start_pc;
-
+
// Actual processing.
int i = start_pc;
int length = m_buffer[i + 1] | (m_buffer[i + 2] << 8);
int count = m_buffer[i + 3] | (m_buffer[i + 4] << 8);
i += 2;
-
+
UNUSED(length);
-
+
assert(start_pc + 3 + length == stop_pc);
-
+
m_dictionary.resize(count);
-
+
// Index the strings.
- for (int ct = 0; ct < count; ct++)
- {
- // Point into the current action buffer.
- m_dictionary[ct] = (const char*) &m_buffer[3 + i];
-
- while (m_buffer[3 + i])
- {
- // safety check.
- if (i >= stop_pc)
- {
- log_error("error: action buffer dict length
exceeded\n");
-
- // Jam something into the remaining (invalid)
entries.
- while (ct < count)
- {
- m_dictionary[ct] = "<invalid>";
- ct++;
- }
- return;
- }
- i++;
+ for (int ct = 0; ct < count; ct++) {
+ // Point into the current action buffer.
+ m_dictionary[ct] = (const char*) &m_buffer[3 + i];
+
+ while (m_buffer[3 + i]) {
+ // safety check.
+ if (i >= stop_pc) {
+ log_error("error: action buffer dict length exceeded\n");
+
+ // Jam something into the remaining (invalid) entries.
+ while (ct < count) {
+ m_dictionary[ct] = "<invalid>";
+ ct++;
}
+ return;
+ }
i++;
}
+ i++;
+ }
}
-void action_buffer::execute(as_environment* env)
- // Interpret the actions in this action buffer, and evaluate
- // them in the given environment. Execute our whole buffer,
- // without any arguments passed in.
+// Interpret the actions in this action buffer, and evaluate
+// them in the given environment. Execute our whole buffer,
+// without any arguments passed in.
+void
+action_buffer::execute(as_environment* env)
{
int local_stack_top = env->get_local_frame_top();
env->add_frame_barrier();
-
- std::vector<with_stack_entry> empty_with_stack;
+
+ std::vector<with_stack_entry> empty_with_stack;
execute(env, 0, m_buffer.size(), NULL, empty_with_stack, false /* not
function2 */);
-
+
env->set_local_frame_top(local_stack_top);
}
-
-/*private*/
-void
-action_buffer::doActionNew(as_environment* env,
- std::vector<with_stack_entry>& with_stack)
-{
- as_value classname = env->pop();
- IF_VERBOSE_ACTION(log_msg("---new object: %s\n",
- classname.to_tu_string().c_str()));
- int nargs = (int) env->pop().to_number();
-
- as_value constructor = env->get_variable(classname.to_tu_string(),
with_stack);
- as_value new_obj;
- if (constructor.get_type() == as_value::C_FUNCTION)
- {
- IF_VERBOSE_ACTION(log_msg("Constructor is a C_FUNCTION\n"));
- // C function is responsible for creating the new object and
setting members.
- (constructor.to_c_function())(fn_call(&new_obj, NULL, env, nargs,
env->get_top_index()));
- }
- else if (function_as_object* ctor_as_func = constructor.to_as_function())
- {
- // This function is being used as a constructor; make sure
- // it has a prototype object.
- IF_VERBOSE_ACTION(log_msg("Constructor is an AS_FUNCTION\n"));
-
- // a built-in class takes care of assigning a prototype
- if ( ctor_as_func->isBuiltin() )
- {
- IF_VERBOSE_ACTION(log_msg("it's a built-in class"));
- (*ctor_as_func)(fn_call(&new_obj, NULL, env, nargs,
env->get_top_index()));
- }
-
- else
- {
- // Set up the prototype.
- as_value proto;
- bool func_has_prototype = \
- ctor_as_func->get_member("prototype", &proto);
- assert(func_has_prototype);
-
- IF_VERBOSE_ACTION(log_msg("constructor prototype is %s\n",
proto.to_string()));
-
- // Create an empty object, with a ref to the constructor's
prototype.
- smart_ptr<as_object> new_obj_ptr(new
as_object(proto.to_object()));
-
- new_obj.set_as_object(new_obj_ptr.get_ptr());
-
- // Call the actual constructor function; new_obj is its
'this'.
- // We don't need the function result.
- call_method(constructor, env, new_obj_ptr.get_ptr(), nargs,
env->get_top_index());
- }
- }
- else
- {
- if (classname != "String") {
- log_error("can't create object with unknown class '%s'\n",
- classname.to_tu_string().c_str());
- } else {
- log_msg("Created special String class\n");
- }
- }
-
- env->drop(nargs);
- env->push(new_obj);
-#if 0
- log_msg("new object at %p\n", new_obj.to_object());
-#endif
-}
-
-/*private*/
-void
-action_buffer::doActionInstanceOf(as_environment* env)
-{
- // Get the "super" function
- function_as_object* super = env->top(0).to_as_function();
-
- // Get the "instance"
- as_object* instance = env->top(1).to_object();
-
- // Invalid args!
- if ( ! super || ! instance )
- {
- //IF_VERBOSE_ACTION(
- log_msg("-- %s instance_of %s (invalid args?)\n",
- env->top(1).to_string(),
- env->top(0).to_string());
- //);
-
- env->drop(1);
- env->top(0) = as_value(false);
- return;
- }
-
- env->drop(1);
- env->top(0) = as_value(instance->instanceOf(super));
-
- //log_msg("tocheck: opcode %x\n", SWF::ACTION_INSTANCEOF);
-}
-
-void
-action_buffer::doActionCast(as_environment* env)
-{
- // Get the "super" function
- function_as_object* super = env->top(0).to_as_function();
-
- // Get the "instance"
- as_object* instance = env->top(1).to_object();
-
- // Invalid args!
- if ( ! super || ! instance )
- {
- //IF_VERBOSE_ACTION(
- log_msg("-- %s instance_of %s (invalid args?)\n",
- env->top(1).to_string(),
- env->top(0).to_string());
- //);
-
- env->drop(1);
- env->top(0) = as_value();
- return;
- }
-
- env->drop(1);
- if ( instance->instanceOf(super) ) {
- env->top(0) = as_value(instance);
- } else {
- env->top(0) = as_value();
- }
-
- //log_msg("tocheck: opcode %x\n", SWF::ACTION_CASTOP);
-}
-
-
-/*private*/
-void
-action_buffer::doActionCallMethod(as_environment* env)
-{
- // Some corner case behaviors depend on the SWF file version.
- //int version = env->get_target()->get_movie_definition()->get_version();
-
- // Get name of the method
- const tu_string& method_name = env->top(0).to_tu_string();
- IF_VERBOSE_ACTION(log_msg(" method name: %s\n", method_name.c_str()));
-
- // Get an object
- as_value& obj_value = env->top(1);
- as_object* obj = obj_value.to_object();
- IF_VERBOSE_ACTION(log_msg(" method object: %p\n", obj));
-
- // Get number of arguments
- int nargs = (int) env->top(2).to_number();
- IF_VERBOSE_ACTION(log_msg(" method nargs: %d\n", nargs));
-
- as_value result;
-
- if (!obj)
- {
- log_error("error: call_method invoked in something that "
- "doesn't cast to an as_object: %s\n",
- typeid(obj_value).name());
- }
- else
- {
- as_value method;
- if (obj->get_member(method_name, &method))
- {
- if (method.get_type() != as_value::AS_FUNCTION &&
- method.get_type() != as_value::C_FUNCTION)
- {
- log_error("error: call_method: '%s' is not a
method\n",
- method_name.c_str());
- }
- else
- {
- result = call_method( method, env, obj, nargs,
- env->get_top_index() - 3);
- }
- }
- else
- {
- log_error("error: call_method can't find method %s "
- "for object %s (%p)\n", method_name.c_str(),
- typeid(*obj).name(), obj);
- }
- }
-
- env->drop(nargs + 2);
- env->top(0) = result;
-
- // This is to check stack status after call method
- //log_msg("at doActionCallMethod() end, stack: \n"); env->dump_stack();
-}
-
-/*private*/
-void
-action_buffer::doActionCallFunction(as_environment* env,
- std::vector<with_stack_entry>& with_stack)
-{
- as_value function;
- if (env->top(0).get_type() == as_value::STRING)
- {
- // Function is a string; lookup the function.
- const tu_string& function_name = env->top(0).to_tu_string();
- function = env->get_variable(function_name, with_stack);
-
- if (function.get_type() != as_value::AS_FUNCTION &&
- function.get_type() != as_value::C_FUNCTION)
- {
- log_error("error in call_function: '%s' is not a
function\n",
- function_name.c_str());
- }
- }
- else
- {
- // Hopefully the actual
- // function object is here.
- // QUESTION: would this be
- // an ActionScript-defined
- // function ?
- function = env->top(0);
- }
- int nargs = (int) env->top(1).to_number();
-
- as_value result = call_method(function, env, env->get_target(),
- nargs, env->get_top_index() - 2);
-
- env->drop(nargs + 1);
- env->top(0) = result;
-}
-
+#if 1
/*private*/
void
action_buffer::doActionDefineFunction(as_environment* env,
@@ -978,13 +725,12 @@
i += 2;
// Get the names of the arguments.
- for (int n = 0; n < nargs; n++)
- {
- // @@ security: watch out for possible missing terminator here!
- func->add_arg(0, (const char*) &m_buffer[i]);
- i += func->m_args.back().m_name.length() + 1;
- }
-
+ for (int n = 0; n < nargs; n++) {
+ // @@ security: watch out for possible missing terminator here!
+ func->add_arg(0, (const char*) &m_buffer[i]);
+ i += func->m_args.back().m_name.length() + 1;
+ }
+
// Get the length of the actual function code.
int length = m_buffer[i] | (m_buffer[i + 1] << 8);
i += 2;
@@ -996,12 +742,11 @@
// If we have a name, then save the function in this
// environment under that name.
as_value function_value(func);
- if (name.length() > 0)
- {
- // @@ NOTE: should this be m_target->set_variable()???
- env->set_member(name, function_value);
- }
-
+ if (name.length() > 0) {
+ // @@ NOTE: should this be m_target->set_variable()???
+ env->set_member(name, function_value);
+ }
+
// Also leave it on the stack.
env->push_val(function_value);
}
@@ -1037,15 +782,14 @@
func->set_function2_flags(flags);
// Get the register assignments and names of the arguments.
- for (int n = 0; n < nargs; n++)
- {
- int arg_register = m_buffer[i];
- i++;
-
- // @@ security: watch out for possible missing terminator here!
- func->add_arg(arg_register, (const char*) &m_buffer[i]);
+ for (int n = 0; n < nargs; n++) {
+ int arg_register = m_buffer[i];
+ i++;
+
+ // @@ security: watch out for possible missing terminator here!
+ func->add_arg(arg_register, (const char*) &m_buffer[i]);
i += func->m_args.back().m_name.length() + 1;
- }
+ }
// Get the length of the actual function code.
int length = m_buffer[i] | (m_buffer[i + 1] << 8);
@@ -1058,125 +802,30 @@
// If we have a name, then save the function in this
// environment under that name.
as_value function_value(func);
- if (name.length() > 0)
- {
- // @@ NOTE: should this be m_target->set_variable()???
- env->set_member(name, function_value);
- }
-
+ if (name.length() > 0) {
+ // @@ NOTE: should this be m_target->set_variable()???
+ env->set_member(name, function_value);
+ }
+
// Also leave it on the stack.
env->push_val(function_value);
-
}
+#endif
-/*private*/
+// Interpret the specified subset of the actions in our
+// buffer. Caller is responsible for cleaning up our local
+// stack frame (it may have passed its arguments in via the
+// local stack frame).
+//
+// The is_function2 flag determines whether to use global or local registers.
void
-action_buffer::doActionGetMember(as_environment* env)
-{
- // Some corner case behaviors depend on the SWF file version.
- int version = env->get_target()->get_movie_definition()->get_version();
-
- as_value member_name = env->top(0);
- as_value target = env->top(1);
-
- as_object* obj = target.to_object();
- if (! obj)
- {
- IF_VERBOSE_DEBUG(log_msg("getMember called against "
- "a value that does not cast "
- "to an as_object: %s\n",
target.to_string()));
- env->top(1).set_undefined();
- env->drop(1);
- return;
- }
-
- IF_VERBOSE_ACTION(log_msg(" doActionGetMember: target: %s (object %p)\n",
target.to_string(), obj));
-
- // Special case: String has a member "length"
- // @@ FIXME: we shouldn't have all this "special" cases --strk;
- if (target.get_type() == as_value::STRING && member_name.to_tu_stringi()
== "length")
- {
- int len = target.to_tu_string_versioned(version).utf8_length();
- env->top(1).set_int(len);
- }
- else
- {
- if ( ! obj->get_member(member_name.to_tu_string(), &(env->top(1))) )
- env->top(1).set_undefined();
-
- IF_VERBOSE_ACTION(log_msg("-- get_member %s=%s\n",
- member_name.to_tu_string().c_str(),
- env->top(1).to_tu_string().c_str()));
- }
- env->drop(1);
-}
-
-/*private*/
-void action_buffer::doActionStrictEquals(as_environment* env)
-{
-//log_msg("%s\n", __PRETTY_FUNCTION__);
- // @@ identical to untyped equal, as far as I can tell...
- env->top(1).set_bool(env->top(1) == env->top(0));
- env->drop(1);
-}
-
-/*private*/
-void action_buffer::doActionEquals(as_environment* env)
-{
-//log_msg("%s\n", __PRETTY_FUNCTION__);
- env->top(1).set_bool(env->top(1).to_tu_string() ==
env->top(0).to_tu_string());
- env->drop(1);
-}
-
-/*private*/
-void action_buffer::doActionDelete(as_environment* env,
- std::vector<with_stack_entry>& with_stack)
-{
- log_error("todo opcode: %02X\n", SWF::ACTION_DELETEVAR);
-}
-
-/*private*/
-void action_buffer::doActionDelete2(as_environment* env,
- std::vector<with_stack_entry>& with_stack)
-{
- as_value var = env->top(0);
-
- //log_msg("delete %s\n", var.to_string());
-
- as_value oldval = env->get_variable_raw(var.to_tu_string(),
- with_stack);
-
- if ( ! oldval.get_type() == as_value::UNDEFINED )
- {
- // set variable to 'undefined'
- // that hopefully --ref_count and eventually
- // release memory.
- env->set_variable_raw(var.to_tu_string(),
- as_value(), with_stack);
- env->top(0).set_bool(true);
- }
- else
- {
- env->top(0).set_bool(false);
- }
-
- //log_error("tocheck opcode: %02X\n", SWF::ACTION_DELETE);
-}
-
-
-void action_buffer::execute(
+action_buffer::execute(
as_environment* env,
int start_pc,
int exec_bytes,
as_value* retval,
const std::vector<with_stack_entry>& initial_with_stack,
bool is_function2)
- // Interpret the specified subset of the actions in our
- // buffer. Caller is responsible for cleaning up our local
- // stack frame (it may have passed its arguments in via the
- // local stack frame).
- //
- // The is_function2 flag determines whether to use global or local
registers.
{
action_init(); // @@ stick this somewhere else; need some global
static init function
@@ -1184,9 +833,6 @@
std::vector<with_stack_entry> with_stack(initial_with_stack);
- // Some corner case behaviors depend on the SWF file version.
- int version = env->get_target()->get_movie_definition()->get_version();
-
#if 0
// Check the time
if (periodic_events.expired()) {
@@ -1199,780 +845,57 @@
int stop_pc = start_pc + exec_bytes;
- for (int pc = start_pc; pc < stop_pc; )
- {
- // Cleanup any expired "with" blocks.
- while (with_stack.size() > 0
- && pc >= with_stack.back().m_block_end_pc)
- {
- // Drop this stack element
- with_stack.resize(with_stack.size() - 1);
- }
-
- // Get the opcode.
- int action_id = m_buffer[pc];
- if ((action_id & 0x80) == 0)
- {
- IF_VERBOSE_ACTION(log_msg("EX:\t");
log_disasm(&m_buffer[pc]));
-
- // IF_VERBOSE_ACTION(log_msg("Action ID is: 0x%x\n",
action_id));
-
- // Simple action; no extra data.
- switch (action_id)
- {
- default:
- break;
-
- case SWF::ACTION_END: // end of actions.
- return;
-
- case SWF::ACTION_NEXTFRAME: // next frame.
-
env->get_target()->goto_frame(env->get_target()->get_current_frame() + 1);
- break;
-
- case SWF::ACTION_PREVFRAME: // prev frame.
-
env->get_target()->goto_frame(env->get_target()->get_current_frame() - 1);
- break;
-
- case SWF::ACTION_PLAY: // action play
- env->get_target()->set_play_state(movie::PLAY);
- break;
-
- case SWF::ACTION_STOP: // action stop
- env->get_target()->set_play_state(movie::STOP);
- break;
-
- case SWF::ACTION_TOGGLEQUALITY: // toggle
quality
- case SWF::ACTION_STOPSOUNDS: // stop sounds
- break;
-
- case SWF::ACTION_ADD: // add
- {
- env->top(1) += env->top(0);
- env->drop(1);
- break;
- }
- case SWF::ACTION_SUBTRACT: // subtract
- {
- env->top(1) -= env->top(0);
- env->drop(1);
- break;
- }
- case SWF::ACTION_MULTIPLY: // multiply
- {
- env->top(1) *= env->top(0);
- env->drop(1);
- break;
- }
- case SWF::ACTION_DIVIDE: // divide
- {
- env->top(1) /= env->top(0);
- env->drop(1);
- break;
- }
- case SWF::ACTION_EQUAL: // equal
- {
- env->top(1).set_bool(env->top(1) == env->top(0));
- env->drop(1);
- break;
- }
- case SWF::ACTION_LESSTHAN: // less than
- {
- env->top(1).set_bool(env->top(1) < env->top(0));
- env->drop(1);
- break;
- }
- case SWF::ACTION_LOGICALAND: // logical and
- {
- env->top(1).set_bool(env->top(1).to_bool() &&
env->top(0).to_bool());
- env->drop(1);
- break;
- }
- case SWF::ACTION_LOGICALOR: // logical or
- {
- env->top(1).set_bool(env->top(1).to_bool() &&
env->top(0).to_bool());
- env->drop(1);
- break;
- }
- case SWF::ACTION_LOGICALNOT: // logical not
- {
- env->top(0).set_bool(! env->top(0).to_bool());
- break;
- }
- case SWF::ACTION_STRINGEQ: // string equal
- doActionEquals(env);
- break;
- case SWF::ACTION_STRINGLENGTH: // string length
- {
-
env->top(0).set_int(env->top(0).to_tu_string_versioned(version).utf8_length());
- break;
- }
- case SWF::ACTION_SUBSTRING: // substring
- {
- int size = int(env->top(0).to_number());
- int base = int(env->top(1).to_number()) -
1; // 1-based indices
- const tu_string& str =
env->top(2).to_tu_string_versioned(version);
-
- // Keep base within range.
- base = iclamp(base, 0, str.length());
-
- // Truncate if necessary.
- size = imin(str.length() - base, size);
-
- // @@ This can be done without new allocations if
we get dirtier w/ internals
- // of as_value and tu_string...
- tu_string new_string = str.c_str() + base;
- new_string.resize(size);
-
- env->drop(2);
- env->top(0).set_tu_string(new_string);
-
- break;
- }
- case SWF::ACTION_POP: // pop
- {
- env->drop(1);
- break;
- }
- case SWF::ACTION_INT: // int
- {
-
env->top(0).set_int(int(floor(env->top(0).to_number())));
- break;
- }
- case SWF::ACTION_GETVARIABLE: // get variable
- {
- as_value var_name = env->pop();
- tu_string var_string = var_name.to_tu_string();
-
- as_value variable = env->get_variable(var_string,
with_stack);
- env->push(variable);
- if (variable.to_object() == NULL) {
- IF_VERBOSE_ACTION(log_msg("-- get var:
%s=%s\n",
- var_string.c_str(),
-
variable.to_tu_string().c_str()));
- } else {
- IF_VERBOSE_ACTION(log_msg("-- get var: %s=%s
at %p\n",
- var_string.c_str(),
-
variable.to_tu_string().c_str(), variable.to_object()));
- }
-
-
- break;
- }
- case SWF::ACTION_SETVARIABLE: // set variable
- {
- env->set_variable(env->top(1).to_tu_string(),
env->top(0), with_stack);
- IF_VERBOSE_ACTION(log_msg("-- set var: %s \n",
-
env->top(1).to_tu_string().c_str()));
-
- env->drop(2);
- break;
- }
- case SWF::ACTION_SETTARGETEXPRESSION: // set target
expression
- {
- const char * target_name =
env->top(0).to_string();
- env->drop(1); // pop the target name off the stack
- movie *new_target;
-
- // if the string is blank, we set target to the
root movie
- // TODO - double check this is correct?
- if (target_name[0] == '\0')
- new_target = env->find_target((tu_string)"/");
- else
- new_target =
env->find_target((tu_string)target_name);
-
- if (new_target == NULL)
- {
- IF_VERBOSE_ACTION(log_error(
- "Couldn't find
movie \"%s\" to set target to!"
- " Not setting
target at all...",
- (const char
*)target_name));
- }
- else
- env->set_target(new_target);
-
- break;
- }
- case SWF::ACTION_STRINGCONCAT: // string concat
- {
- env->top(1).convert_to_string_versioned(version);
-
env->top(1).string_concat(env->top(0).to_tu_string_versioned(version));
- env->drop(1);
- break;
- }
- case SWF::ACTION_GETPROPERTY: // get property
- {
-
- movie* target = env->find_target(env->top(1));
- if (target)
- {
- env->top(1) = get_property(target, (int)
env->top(0).to_number());
- }
- else
- {
- env->top(1) = as_value();
- }
- env->drop(1);
- break;
- }
-
- case SWF::ACTION_SETPROPERTY: // set property
- {
-
- movie* target = env->find_target(env->top(2));
- if (target)
- {
- set_property(target, (int)
env->top(1).to_number(), env->top(0));
- }
- env->drop(3);
- break;
- }
-
- case SWF::ACTION_DUPLICATECLIP: // duplicate
clip (sprite?)
- {
- env->get_target()->clone_display_object(
- env->top(2).to_tu_string(),
- env->top(1).to_tu_string(),
- (int) env->top(0).to_number());
- env->drop(3);
- break;
- }
-
- case SWF::ACTION_REMOVECLIP: // remove clip
-
env->get_target()->remove_display_object(env->top(0).to_tu_string());
- env->drop(1);
- break;
-
- case SWF::ACTION_TRACE: // trace
- {
- // Log the stack val.
- as_global_trace(fn_call(&env->top(0), NULL, env,
1, env->get_top_index()));
- env->drop(1);
- break;
- }
-
- case SWF::ACTION_STARTDRAGMOVIE: // start drag
movie
- {
- movie::drag_state st;
-
- st.m_character = env->find_target(env->top(0));
- if (st.m_character == NULL)
- {
- log_error("error: start_drag of invalid
target '%s'.\n",
- env->top(0).to_string());
- }
-
- st.m_lock_center = env->top(1).to_bool();
- st.m_bound = env->top(2).to_bool();
- if (st.m_bound)
- {
- st.m_bound_x0 = (float)
env->top(6).to_number();
- st.m_bound_y0 = (float)
env->top(5).to_number();
- st.m_bound_x1 = (float)
env->top(4).to_number();
- st.m_bound_y1 = (float)
env->top(3).to_number();
- env->drop(4);
- }
- env->drop(3);
-
- movie* root_movie =
env->get_target()->get_root_movie();
- assert(root_movie);
-
- if (root_movie && st.m_character)
- {
- root_movie->set_drag_state(st);
- }
-
- break;
- }
-
- case SWF::ACTION_STOPDRAGMOVIE: // stop drag
movie
- {
- movie* root_movie =
env->get_target()->get_root_movie();
- assert(root_movie);
-
- root_movie->stop_drag();
-
- break;
- }
-
- case SWF::ACTION_STRINGCOMPARE: // string less
than
- {
- env->top(1).set_bool(env->top(1).to_tu_string() <
env->top(0).to_tu_string());
- break;
- }
-
- case SWF::ACTION_THROW: // 0x2A
- {
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
-
- case SWF::ACTION_CASTOP: // 0x2B
- doActionCast(env);
- break;
- case SWF::ACTION_IMPLEMENTSOP: // 0x2C
- {
- // Declare that a class s1 implements one or more
- // interfaces (i2 == number of interfaces, s3..sn
are the names
- // of the interfaces).
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
-
- case SWF::ACTION_RANDOM: // random
- {
- int max = int(env->top(0).to_number());
- if (max < 1) max = 1;
- env->top(0).set_int(tu_random::next_random() %
max);
- break;
- }
- case SWF::ACTION_MBLENGTH: // mb length
- {
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
- case SWF::ACTION_ORD: // ord
- {
- // ASCII code of first character
- env->top(0).set_int(env->top(0).to_string()[0]);
- break;
- }
- case SWF::ACTION_CHR: // chr
- {
- char buf[2];
- buf[0] = int(env->top(0).to_number());
- buf[1] = 0;
- env->top(0).set_string(buf);
- break;
- }
-
- case SWF::ACTION_GETTIMER: // get timer
- // Push milliseconds since we started playing.
- env->push(floorf(env->m_target->get_timer() *
1000.0f));
- break;
-
- case SWF::ACTION_MBSUBSTRING: // mb substring
- {
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
- case SWF::ACTION_MBCHR: // mb chr
- {
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
- case SWF::ACTION_DELETEVAR: // delete
- doActionDelete(env, with_stack);
- break;
- case SWF::ACTION_DELETE: // delete2
- doActionDelete2(env, with_stack);
- break;
-
- case SWF::ACTION_VAREQUALS: // set local
- {
- as_value value = env->pop();
- as_value varname = env->pop();
- env->set_local(varname.to_tu_string(), value);
- break;
- }
-
- case SWF::ACTION_CALLFUNCTION: // call function
- doActionCallFunction(env, with_stack);
- break;
- case SWF::ACTION_RETURN: // return
- {
- // Put top of stack in the provided return slot,
if
- // it's not NULL.
- if (retval)
- {
- *retval = env->top(0);
- }
- env->drop(1);
-
- // Skip the rest of this buffer (return from this
action_buffer).
- pc = stop_pc;
-
- break;
- }
- case SWF::ACTION_MODULO: // modulo
- {
- as_value result;
- double y = env->pop().to_number();
- double x = env->pop().to_number();
- // Don't need to check for y being 0 here - if
it's zero, fmod returns NaN, which is what flash would do too
- result = fmod(x, y);
-//
env->top(1).set_double(fmod(env->top(1).to_bool() && env->top(0).to_bool());
-// env->drop(1);
-// log_error("modulo x=%f, y=%f,
z=%f\n",x,y,result.to_number());
- env->push(result);
- break;
- }
- case SWF::ACTION_NEW: // new
- doActionNew(env, with_stack);
- break;
- case SWF::ACTION_VAR: // declare local
- {
- const tu_string& varname =
env->top(0).to_tu_string();
- env->declare_local(varname);
- env->drop(1);
- break;
- }
- case SWF::ACTION_INITARRAY: // init array
- {
- int array_size = (int)
env->pop().to_number();
-
- //log_msg("xxx init array: size = %d, top of
stack = %d\n", array_size, env->get_top_index());//xxxxx
-
- // Call the array constructor, to create an empty
array.
- as_value result;
- array_new(fn_call(&result, NULL, env, 0,
env->get_top_index()));
-
- as_object* ao = result.to_object();
- assert(ao);
-
- // Fill the elements with the initial values from
the stack.
- as_value index_number;
- for (int i = 0; i < array_size; i++)
- {
- // @@ TODO a set_member that takes an int
or as_value?
- index_number.set_int(i);
- ao->set_member(index_number.to_string(),
env->pop());
- }
-
- env->push(result);
-
- //log_msg("xxx init array end: top of stack = %d,
trace(top(0)) =", env->get_top_index());//xxxxxxx
-
- //as_global_trace(fn_call(NULL, NULL, env, 1,
env->get_top_index())); //xxxx
-
- break;
- }
- case SWF::ACTION_INITOBJECT: // declare object
- {
- //
- // SWFACTION_PUSH
- // [000] Constant: 1 "obj"
- // [001] Constant: 0 "member" <-- we handle
up to here
- // [002] Integer: 1
- // [003] Integer: 1
- // SWFACTION_INITOBJECT
-
- int nmembers = (int) env->pop().to_number();
-
- smart_ptr<as_object> new_obj_ptr(new as_object);
-
- // Set provided members
- for (int i=0; i<nmembers; ++i) {
- as_value member_value = env->pop();
- tu_stringi member_name =
env->pop().to_tu_stringi();
- new_obj_ptr->set_member(member_name,
member_value);
- }
-
- // @@ TODO
- //log_error("checkme opcode: %02X\n", action_id);
-
- as_value new_obj;
- new_obj.set_as_object(new_obj_ptr.get_ptr());
-
- //env->drop(nmembers*2);
- env->push(new_obj);
-
- break;
- }
- case SWF::ACTION_TYPEOF: // type of
- {
- switch(env->top(0).get_type())
- {
- case as_value::UNDEFINED:
- env->top(0).set_string("undefined");
- break;
- case as_value::STRING:
- env->top(0).set_string("string");
- break;
- case as_value::NUMBER:
- env->top(0).set_string("number");
- break;
- case as_value::BOOLEAN:
- env->top(0).set_string("boolean");
- break;
- case as_value::OBJECT:
- env->top(0).set_string("object");
- break;
- case as_value::NULLTYPE:
- env->top(0).set_string("null");
- break;
- case as_value::AS_FUNCTION:
- env->top(0).set_string("function");
- break;
- default:
- log_error("typeof unknown type:
%02X\n", env->top(0).get_type());
- break;
- }
- break;
- }
- case SWF::ACTION_TARGETPATH: // get target
- {
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- }
- case SWF::ACTION_ENUMERATE: // enumerate
- {
- as_value var_name = env->pop();
- const tu_string& var_string =
var_name.to_tu_string();
-
- as_value variable = env->get_variable(var_string,
with_stack);
-
- if (variable.to_object() == NULL)
- {
- break;
- }
- const as_object* object = (as_object*)
(variable.to_object());
-
- // The end of the enumeration
- as_value nullvalue;
- nullvalue.set_null();
- env->push(nullvalue);
- IF_VERBOSE_ACTION(log_msg("---enumerate - push:
NULL\n"));
-
- stringi_hash<as_member>::const_iterator it =
object->m_members.begin();
- while (it != object->m_members.end())
- {
- const as_member member = (it->second);
-
- if (!
member.get_member_flags().get_dont_enum())
- {
-
env->push(as_value(it->first.c_str()));
-
-
IF_VERBOSE_ACTION(log_msg("---enumerate - push: %s\n",
-
it->first.c_str()));
- }
-
- ++it;
- }
-
- const as_object * prototype = (as_object *)
object->m_prototype;
- if (prototype != NULL)
- {
- stringi_hash<as_member>::const_iterator
it = prototype->m_members.begin();
- while (it != prototype->m_members.end())
- {
- const as_member member =
(it->second);
-
- if (!
member.get_member_flags().get_dont_enum())
- {
-
env->push(as_value(it->first.c_str()));
-
-
IF_VERBOSE_ACTION(log_msg("---enumerate - push: %s\n",
-
it->first.c_str()));
- }
-
- ++it;
- };
- }
-
- break;
- }
- case SWF::ACTION_NEWADD: // add_t (typed)
- {
- if (env->top(0).get_type() == as_value::STRING
- || env->top(1).get_type() == as_value::STRING)
- {
-
env->top(1).convert_to_string_versioned(version);
-
env->top(1).string_concat(env->top(0).to_tu_string_versioned(version));
- }
- else
- {
- env->top(1) += env->top(0);
- }
- env->drop(1);
- break;
- }
- case SWF::ACTION_NEWLESSTHAN: // less than (typed)
- {
- if (env->top(1).get_type() == as_value::STRING)
- {
-
env->top(1).set_bool(env->top(1).to_tu_string() < env->top(0).to_tu_string());
- }
- else
- {
- env->top(1).set_bool(env->top(1) <
env->top(0));
- }
- env->drop(1);
- break;
- }
- case SWF::ACTION_NEWEQUALS: // equal (typed)
- doActionStrictEquals(env);
- break;
- case SWF::ACTION_TONUMBER: // to number
- {
- env->top(0).convert_to_number();
- break;
- }
- case SWF::ACTION_TOSTRING: // to string
- {
- env->top(0).convert_to_string_versioned(version);
- break;
- }
- case SWF::ACTION_DUP: // dup
- env->push(env->top(0));
- break;
-
- case SWF::ACTION_SWAP: // swap
- {
- as_value temp = env->top(1);
- env->top(1) = env->top(0);
- env->top(0) = temp;
- break;
- }
- case SWF::ACTION_GETMEMBER: // get member
- doActionGetMember(env);
- break;
- case SWF::ACTION_SETMEMBER: // set member
- {
- as_object* obj = env->top(2).to_object();
- if (obj)
- {
-
obj->set_member(env->top(1).to_tu_string(), env->top(0));
- IF_VERBOSE_ACTION(
- log_msg("-- set_member %s.%s=%s\n",
-
env->top(2).to_tu_string().c_str(),
-
env->top(1).to_tu_string().c_str(),
-
env->top(0).to_tu_string().c_str()));
- }
- else
- {
- // Invalid object, can't set.
- IF_VERBOSE_ACTION(
- log_msg("-- set_member %s.%s=%s on
invalid object!\n",
-
env->top(2).to_tu_string().c_str(),
-
env->top(1).to_tu_string().c_str(),
-
env->top(0).to_tu_string().c_str()));
- }
- env->drop(3);
- break;
- }
- case SWF::ACTION_INCREMENT: // increment
- env->top(0) += 1;
- break;
- case SWF::ACTION_DECREMENT: // decrement
- env->top(0) -= 1;
- break;
-
- case SWF::ACTION_CALLMETHOD: // call method
- doActionCallMethod(env);
- break;
- case SWF::ACTION_NEWMETHOD: // new method
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- case SWF::ACTION_INSTANCEOF: // instance of
- // @@ TODO
- doActionInstanceOf(env);
- break;
- case SWF::ACTION_ENUM2: // enumerate object
- // @@ TODO
- log_error("todo opcode: %02X\n", action_id);
- break;
- case SWF::ACTION_BITWISEAND: // bitwise and
- env->top(1) &= env->top(0);
- env->drop(1);
- break;
- case SWF::ACTION_BITWISEOR: // bitwise or
- env->top(1) |= env->top(0);
- env->drop(1);
- break;
- case SWF::ACTION_BITWISEXOR: // bitwise xor
- env->top(1) ^= env->top(0);
- env->drop(1);
- break;
- case SWF::ACTION_SHIFTLEFT: // shift left
- env->top(1).shl(env->top(0));
- env->drop(1);
- break;
- case SWF::ACTION_SHIFTRIGHT: // shift right (signed)
- env->top(1).asr(env->top(0));
- env->drop(1);
- break;
- case SWF::ACTION_SHIFTRIGHT2: // shift right
(unsigned)
- env->top(1).lsr(env->top(0));
- env->drop(1);
- break;
- case SWF::ACTION_STRICTEQ: // strict equal
- if (env->top(1).get_type() !=
env->top(0).get_type())
- {
- // Types don't match.
- env->top(1).set_bool(false);
- env->drop(1);
- }
- else
- {
- env->top(1).set_bool(env->top(1) ==
env->top(0));
- env->drop(1);
- }
- break;
- case SWF::ACTION_GREATER: // 0x67:
- if (env->top(1).get_type() == as_value::STRING)
- {
-
env->top(1).set_bool(env->top(1).to_tu_string() > env->top(0).to_tu_string());
- }
- else
- {
-
env->top(1).set_bool(env->top(1).to_number() > env->top(0).to_number());
- }
- env->drop(1);
- break;
- case SWF::ACTION_STRINGGREATER: // 0x68
- env->top(1).set_bool(env->top(1).to_tu_string() >
env->top(0).to_tu_string());
- env->drop(1);
- break;
-
- case SWF::ACTION_EXTENDS: // 0x69
- log_error("todo opcode: %02X\n", action_id);
- break;
-
- }
- pc++; // advance to next action.
- }
- else
- {
- IF_VERBOSE_ACTION(log_msg("EX:\t");
log_disasm(&m_buffer[pc]));
-
- // Action containing extra data.
- int length = m_buffer[pc + 1] | (m_buffer[pc + 2] << 8);
- int next_pc = pc + length + 3;
-
- switch (action_id)
- {
- default:
- break;
-
- case SWF::ACTION_GOTOFRAME: // goto frame
- {
- int frame = m_buffer[pc + 3] | (m_buffer[pc
+ 4] << 8);
- // 0-based already?
- //// Convert from 1-based to 0-based
- //frame--;
- env->get_target()->goto_frame(frame);
- break;
- }
-
- case SWF::ACTION_GETURL: // get url
- {
- // If this is an FSCommand, then call the callback
- // handler, if any.
-
- // Two strings as args.
- const char* url = (const char*)
&(m_buffer[pc + 3]);
- int url_len = strlen(url);
- const char* target = (const char*)
&(m_buffer[pc + 3 + url_len + 1]);
-
- // If the url starts with an "http" or "https",
- // then we want to load it into a web browser.
- if (strncmp(url, "http", 4) == 0) {
+ for (int pc = start_pc; pc < stop_pc; ) {
+ // Cleanup any expired "with" blocks.
+ while (with_stack.size() > 0
+ && pc >= with_stack.back().m_block_end_pc) {
+ // Drop this stack element
+ with_stack.resize(with_stack.size() - 1);
+ }
+
+ // Get the opcode.
+ int action_id = m_buffer[pc];
+ if ((action_id & 0x80) == 0) {
+ IF_VERBOSE_ACTION((dbglogfile << "\nEX:\t");
log_disasm(&m_buffer[pc]));
+
+ // IF_VERBOSE_ACTION(log_msg("Action ID is: 0x%x\n", action_id));
+
+ ash.execute((action_type)action_id, *env);
+ pc++; // advance to next action.
+ } else {
+ IF_VERBOSE_ACTION(dbglogfile << "\nEX:\t";
log_disasm(&m_buffer[pc]));
+
+ // Action containing extra data.
+ int length = m_buffer[pc + 1] | (m_buffer[pc + 2] << 8);
+ int next_pc = pc + length + 3;
+
+ switch (action_id) {
+ default:
+ break;
+
+ case SWF::ACTION_GOTOFRAME: // goto frame
+ {
+ int frame = m_buffer[pc + 3] | (m_buffer[pc + 4] << 8);
+ // 0-based already?
+ //// Convert from 1-based to 0-based
+ //frame--;
+ env->get_target()->goto_frame(frame);
+ break;
+ }
+
+ case SWF::ACTION_GETURL: // get url
+ {
+ // If this is an FSCommand, then call the callback
+ // handler, if any.
+
+ // Two strings as args.
+ const char* url = (const char*) &(m_buffer[pc + 3]);
+ int url_len = strlen(url);
+ const char* target = (const char*) &(m_buffer[pc + 3 +
url_len + 1]);
+
+ // If the url starts with an "http" or "https",
+ // then we want to load it into a web browser.
+ if (strncmp(url, "http", 4) == 0) {
// if (windowid) {
// Atom mAtom = 486;
// Display *mDisplay = XOpenDisplay(NULL);
@@ -1981,481 +904,426 @@
// XA_STRING, 8,
PropModeReplace,
// (unsigned char *)url,
// url_len);
-
+
// XUnlockDisplay(mDisplay);
// XCloseDisplay(mDisplay);
// } else {
- string command = "firefox -remote
\"openurl(";
- command += url;
- command += ")\"";
- dbglogfile << "Launching URL... " <<
command << endl;
+ string command = "firefox -remote \"openurl(";
+ command += url;
+ command += ")\"";
+ dbglogfile << "Launching URL... " << command << endl;
// movie *target = env->get_target();
// target->get_url(url);
- system(command.c_str());
+ system(command.c_str());
// }
- break;
- }
-
- // If the url starts with "FSCommand:", then this
is
- // a message for the host app.
- if (strncmp(url, "FSCommand:", 10) == 0)
- {
- if (s_fscommand_handler)
- {
- // Call into the app.
-
(*s_fscommand_handler)(env->get_target()->get_root_interface(), url + 10,
target);
- }
- }
- else
- {
+ break;
+ }
+
+ // If the url starts with "FSCommand:", then this is
+ // a message for the host app.
+ if (strncmp(url, "FSCommand:", 10) == 0) {
+ if (s_fscommand_handler) {
+ // Call into the app.
+
(*s_fscommand_handler)(env->get_target()->get_root_interface(), url + 10,
target);
+ }
+ } else {
#ifdef EXTERN_MOVIE
// log_error("get url: target=%s, url=%s\n",
target, url);
-
- tu_string tu_target = target;
- movie* target_movie =
env->find_target(tu_target);
- if (target_movie != NULL)
- {
- movie* root_movie =
env->get_target()->get_root_movie();
- attach_extern_movie(url,
target_movie, root_movie);
- }
- else
- {
- log_error("get url: target %s not
found\n", target);
- }
+
+ tu_string tu_target = target;
+ movie* target_movie = env->find_target(tu_target);
+ if (target_movie != NULL) {
+ movie *root_movie =
env->get_target()->get_root_movie();
+ attach_extern_movie(url, target_movie, root_movie);
+ } else {
+ log_error("get url: target %s not found\n", target);
+ }
#endif // EXTERN_MOVIE
- }
-
- break;
- }
-
- case SWF::ACTION_SETREGISTER: // store_register
- {
- int reg = m_buffer[pc + 3];
- // Save top of stack in specified register.
- if (is_function2)
- {
- *(env->local_register_ptr(reg)) =
env->top(0);
-
- IF_VERBOSE_ACTION(
- log_msg("-------------- local
register[%d] = '%s'\n",
- reg,
- env->top(0).to_string()));
- }
- else if (reg >= 0 && reg < 4)
- {
- env->m_global_register[reg] = env->top(0);
-
- IF_VERBOSE_ACTION(
- log_msg("-------------- global
register[%d] = '%s'\n",
- reg,
- env->top(0).to_string()));
- }
- else
- {
- log_error("store_register[%d] -- register
out of bounds!", reg);
- }
-
- break;
- }
-
- case SWF::ACTION_CONSTANTPOOL: // decl_dict:
declare dictionary
- {
- int i = pc;
- //int count = m_buffer[pc + 3] | (m_buffer[pc
+ 4] << 8);
- i += 2;
-
- process_decl_dict(pc, next_pc);
-
- break;
- }
-
- case SWF::ACTION_WAITFORFRAME: // wait for
frame
- {
- // If we haven't loaded a specified frame yet,
then we're supposed to skip
- // some specified number of actions.
- //
- // Since we don't load incrementally, just ignore
this opcode.
- break;
- }
-
- case SWF::ACTION_SETTARGET: // set target
- {
- // Change the movie we're working on.
- const char* target_name = (const char*)
&m_buffer[pc + 3];
- movie *new_target;
-
- // if the string is blank, we set target to the
root movie
- // TODO - double check this is correct?
- if (target_name[0] == '\0')
- new_target = env->find_target((tu_string)"/");
- else
- new_target =
env->find_target((tu_string)target_name);
-
- if (new_target == NULL)
- {
- IF_VERBOSE_ACTION(log_error(
- "Couldn't find
movie \"%s\" to set target to!"
- " Not setting
target at all...",
- (const char
*)target_name));
- }
- else
- env->set_target(new_target);
-
- break;
- }
-
- case SWF::ACTION_GOTOLABEL: // go to labeled frame,
goto_frame_lbl
- {
- char* frame_label = (char*) &m_buffer[pc + 3];
- movie *target = env->get_target();
- target->goto_labeled_frame(frame_label);
- break;
- }
-
- case SWF::ACTION_WAITFORFRAMEEXPRESSION: // wait
for frame expression (?)
- {
- // Pop the frame number to wait for; if it's not
loaded skip the
- // specified number of actions.
- //
- // Since we don't support incremental loading,
pop our arg and
- // don't do anything.
- env->drop(1);
- break;
- }
-
- case SWF::ACTION_DEFINEFUNCTION2: // 0x8E
- doActionDefineFunction2(env, with_stack, pc,
&next_pc);
- break;
-
- case SWF::ACTION_WITH: // with
- {
- int frame = m_buffer[pc + 3] | (m_buffer[pc
+ 4] << 8);
- UNUSED(frame);
- IF_VERBOSE_ACTION(log_msg("-------------- with
block start: stack size is %zd\n", with_stack.size()));
- if (with_stack.size() < 8)
- {
- int block_length = m_buffer[pc + 3]
| (m_buffer[pc + 4] << 8);
- int block_end = next_pc +
block_length;
- as_object* with_obj =
env->top(0).to_object();
-
with_stack.push_back(with_stack_entry(with_obj, block_end));
- }
- env->drop(1);
- break;
- }
- case SWF::ACTION_PUSHDATA: // push_data
- {
- int i = pc;
- while (i - pc < length)
- {
- int type = m_buffer[3 + i];
- i++;
- if (type == 0)
- {
- // string
- const char* str = (const
char*) &m_buffer[3 + i];
- i += strlen(str) + 1;
- env->push(str);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed '%s'\n", str));
- }
- else if (type == 1)
- {
- // float (little-endian)
- union {
- float f;
- uint32_t i;
- } u;
- compiler_assert(sizeof(u) ==
sizeof(u.i));
-
- memcpy(&u.i, &m_buffer[3 + i], 4);
- u.i = swap_le32(u.i);
- i += 4;
-
- env->push(u.f);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed '%f'\n", u.f));
- }
- else if (type == 2)
- {
- as_value nullvalue;
- nullvalue.set_null();
- env->push(nullvalue);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed NULL\n"));
- }
- else if (type == 3)
- {
- env->push(as_value());
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed UNDEFINED\n"));
- }
- else if (type == 4)
- {
- // contents of register
- int reg = m_buffer[3 + i];
- UNUSED(reg);
- i++;
- if (is_function2)
- {
-
env->push(*(env->local_register_ptr(reg)));
- IF_VERBOSE_ACTION(
-
log_msg("-------------- pushed local register[%d] = '%s'\n",
- reg,
-
env->top(0).to_string()));
- }
- else if (reg < 0 || reg >= 4)
- {
- env->push(as_value());
- log_error("push
register[%d] -- register out of bounds!\n", reg);
- }
- else
- {
-
env->push(env->m_global_register[reg]);
- IF_VERBOSE_ACTION(
-
log_msg("-------------- pushed global register[%d] = '%s'\n",
- reg,
-
env->top(0).to_string()));
- }
-
- }
- else if (type == 5)
- {
- bool bool_val = m_buffer[3 +
i] ? true : false;
- i++;
+ }
+
+ break;
+ }
+
+ case SWF::ACTION_SETREGISTER: // store_register
+ {
+ int reg = m_buffer[pc + 3];
+ // Save top of stack in specified register.
+ if (is_function2) {
+ *(env->local_register_ptr(reg)) = env->top(0);
+
+ IF_VERBOSE_ACTION(
+ log_msg("-------------- local register[%d] = '%s'\n",
+ reg,
+ env->top(0).to_string()));
+ } else if (reg >= 0 && reg < 4) {
+ env->m_global_register[reg] = env->top(0);
+
+ IF_VERBOSE_ACTION(
+ log_msg("-------------- global register[%d] = '%s'\n",
+ reg,
+ env->top(0).to_string()));
+ } else {
+ log_error("store_register[%d] -- register out of
bounds!", reg);
+ }
+
+ break;
+ }
+
+ case SWF::ACTION_CONSTANTPOOL: // decl_dict: declare dictionary
+ {
+ int i = pc;
+ //int count = m_buffer[pc + 3] | (m_buffer[pc + 4] << 8);
+ i += 2;
+
+ process_decl_dict(pc, next_pc);
+
+ break;
+ }
+
+ case SWF::ACTION_WAITFORFRAME: // wait for frame
+ {
+ // If we haven't loaded a specified frame yet, then we're
supposed to skip
+ // some specified number of actions.
+ //
+ // Since we don't load incrementally, just ignore this opcode.
+ break;
+ }
+
+ case SWF::ACTION_SETTARGET: // set target
+ {
+ // Change the movie we're working on.
+ const char* target_name = (const char*) &m_buffer[pc + 3];
+ movie *new_target;
+
+ // if the string is blank, we set target to the root movie
+ // TODO - double check this is correct?
+ if (target_name[0] == '\0')
+ new_target = env->find_target((tu_string)"/");
+ else
+ new_target = env->find_target((tu_string)target_name);
+
+ if (new_target == NULL) {
+ IF_VERBOSE_ACTION(log_error(
+ "Couldn't find movie \"%s\" to set
target to!"
+ " Not setting target at all...",
+ (const char *)target_name));
+ }
+ else
+ env->set_target(new_target);
+
+ break;
+ }
+
+ case SWF::ACTION_GOTOLABEL: // go to labeled frame,
goto_frame_lbl
+ {
+ char* frame_label = (char*) &m_buffer[pc + 3];
+ movie *target = env->get_target();
+ target->goto_labeled_frame(frame_label);
+ break;
+ }
+
+ case SWF::ACTION_WAITFORFRAMEEXPRESSION: // wait for frame
expression (?)
+ {
+ // Pop the frame number to wait for; if it's not loaded skip
the
+ // specified number of actions.
+ //
+ // Since we don't support incremental loading, pop our arg and
+ // don't do anything.
+ env->drop(1);
+ break;
+ }
+
+ case SWF::ACTION_DEFINEFUNCTION2: // 0x8E
+ doActionDefineFunction2(env, with_stack, pc, &next_pc);
+ break;
+
+ case SWF::ACTION_WITH: // with
+ {
+ int frame = m_buffer[pc + 3] | (m_buffer[pc + 4] << 8);
+ UNUSED(frame);
+ IF_VERBOSE_ACTION(log_msg("-------------- with block start:
stack size is %zd\n", with_stack.size()));
+ if (with_stack.size() < 8) {
+ int block_length = m_buffer[pc + 3] | (m_buffer[pc
+ 4] << 8);
+ int block_end = next_pc + block_length;
+ as_object* with_obj = env->top(0).to_object();
+ with_stack.push_back(with_stack_entry(with_obj,
block_end));
+ }
+ env->drop(1);
+ break;
+ }
+ case SWF::ACTION_PUSHDATA: // push_data
+ {
+ int i = pc;
+ while (i - pc < length) {
+ int type = m_buffer[3 + i];
+ i++;
+ if (type == 0) {
+ // string
+ const char* str = (const char*) &m_buffer[3 + i];
+ i += strlen(str) + 1;
+ env->push(str);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed '"
+ << str << "'" << endl);
+ } else if (type == 1) {
+ // float (little-endian)
+ union {
+ float f;
+ uint32_t i;
+ } u;
+ compiler_assert(sizeof(u) == sizeof(u.i));
+
+ memcpy(&u.i, &m_buffer[3 + i], 4);
+ u.i = swap_le32(u.i);
+ i += 4;
+
+ env->push(u.f);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed '"
+ <<u.f << "'" << endl);
+ } else if (type == 2) {
+ as_value nullvalue;
+ nullvalue.set_null();
+ env->push(nullvalue);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed NULL" <<
endl);
+ } else if (type == 3) {
+ env->push(as_value());
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed UNDEFINED"
<< endl);
+ } else if (type == 4) {
+ // contents of register
+ int reg = m_buffer[3 + i];
+ UNUSED(reg);
+ i++;
+ if (is_function2) {
+ env->push(*(env->local_register_ptr(reg)));
+ IF_VERBOSE_ACTION(
+ log_msg("-------------- pushed local
register[%d] = '%s'\n",
+ reg,
+ env->top(0).to_string()));
+ } else if (reg < 0 || reg >= 4) {
+ env->push(as_value());
+ log_error("push register[%d] -- register out of
bounds!\n", reg);
+ } else {
+ env->push(env->m_global_register[reg]);
+ IF_VERBOSE_ACTION(
+ log_msg("-------------- pushed global
register[%d] = '%s'\n",
+ reg,
+ env->top(0).to_string()));
+ }
+
+ } else if (type == 5) {
+ bool bool_val = m_buffer[3 + i] ? true : false;
+ i++;
// log_msg("bool(%d)\n",
bool_val);
- env->push(bool_val);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed %s\n", bool_val ? "true" :
"false"));
- }
- else if (type == 6)
- {
- // double
- // wacky format: 45670123
- union {
- double d;
- uint64 i;
- struct {
- uint32_t lo;
- uint32_t hi;
- } sub;
- } u;
- compiler_assert(sizeof(u) ==
sizeof(u.i));
-
- memcpy(&u.sub.hi, &m_buffer[3 +
i], 4);
- memcpy(&u.sub.lo, &m_buffer[3 + i
+ 4], 4);
- u.i = swap_le64(u.i);
- i += 8;
-
- env->push(u.d);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed double %f\n", u.d));
- }
- else if (type == 7)
- {
- // int32
- int32_t val = m_buffer[3 + i]
- | (m_buffer[3 + i + 1] << 8)
- | (m_buffer[3 + i + 2] << 16)
- | (m_buffer[3 + i + 3] << 24);
- i += 4;
-
- env->push(val);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed int32 %d\n", val));
- }
- else if (type == 8)
- {
- int id = m_buffer[3 + i];
- i++;
- if (id < (int)
m_dictionary.size())
- {
-
env->push(m_dictionary[id]);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed '%s'\n", m_dictionary[id]));
- }
- else
- {
- log_error("error:
dict_lookup(%d) is out of bounds!\n", id);
- env->push(0);
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed 0\n"));
- }
- }
- else if (type == 9)
- {
- int id = m_buffer[3 + i] |
(m_buffer[4 + i] << 8);
- i += 2;
- if (id < (int)
m_dictionary.size())
- {
-
env->push(m_dictionary[id]);
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed '%s'\n", m_dictionary[id]));
- }
- else
- {
- log_error("error:
dict_lookup(%d) is out of bounds!\n", id);
- env->push(0);
-
-
IF_VERBOSE_ACTION(log_msg("-------------- pushed 0"));
- }
- }
- }
-
- break;
- }
- case SWF::ACTION_BRANCHALWAYS: // branch
always (goto)
- {
- int16_t offset = m_buffer[pc + 3] |
(m_buffer[pc + 4] << 8);
- next_pc += offset;
- // @@ TODO range checks
- break;
+ env->push(bool_val);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed "
+ << (bool_val ? "true" : "false"));
+ } else if (type == 6) {
+ // double
+ // wacky format: 45670123
+ union {
+ double d;
+ uint64 i;
+ struct {
+ uint32_t lo;
+ uint32_t hi;
+ } sub;
+ } u;
+ compiler_assert(sizeof(u) == sizeof(u.i));
+
+ memcpy(&u.sub.hi, &m_buffer[3 + i], 4);
+ memcpy(&u.sub.lo, &m_buffer[3 + i + 4], 4);
+ u.i = swap_le64(u.i);
+ i += 8;
+
+ env->push(u.d);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed double " <<
u.d << endl);
+ } else if (type == 7) {
+ // int32
+ int32_t val = m_buffer[3 + i]
+ | (m_buffer[3 + i + 1] << 8)
+ | (m_buffer[3 + i + 2] << 16)
+ | (m_buffer[3 + i + 3] << 24);
+ i += 4;
+
+ env->push(val);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed int32 " <<
val << endl);
+ } else if (type == 8) {
+ int id = m_buffer[3 + i];
+ i++;
+ if (id < (int) m_dictionary.size()) {
+ env->push(m_dictionary[id]);
+
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed '"
+ << m_dictionary[id] << "'" << endl);
+ } else {
+ log_error("error: dict_lookup(%d) is out of
bounds!\n", id);
+ env->push(0);
+ IF_VERBOSE_ACTION(
+ dbglogfile << "-------------- pushed 0\n");
+ }
+ } else if (type == 9) {
+ int id = m_buffer[3 + i] | (m_buffer[4 + i] << 8);
+ i += 2;
+ if (id < (int) m_dictionary.size()) {
+ env->push(m_dictionary[id]);
+ IF_VERBOSE_ACTION(log_msg("-------------- pushed
'%s'\n", m_dictionary[id]));
+ } else {
+ log_error("error: dict_lookup(%d) is out of
bounds!\n", id);
+ env->push(0);
+
+ IF_VERBOSE_ACTION(dbglogfile << "--------------
pushed 0");
}
- case SWF::ACTION_GETURL2: // get url 2
- {
- int method = m_buffer[pc + 3];
- UNUSED(method);
-
- const char* target =
env->top(0).to_string();
- const char* url = env->top(1).to_string();
-
- // If the url starts with "FSCommand:", then this
is
- // a message for the host app.
- if (strncmp(url, "FSCommand:", 10) == 0)
- {
- if (s_fscommand_handler)
- {
- // Call into the app.
-
(*s_fscommand_handler)(env->get_target()->get_root_interface(), url + 10,
target);
- }
- }
- else
- {
+ }
+ }
+
+ break;
+ }
+ case SWF::ACTION_BRANCHALWAYS: // branch always (goto)
+ {
+ int16_t offset = m_buffer[pc + 3] | (m_buffer[pc + 4]
<< 8);
+ next_pc += offset;
+ // @@ TODO range checks
+ break;
+ }
+ case SWF::ACTION_GETURL2: // get url 2
+ {
+ int method = m_buffer[pc + 3];
+ UNUSED(method);
+
+ const char* target = env->top(0).to_string();
+ const char* url = env->top(1).to_string();
+
+ // If the url starts with "FSCommand:", then this is
+ // a message for the host app.
+ if (strncmp(url, "FSCommand:", 10) == 0) {
+ if (s_fscommand_handler) {
+ // Call into the app.
+
(*s_fscommand_handler)(env->get_target()->get_root_interface(), url + 10,
target);
+ }
+ } else {
#ifdef EXTERN_MOVIE
// log_error("get url2: target=%s, url=%s\n", target, url);
-
- movie* target_movie =
env->find_target(env->top(0));
- if (target_movie != NULL)
- {
- movie* root_movie =
env->get_target()->get_root_movie();
- attach_extern_movie(url,
target_movie, root_movie);
- }
- else
- {
- log_error("get url2: target %s
not found\n", target);
- }
+
+ movie* target_movie = env->find_target(env->top(0));
+ if (target_movie != NULL) {
+ movie* root_movie =
env->get_target()->get_root_movie();
+ attach_extern_movie(url, target_movie, root_movie);
+ } else {
+ log_error("get url2: target %s not found\n", target);
+ }
#endif // EXTERN_MOVIE
- }
- env->drop(2);
- break;
- }
-
- case SWF::ACTION_DEFINEFUNCTION: // declare function
- doActionDefineFunction(env, with_stack, pc,
&next_pc);
- break;
-
- case SWF::ACTION_BRANCHIFTRUE: // branch if
true
- {
- int16_t offset = m_buffer[pc + 3] |
(m_buffer[pc + 4] << 8);
-
- bool test = env->top(0).to_bool();
- env->drop(1);
- if (test)
- {
- next_pc += offset;
-
- if (next_pc > stop_pc)
- {
- log_error("branch to offset %d --
this section only runs to %d\n",
- next_pc,
- stop_pc);
- }
- }
- break;
- }
- case SWF::ACTION_CALLFRAME: // call frame
- {
- // Note: no extra data in this instruction!
- assert(env->m_target);
- env->m_target->call_frame_actions(env->top(0));
- env->drop(1);
-
- break;
- }
-
- case SWF::ACTION_GOTOEXPRESSION: // goto frame
expression, goto_frame_exp
- {
- // From Alexi's SWF ref:
- //
- // Pop a value or a string and jump to the
specified
- // frame. When a string is specified, it can
include a
- // path to a sprite as in:
- //
- // /Test:55
- //
- // When f_play is ON, the action is to play as
soon as
- // that frame is reached. Otherwise, the
- // frame is shown in stop mode.
-
- unsigned char play_flag = m_buffer[pc + 3];
- movie::play_state state = play_flag ? movie::PLAY
: movie::STOP;
-
- movie* target = env->get_target();
- bool success = false;
-
- if (env->top(0).get_type() == as_value::UNDEFINED)
- {
- // No-op.
- }
- else if (env->top(0).get_type() ==
as_value::STRING)
- {
- // @@ TODO: parse possible sprite path...
-
- // Also, if the frame spec is actually a
number (not a label), then
- // we need to do the conversion...
-
- const char* frame_label =
env->top(0).to_string();
- if
(target->goto_labeled_frame(frame_label))
- {
- success = true;
- }
- else
- {
- // Couldn't find the label. Try
converting to a number.
- double num;
- if (string_to_number(&num,
env->top(0).to_string()))
- {
- int frame_number =
int(num);
-
target->goto_frame(frame_number);
- success = true;
- }
- // else no-op.
- }
- }
- else if (env->top(0).get_type() ==
as_value::OBJECT)
- {
- // This is a no-op; see
test_goto_frame.swf
- }
- else if (env->top(0).get_type() ==
as_value::NUMBER)
- {
- // Frame numbers appear to be 0-based!
@@ Verify.
- int frame_number =
int(env->top(0).to_number());
- target->goto_frame(frame_number);
- success = true;
- }
-
- if (success)
- {
- target->set_play_state(state);
- }
-
- env->drop(1);
-
- break;
- }
-
- }
- pc = next_pc;
- }
+ }
+ env->drop(2);
+ break;
+ }
+
+ case SWF::ACTION_DEFINEFUNCTION: // declare function
+ doActionDefineFunction(env, with_stack, pc, &next_pc);
+ break;
+
+ case SWF::ACTION_BRANCHIFTRUE: // branch if true
+ {
+ int16_t offset = m_buffer[pc + 3] | (m_buffer[pc + 4]
<< 8);
+
+ bool test = env->top(0).to_bool();
+ env->drop(1);
+ if (test) {
+ next_pc += offset;
+
+ if (next_pc > stop_pc) {
+ log_error("branch to offset %d -- this section only
runs to %d\n",
+ next_pc,
+ stop_pc);
+ }
+ }
+ break;
+ }
+ case SWF::ACTION_CALLFRAME: // call frame
+ {
+ // Note: no extra data in this instruction!
+ assert(env->m_target);
+ env->m_target->call_frame_actions(env->top(0));
+ env->drop(1);
+
+ break;
+ }
+
+ case SWF::ACTION_GOTOEXPRESSION: // goto frame expression,
goto_frame_exp
+ {
+ // From Alexi's SWF ref:
+ //
+ // Pop a value or a string and jump to the specified
+ // frame. When a string is specified, it can include a
+ // path to a sprite as in:
+ //
+ // /Test:55
+ //
+ // When f_play is ON, the action is to play as soon as
+ // that frame is reached. Otherwise, the
+ // frame is shown in stop mode.
+
+ unsigned char play_flag = m_buffer[pc + 3];
+ movie::play_state state = play_flag ? movie::PLAY :
movie::STOP;
+
+ movie* target = env->get_target();
+ bool success = false;
+
+ if (env->top(0).get_type() == as_value::UNDEFINED) {
+ // No-op.
+ } else if (env->top(0).get_type() == as_value::STRING) {
+ // @@ TODO: parse possible sprite path...
+
+ // Also, if the frame spec is actually a number (not a
label), then
+ // we need to do the conversion...
+
+ const char* frame_label = env->top(0).to_string();
+ if (target->goto_labeled_frame(frame_label)) {
+ success = true;
+ } else {
+ // Couldn't find the label. Try converting to a
number.
+ double num;
+ if (string_to_number(&num, env->top(0).to_string())) {
+ int frame_number = int(num);
+ target->goto_frame(frame_number);
+ success = true;
+ }
+ // else no-op.
+ }
+ } else if (env->top(0).get_type() == as_value::OBJECT) {
+ // This is a no-op; see test_goto_frame.swf
+ } else if (env->top(0).get_type() == as_value::NUMBER) {
+ // Frame numbers appear to be 0-based! @@ Verify.
+ int frame_number = int(env->top(0).to_number());
+ target->goto_frame(frame_number);
+ success = true;
+ }
+
+ if (success) {
+ target->set_play_state(state);
+ }
+
+ env->drop(1);
+ break;
+ }
+ }
+ pc = next_pc;
}
-
+ }
+
env->set_target(original_target);
}
@@ -2464,16 +1332,15 @@
// as_value -- ActionScript value type
//
-
+
as_value::as_value(as_object* obj)
:
m_type(OBJECT),
m_object_value(obj)
{
- if (m_object_value)
- {
- m_object_value->add_ref();
- }
+ if (m_object_value) {
+ m_object_value->add_ref();
+ }
}
@@ -2482,319 +1349,258 @@
m_type(AS_FUNCTION),
m_as_function_value(func)
{
- if (m_as_function_value)
- {
- m_as_function_value->add_ref();
- }
+ if (m_as_function_value) {
+ m_as_function_value->add_ref();
+ }
}
-const char* as_value::to_string() const
- // Conversion to string.
+// Conversion to string.
+const char
+*as_value::to_string() const
{
return to_tu_string().c_str();
}
-const tu_stringi& as_value::to_tu_stringi() const
+const tu_stringi
+&as_value::to_tu_stringi() const
{
return reinterpret_cast<const tu_stringi&>(to_tu_string());
}
-
-const tu_string& as_value::to_tu_string() const
- // Conversion to const tu_string&.
-{
- if (m_type == STRING) { /* don't need to do anything */ }
- else if (m_type == NUMBER)
- {
- // @@ Moock says if value is a NAN, then result is "NaN"
- // INF goes to "Infinity"
- // -INF goes to "-Infinity"
- if (isnan(m_number_value)) m_string_value = "NaN";
- else if (isinf(m_number_value))
- {
- if (m_number_value > 0.0) m_string_value = "+Infinity";
- else m_string_value = "-Infinity";
- }
- else
- {
- char buffer[50];
- snprintf(buffer, 50, "%.14g", m_number_value);
- m_string_value = buffer;
- }
- }
- else if (m_type == UNDEFINED)
- {
- // Behavior depends on file version. In
- // version 7+, it's "undefined", in versions
- // 6-, it's "".
- //
- // We'll go with the v7 behavior by default,
- // and conditionalize via _versioned()
- // functions.
- m_string_value = "undefined";
- }
- else if (m_type == NULLTYPE)
- {
- m_string_value = "null";
- }
- else if (m_type == BOOLEAN)
- {
- m_string_value = this->m_boolean_value ? "true" : "false";
- }
- else if (m_type == OBJECT)
- {
- // @@ Moock says, "the value that results from
- // calling toString() on the object".
- //
- // The default toString() returns "[object
- // Object]" but may be customized.
- //
- // A Movieclip returns the absolute path of the object.
-
- const char* val = NULL;
- if (m_object_value)
- {
- val = m_object_value->get_text_value();
- }
-
- if (val)
- {
- m_string_value = val;
- }
- else
- {
- // Do we have a "toString" method?
- //
- // TODO: we need an environment in order to call toString()!
-
- // This is the default.
- //m_string_value = "[object Object]";
- char buffer[50];
- snprintf(buffer, 50, "<as_object %p>", (void *)
m_object_value);
- m_string_value = buffer;
- }
- }
- else if (m_type == C_FUNCTION)
- {
+// Conversion to const tu_string&.
+const tu_string
+&as_value::to_tu_string() const
+{
+ if (m_type == STRING) {
+ /* don't need to do anything */
+ } else if (m_type == NUMBER) {
+ // @@ Moock says if value is a NAN, then result is "NaN"
+ // INF goes to "Infinity"
+ // -INF goes to "-Infinity"
+ if (isnan(m_number_value)) m_string_value = "NaN";
+ else if (isinf(m_number_value)) {
+ if (m_number_value > 0.0) m_string_value = "+Infinity";
+ else m_string_value = "-Infinity";
+ } else {
char buffer[50];
- snprintf(buffer, 50, "<c_function %p>", (void *)
m_c_function_value);
+ snprintf(buffer, 50, "%.14g", m_number_value);
m_string_value = buffer;
}
- else if (m_type == AS_FUNCTION)
- {
+ } else if (m_type == UNDEFINED) {
+ // Behavior depends on file version. In
+ // version 7+, it's "undefined", in versions
+ // 6-, it's "".
+ //
+ // We'll go with the v7 behavior by default,
+ // and conditionalize via _versioned()
+ // functions.
+ m_string_value = "undefined";
+ } else if (m_type == NULLTYPE) {
+ m_string_value = "null";
+ } else if (m_type == BOOLEAN) {
+ m_string_value = this->m_boolean_value ? "true" : "false";
+ } else if (m_type == OBJECT) {
+ // @@ Moock says, "the value that results from
+ // calling toString() on the object".
+ //
+ // The default toString() returns "[object
+ // Object]" but may be customized.
+ //
+ // A Movieclip returns the absolute path of the object.
+
+ const char* val = NULL;
+ if (m_object_value) {
+ val = m_object_value->get_text_value();
+ }
+
+ if (val) {
+ m_string_value = val;
+ } else {
+ // Do we have a "toString" method?
+ //
+ // TODO: we need an environment in order to call toString()!
+
+ // This is the default.
+ //m_string_value = "[object Object]";
char buffer[50];
- snprintf(buffer, 50, "<as_function %p>", (void *)
m_as_function_value);
+ snprintf(buffer, 50, "<as_object %p>", (void *) m_object_value);
m_string_value = buffer;
}
- else
- {
- m_string_value = "<bad type> "+m_type;
- assert(0);
- }
-
+ } else if (m_type == C_FUNCTION) {
+ char buffer[50];
+ snprintf(buffer, 50, "<c_function %p>", (void *) m_c_function_value);
+ m_string_value = buffer;
+ } else if (m_type == AS_FUNCTION) {
+ char buffer[50];
+ snprintf(buffer, 50, "<as_function %p>", (void *) m_as_function_value);
+ m_string_value = buffer;
+ } else {
+ m_string_value = "<bad type> "+m_type;
+ assert(0);
+ }
+
return m_string_value;
}
-const tu_string& as_value::to_tu_string_versioned(int version) const
- // Conversion to const tu_string&.
-{
- if (m_type == UNDEFINED)
- {
- // Version-dependent behavior.
- if (version <= 6)
- {
- m_string_value = "";
- }
- else
- {
- m_string_value = "undefined";
- }
- return m_string_value;
+// Conversion to const tu_string&.
+const tu_string
+&as_value::to_tu_string_versioned(int version) const
+{
+ if (m_type == UNDEFINED) {
+ // Version-dependent behavior.
+ if (version <= 6) {
+ m_string_value = "";
+ } else {
+ m_string_value = "undefined";
}
+ return m_string_value;
+ }
return to_tu_string();
}
-double as_value::to_number() const
- // Conversion to double.
-{
- if (m_type == STRING)
- {
- // @@ Moock says the rule here is: if the
- // string is a valid float literal, then it
- // gets converted; otherwise it is set to NaN.
- //
- // Also, "Infinity", "-Infinity", and "NaN"
- // are recognized.
- if (! string_to_number(&m_number_value, m_string_value.c_str()))
- {
- // Failed conversion to Number.
- double temp = 0.0; // avoid divide by zero compiler warning
by using a variable
- m_number_value = temp / temp; // this division by
zero creates a NaN value in the double
- }
- return m_number_value;
- }
- else if (m_type == NULLTYPE)
- {
- // Evan: from my tests
- return 0;
- }
- else if (m_type == BOOLEAN)
- {
- // Evan: from my tests
- return (this->m_boolean_value) ? 1 : 0;
- }
- else if (m_type == NUMBER)
- {
- return m_number_value;
- }
- else if (m_type == OBJECT && m_object_value != NULL)
- {
- // @@ Moock says the result here should be
- // "the return value of the object's valueOf()
- // method".
- //
- // Arrays and Movieclips should return NaN.
-
- // Text characters with var names could get in
- // here.
- const char* textval = m_object_value->get_text_value();
- if (textval)
- {
- return atof(textval);
- }
-
- return 0.0;
+// Conversion to double.
+double
+as_value::to_number() const
+{
+ if (m_type == STRING) {
+ // @@ Moock says the rule here is: if the
+ // string is a valid float literal, then it
+ // gets converted; otherwise it is set to NaN.
+ //
+ // Also, "Infinity", "-Infinity", and "NaN"
+ // are recognized.
+ if (! string_to_number(&m_number_value, m_string_value.c_str())) {
+ // Failed conversion to Number.
+ double temp = 0.0; // avoid divide by zero compiler warning by
using a variable
+ m_number_value = temp / temp; // this division by zero
creates a NaN value in the double
}
- else
- {
- return 0.0;
+ return m_number_value;
+ } else if (m_type == NULLTYPE) {
+ // Evan: from my tests
+ return 0;
+ } else if (m_type == BOOLEAN) {
+ // Evan: from my tests
+ return (this->m_boolean_value) ? 1 : 0;
+ } else if (m_type == NUMBER) {
+ return m_number_value;
+ } else if (m_type == OBJECT && m_object_value != NULL) {
+ // @@ Moock says the result here should be
+ // "the return value of the object's valueOf()
+ // method".
+ //
+ // Arrays and Movieclips should return NaN.
+
+ // Text characters with var names could get in
+ // here.
+ const char* textval = m_object_value->get_text_value();
+ if (textval) {
+ return atof(textval);
}
+
+ return 0.0;
+ } else {
+ return 0.0;
+ }
}
-
-bool as_value::to_bool() const
- // Conversion to boolean.
+// Conversion to boolean.
+bool
+as_value::to_bool() const
{
// From Moock
- if (m_type == STRING)
- {
- if (m_string_value == "false")
- {
- return false;
- }
- else if (m_string_value == "true")
- {
- return true;
- }
- else
- {
- // @@ Moock: "true if the string can
- // be converted to a valid nonzero
- // number".
- //
- // Empty string --> false
- return to_number() != 0.0;
- }
- }
- else if (m_type == NUMBER)
- {
- // If m_number_value is NaN, comparison will automatically be
false, as it should
- return m_number_value != 0.0;
- }
- else if (m_type == BOOLEAN)
- {
- return this->m_boolean_value;
- }
- else if (m_type == OBJECT)
- {
- return m_object_value != NULL;
- }
- else if (m_type == C_FUNCTION)
- {
- return m_c_function_value != NULL;
- }
- else if (m_type == AS_FUNCTION)
- {
- return m_as_function_value != NULL;
- }
- else
- {
- assert(m_type == UNDEFINED || m_type == NULLTYPE);
+ if (m_type == STRING) {
+ if (m_string_value == "false") {
return false;
+ } else if (m_string_value == "true") {
+ return true;
+ } else {
+ // @@ Moock: "true if the string can
+ // be converted to a valid nonzero
+ // number".
+ //
+ // Empty string --> false
+ return to_number() != 0.0;
}
+ } else if (m_type == NUMBER) {
+ // If m_number_value is NaN, comparison will automatically be false, as
it should
+ return m_number_value != 0.0;
+ } else if (m_type == BOOLEAN) {
+ return this->m_boolean_value;
+ } else if (m_type == OBJECT) {
+ return m_object_value != NULL;
+ } else if (m_type == C_FUNCTION) {
+ return m_c_function_value != NULL;
+ } else if (m_type == AS_FUNCTION) {
+ return m_as_function_value != NULL;
+ } else {
+ assert(m_type == UNDEFINED || m_type == NULLTYPE);
+ return false;
+ }
}
-
-as_object* as_value::to_object() const
- // Return value as an object.
-{
- if (m_type == OBJECT)
- {
- // OK.
- return m_object_value;
- }
- else if (m_type == AS_FUNCTION)
- {
- // An AS_FUNCTION *is* an object
- return m_as_function_value;
- }
- else
- {
- return NULL;
- }
+// Return value as an object.
+as_object*
+as_value::to_object() const
+{
+ if (m_type == OBJECT) {
+ // OK.
+ return m_object_value;
+ } else if (m_type == AS_FUNCTION) {
+ // An AS_FUNCTION *is* an object
+ return m_as_function_value;
+ } else {
+ return NULL;
+ }
}
-as_c_function_ptr as_value::to_c_function() const
+as_c_function_ptr
+as_value::to_c_function() const
// Return value as a C function ptr. Returns NULL if value is
// not a C function.
{
- if (m_type == C_FUNCTION)
- {
- // OK.
- return m_c_function_value;
- }
- else
- {
- return NULL;
- }
+ if (m_type == C_FUNCTION) {
+ // OK.
+ return m_c_function_value;
+ } else {
+ return NULL;
+ }
}
-function_as_object* as_value::to_as_function() const
- // Return value as an ActionScript function. Returns NULL if value is
- // not an ActionScript function.
-{
- if (m_type == AS_FUNCTION)
- {
- // OK.
- return m_as_function_value;
- }
- else
- {
- return NULL;
- }
+// Return value as an ActionScript function. Returns NULL if value is
+// not an ActionScript function.
+function_as_object*
+as_value::to_as_function() const
+{
+ if (m_type == AS_FUNCTION) {
+ // OK.
+ return m_as_function_value;
+ } else {
+ return NULL;
+ }
}
-
-void as_value::convert_to_number()
- // Force type to number.
+// Force type to number.
+void
+as_value::convert_to_number()
{
set_double(to_number());
}
-
-void as_value::convert_to_string()
- // Force type to string.
+// Force type to string.
+void
+as_value::convert_to_string()
{
to_tu_string(); // init our string data.
m_type = STRING; // force type.
}
-void as_value::convert_to_string_versioned(int version)
+void
+as_value::convert_to_string_versioned(int version)
// Force type to string.
{
to_tu_string_versioned(version); // init our string data.
@@ -2802,111 +1608,89 @@
}
-void as_value::set_as_object(as_object* obj)
-{
- if (m_type != OBJECT || m_object_value != obj)
- {
- drop_refs();
- m_type = OBJECT;
- m_object_value = obj;
- if (m_object_value)
- {
- m_object_value->add_ref();
- }
+void
+as_value::set_as_object(as_object* obj) {
+ if (m_type != OBJECT || m_object_value != obj) {
+ drop_refs();
+ m_type = OBJECT;
+ m_object_value = obj;
+ if (m_object_value) {
+ m_object_value->add_ref();
}
+ }
}
-void as_value::set_function_as_object(function_as_object* func)
+void
+as_value::set_function_as_object(function_as_object* func)
{
- if (m_type != AS_FUNCTION || m_as_function_value != func)
- {
- drop_refs();
- m_type = AS_FUNCTION;
- m_as_function_value = func;
- if (m_as_function_value)
- {
- m_as_function_value->add_ref();
- }
+ if (m_type != AS_FUNCTION || m_as_function_value != func) {
+ drop_refs();
+ m_type = AS_FUNCTION;
+ m_as_function_value = func;
+ if (m_as_function_value) {
+ m_as_function_value->add_ref();
}
+ }
}
-
-bool as_value::operator==(const as_value& v) const
- // Return true if operands are equal.
+// Return true if operands are equal.
+bool
+as_value::operator==(const as_value& v) const
{
bool this_nulltype = (m_type == UNDEFINED || m_type == NULLTYPE);
bool v_nulltype = (v.get_type() == UNDEFINED || v.get_type() == NULLTYPE);
- if (this_nulltype || v_nulltype)
- {
- return this_nulltype == v_nulltype;
- }
- else if (m_type == STRING)
- {
- return m_string_value == v.to_tu_string();
- }
- else if (m_type == NUMBER)
- {
- return m_number_value == v.to_number();
- }
- else if (m_type == BOOLEAN)
- {
- return m_boolean_value == v.to_bool();
- }
- else if (m_type == OBJECT)
- {
- return m_object_value == v.to_object();
- }
- else if (m_type == AS_FUNCTION)
- {
- return m_as_function_value == v.to_object();
- }
- else if (m_type == C_FUNCTION)
- {
- return m_c_function_value == v.to_c_function();
- }
- else
- {
- // Evan: what about objects???
- // TODO
- return m_type == v.m_type;
- }
+ if (this_nulltype || v_nulltype) {
+ return this_nulltype == v_nulltype;
+ } else if (m_type == STRING) {
+ return m_string_value == v.to_tu_string();
+ } else if (m_type == NUMBER) {
+ return m_number_value == v.to_number();
+ } else if (m_type == BOOLEAN) {
+ return m_boolean_value == v.to_bool();
+ } else if (m_type == OBJECT) {
+ return m_object_value == v.to_object();
+ } else if (m_type == AS_FUNCTION) {
+ return m_as_function_value == v.to_object();
+ } else if (m_type == C_FUNCTION) {
+ return m_c_function_value == v.to_c_function();
+ } else {
+ // Evan: what about objects???
+ // TODO
+ return m_type == v.m_type;
+ }
}
-
-bool as_value::operator!=(const as_value& v) const
- // Return true if operands are not equal.
+// Return true if operands are not equal.
+bool
+as_value::operator!=(const as_value& v) const
{
return ! (*this == v);
}
-
-void as_value::string_concat(const tu_string& str)
- // Sets *this to this string plus the given string.
+// Sets *this to this string plus the given string.
+void
+as_value::string_concat(const tu_string& str)
{
to_tu_string(); // make sure our m_string_value is initialized
m_type = STRING;
m_string_value += str;
}
-void as_value::drop_refs()
- // Drop any ref counts we have; this happens prior to changing our value.
+// Drop any ref counts we have; this happens prior to changing our value.
+void
+as_value::drop_refs()
{
- if (m_type == AS_FUNCTION)
- {
- if (m_as_function_value)
- {
- m_as_function_value->drop_ref();
- m_as_function_value = 0;
- }
- }
- else if (m_type == OBJECT)
- {
- if (m_object_value)
- {
- m_object_value->drop_ref();
- m_object_value = 0;
- }
+ if (m_type == AS_FUNCTION) {
+ if (m_as_function_value) {
+ m_as_function_value->drop_ref();
+ m_as_function_value = 0;
+ }
+ } else if (m_type == OBJECT) {
+ if (m_object_value) {
+ m_object_value->drop_ref();
+ m_object_value = 0;
}
+ }
}
@@ -2914,37 +1698,32 @@
// as_environment
//
-
-as_value as_environment::get_variable(const tu_string& varname, const
std::vector<with_stack_entry>& with_stack) const
- // Return the value of the given var, if it's defined.
+// Return the value of the given var, if it's defined.
+as_value
+as_environment::get_variable(const tu_string& varname, const
std::vector<with_stack_entry>& with_stack) const
{
// Path lookup rigamarole.
movie* target = m_target;
tu_string path;
tu_string var;
- if (parse_path(varname, &path, &var))
- {
- target = find_target(path); // @@ Use with_stack here too??? Need
to test.
- if (target)
- {
- as_value val;
- target->get_member(var, &val);
- return val;
- }
- else
- {
- log_error("find_target(\"%s\") failed\n", path.c_str());
- return as_value();
- }
- }
- else
- {
- return this->get_variable_raw(varname, with_stack);
+ if (parse_path(varname, &path, &var)) {
+ target = find_target(path); // @@ Use with_stack here too??? Need
to test.
+ if (target) {
+ as_value val;
+ target->get_member(var, &val);
+ return val;
+ } else {
+ log_error("find_target(\"%s\") failed\n", path.c_str());
+ return as_value();
}
+ } else {
+ return this->get_variable_raw(varname, with_stack);
+ }
}
-as_value as_environment::get_variable_raw(
+as_value
+as_environment::get_variable_raw(
const tu_string& varname,
const std::vector<with_stack_entry>& with_stack) const
// varname must be a plain variable name; no path parsing.
@@ -2956,399 +1735,354 @@
as_value val;
// Check the with-stack.
- for (int i = with_stack.size() - 1; i >= 0; i--)
- {
- as_object* obj = with_stack[i].m_object.get_ptr();
- if (obj && obj->get_member(varname, &val))
- {
- // Found the var in this context.
- return val;
- }
+ for (int i = with_stack.size() - 1; i >= 0; i--) {
+ as_object* obj = with_stack[i].m_object.get_ptr();
+ if (obj && obj->get_member(varname, &val)) {
+ // Found the var in this context.
+ return val;
}
-
+ }
+
// Check locals.
int local_index = find_local(varname);
- if (local_index >= 0)
- {
- // Get local var.
- return m_local_frames[local_index].m_value;
- }
-
+ if (local_index >= 0) {
+ // Get local var.
+ return m_local_frames[local_index].m_value;
+ }
+
// Looking for "this"?
- if (varname == "this")
- {
- val.set_as_object(m_target);
- return val;
- }
+ if (varname == "this") {
+ val.set_as_object(m_target);
+ return val;
+ }
// Check movie members.
- if (m_target->get_member(varname, &val))
- {
- return val;
- }
-
+ if (m_target->get_member(varname, &val)) {
+ return val;
+ }
+
// Check built-in constants.
- if (varname == "_root" || varname == "_level0")
- {
- return as_value(m_target->get_root_movie());
- }
- if (varname == "_global")
- {
- return as_value(s_global.get_ptr());
- }
- if (s_global->get_member(varname, &val))
- {
- return val;
- }
-
+ if (varname == "_root" || varname == "_level0") {
+ return as_value(m_target->get_root_movie());
+ }
+ if (varname == "_global") {
+ return as_value(s_global.get_ptr());
+ }
+ if (s_global->get_member(varname, &val)) {
+ return val;
+ }
+
// Fallback.
- IF_VERBOSE_ACTION(log_msg("get_variable_raw(\"%s\") failed, returning
UNDEFINED.\n", varname.c_str()));
+ IF_VERBOSE_ACTION(dbglogfile << "get_variable_raw(\"" << varname.c_str()
+ << "\" failed, returning UNDEFINED." << endl);
return as_value();
}
-
-void as_environment::set_variable(
+// Given a path to variable, set its value.
+void
+as_environment::set_variable(
const tu_string& varname,
const as_value& val,
const std::vector<with_stack_entry>& with_stack)
- // Given a path to variable, set its value.
{
- IF_VERBOSE_ACTION(log_msg("-------------- %s = %s\n", varname.c_str(),
val.to_string()));//xxxxxxxxxx
+ IF_VERBOSE_ACTION(dbglogfile << "-------------- "
+ << varname.c_str() << " = " << val.to_string());
// Path lookup rigamarole.
movie* target = m_target;
tu_string path;
tu_string var;
- if (parse_path(varname, &path, &var))
- {
- target = find_target(path);
- if (target)
- {
- target->set_member(var, val);
- }
- }
- else
- {
- this->set_variable_raw(varname, val, with_stack);
+ if (parse_path(varname, &path, &var)) {
+ target = find_target(path);
+ if (target) {
+ target->set_member(var, val);
}
+ } else {
+ this->set_variable_raw(varname, val, with_stack);
+ }
}
-
-void as_environment::set_variable_raw(
+// No path rigamarole.
+void
+as_environment::set_variable_raw(
const tu_string& varname,
const as_value& val,
const std::vector<with_stack_entry>& with_stack)
- // No path rigamarole.
{
// Check the with-stack.
- for (int i = with_stack.size() - 1; i >= 0; i--)
- {
- as_object* obj = with_stack[i].m_object.get_ptr();
- as_value dummy;
- if (obj && obj->get_member(varname, &dummy))
- {
- // This object has the member; so set it here.
- obj->set_member(varname, val);
- return;
- }
+ for (int i = with_stack.size() - 1; i >= 0; i--) {
+ as_object* obj = with_stack[i].m_object.get_ptr();
+ as_value dummy;
+ if (obj && obj->get_member(varname, &dummy)) {
+ // This object has the member; so set it here.
+ obj->set_member(varname, val);
+ return;
}
-
+ }
+
// Check locals.
int local_index = find_local(varname);
- if (local_index >= 0)
- {
- // Set local var.
- m_local_frames[local_index].m_value = val;
- return;
- }
-
+ if (local_index >= 0) {
+ // Set local var.
+ m_local_frames[local_index].m_value = val;
+ return;
+ }
+
assert(m_target);
m_target->set_member(varname, val);
}
-
-void as_environment::set_local(const tu_string& varname, const as_value& val)
- // Set/initialize the value of the local variable.
+// Set/initialize the value of the local variable.
+void
+as_environment::set_local(const tu_string& varname, const as_value& val)
{
// Is it in the current frame already?
int index = find_local(varname);
- if (index < 0)
- {
- // Not in frame; create a new local var.
-
- assert(varname.length() > 0); // null varnames are invalid!
- m_local_frames.push_back(frame_slot(varname, val));
- }
- else
- {
- // In frame already; modify existing var.
- m_local_frames[index].m_value = val;
- }
+ if (index < 0) {
+ // Not in frame; create a new local var.
+
+ assert(varname.length() > 0); // null varnames are invalid!
+ m_local_frames.push_back(frame_slot(varname, val));
+ } else {
+ // In frame already; modify existing var.
+ m_local_frames[index].m_value = val;
+ }
}
-
-void as_environment::add_local(const tu_string& varname, const as_value& val)
- // Add a local var with the given name and value to our
- // current local frame. Use this when you know the var
- // doesn't exist yet, since it's faster than set_local();
- // e.g. when setting up args for a function.
+// Add a local var with the given name and value to our
+// current local frame. Use this when you know the var
+// doesn't exist yet, since it's faster than set_local();
+// e.g. when setting up args for a function.
+void
+as_environment::add_local(const tu_string& varname, const as_value& val)
{
assert(varname.length() > 0);
m_local_frames.push_back(frame_slot(varname, val));
}
-
-void as_environment::declare_local(const tu_string& varname)
- // Create the specified local var if it doesn't exist already.
+// Create the specified local var if it doesn't exist already.
+void
+as_environment::declare_local(const tu_string& varname)
{
// Is it in the current frame already?
int index = find_local(varname);
- if (index < 0)
- {
- // Not in frame; create a new local var.
- assert(varname.length() > 0); // null varnames are invalid!
- m_local_frames.push_back(frame_slot(varname, as_value()));
- }
- else
- {
- // In frame already; don't mess with it.
- }
+ if (index < 0) {
+ // Not in frame; create a new local var.
+ assert(varname.length() > 0); // null varnames are invalid!
+ m_local_frames.push_back(frame_slot(varname, as_value()));
+ } else {
+ // In frame already; don't mess with it.
+ }
}
-
-bool as_environment::get_member(const tu_stringi& varname, as_value* val)
const
+bool
+as_environment::get_member(const tu_stringi& varname, as_value* val) const
{
return m_variables.get(varname, val);
}
-void as_environment::set_member(const tu_stringi& varname, const as_value&
val)
+void
+as_environment::set_member(const tu_stringi& varname, const as_value& val)
{
m_variables[varname] = val;
}
-as_value* as_environment::local_register_ptr(int reg)
- // Return a pointer to the specified local register.
- // Local registers are numbered starting with 1.
- //
- // Return value will never be NULL. If reg is out of bounds,
- // we log an error, but still return a valid pointer (to
- // global reg[0]). So the behavior is a bit undefined, but
- // not dangerous.
+// Return a pointer to the specified local register.
+// Local registers are numbered starting with 1.
+//
+// Return value will never be NULL. If reg is out of bounds,
+// we log an error, but still return a valid pointer (to
+// global reg[0]). So the behavior is a bit undefined, but
+// not dangerous.
+as_value*
+as_environment::local_register_ptr(int reg)
{
// We index the registers from the end of the register
// array, so we don't have to keep base/frame
// pointers.
- if (reg <= 0 || reg > (int) m_local_register.size())
- {
- log_error("Invalid local register %d, stack only has %zd entries\n",
- reg, m_local_register.size());
-
- // Fallback: use global 0.
- return &m_global_register[0];
- }
-
+ if (reg <= 0 || reg > (int) m_local_register.size()) {
+ log_error("Invalid local register %d, stack only has %zd entries\n",
+ reg, m_local_register.size());
+
+ // Fallback: use global 0.
+ return &m_global_register[0];
+ }
+
return &m_local_register[m_local_register.size() - reg];
}
-
-int as_environment::find_local(const tu_string& varname) const
- // Search the active frame for the named var; return its index
- // in the m_local_frames stack if found.
- //
- // Otherwise return -1.
+// Search the active frame for the named var; return its index
+// in the m_local_frames stack if found.
+//
+// Otherwise return -1.
+int
+as_environment::find_local(const tu_string& varname) const
{
// Linear search sucks, but is probably fine for
// typical use of local vars in script. There could
// be pathological breakdowns if a function has tons
// of locals though. The ActionScript bytecode does
// not help us much by using strings to index locals.
-
- for (int i = m_local_frames.size() - 1; i >= 0; i--)
- {
- const frame_slot& slot = m_local_frames[i];
- if (slot.m_name.length() == 0)
- {
- // End of local frame; stop looking.
- return -1;
- }
- else if (slot.m_name == varname)
- {
- // Found it.
- return i;
- }
+
+ for (int i = m_local_frames.size() - 1; i >= 0; i--) {
+ const frame_slot& slot = m_local_frames[i];
+ if (slot.m_name.length() == 0) {
+ // End of local frame; stop looking.
+ return -1;
+ } else if (slot.m_name == varname) {
+ // Found it.
+ return i;
}
+ }
return -1;
}
-
-bool as_environment::parse_path(const tu_string& var_path, tu_string* path,
tu_string* var) const
- // See if the given variable name is actually a sprite path
- // followed by a variable name. These come in the format:
- //
- // /path/to/some/sprite/:varname
- //
- // (or same thing, without the last '/')
- //
- // or
- // path.to.some.var
- //
- // If that's the format, puts the path part (no colon or
- // trailing slash) in *path, and the varname part (no color)
- // in *var and returns true.
- //
- // If no colon, returns false and leaves *path & *var alone.
+// See if the given variable name is actually a sprite path
+// followed by a variable name. These come in the format:
+//
+// /path/to/some/sprite/:varname
+//
+// (or same thing, without the last '/')
+//
+// or
+// path.to.some.var
+//
+// If that's the format, puts the path part (no colon or
+// trailing slash) in *path, and the varname part (no color)
+// in *var and returns true.
+//
+// If no colon, returns false and leaves *path & *var alone.
+bool
+as_environment::parse_path(const tu_string& var_path, tu_string* path,
tu_string* var) const
{
// Search for colon.
int colon_index = 0;
int var_path_length = var_path.length();
- for ( ; colon_index < var_path_length; colon_index++)
- {
- if (var_path[colon_index] == ':')
- {
- // Found it.
- break;
- }
+ for ( ; colon_index < var_path_length; colon_index++) {
+ if (var_path[colon_index] == ':') {
+ // Found it.
+ break;
}
-
- if (colon_index >= var_path_length)
- {
- // No colon. Is there a '.'? Find the last
- // one, if any.
- for (colon_index = var_path_length - 1; colon_index >= 0;
colon_index--)
- {
- if (var_path[colon_index] == '.')
- {
- // Found it.
- break;
- }
- }
- if (colon_index < 0) return false;
+ }
+
+ if (colon_index >= var_path_length) {
+ // No colon. Is there a '.'? Find the last
+ // one, if any.
+ for (colon_index = var_path_length - 1; colon_index >= 0;
colon_index--) {
+ if (var_path[colon_index] == '.') {
+ // Found it.
+ break;
+ }
}
-
+ if (colon_index < 0) {
+ return false;
+ }
+ }
+
// Make the subparts.
-
+
// Var.
*var = &var_path[colon_index + 1];
-
+
// Path.
- if (colon_index > 0)
- {
- if (var_path[colon_index - 1] == '/')
- {
- // Trim off the extraneous trailing slash.
- colon_index--;
- }
+ if (colon_index > 0) {
+ if (var_path[colon_index - 1] == '/') {
+ // Trim off the extraneous trailing slash.
+ colon_index--;
}
+ }
// @@ could be better. This whole usage of tu_string is very flabby...
*path = var_path;
path->resize(colon_index);
-
+
return true;
}
-
-movie* as_environment::find_target(const as_value& val) const
- // Find the sprite/movie represented by the given value. The
- // value might be a reference to the object itself, or a
- // string giving a relative path name to the object.
-{
- if (val.get_type() == as_value::OBJECT)
- {
- if (val.to_object() != NULL)
- {
- return val.to_object()->to_movie();
- }
- else
- {
- return NULL;
- }
- }
- else if (val.get_type() == as_value::STRING)
- {
- return find_target(val.to_tu_string());
- }
- else
- {
- log_error("error: invalid path; neither string nor object");
+// Find the sprite/movie represented by the given value. The
+// value might be a reference to the object itself, or a
+// string giving a relative path name to the object.
+movie*
+as_environment::find_target(const as_value& val) const
+{
+ if (val.get_type() == as_value::OBJECT) {
+ if (val.to_object() != NULL) {
+ return val.to_object()->to_movie();
+ } else {
return NULL;
}
+ } else if (val.get_type() == as_value::STRING) {
+ return find_target(val.to_tu_string());
+ } else {
+ log_error("error: invalid path; neither string nor object");
+ return NULL;
+ }
}
-
-static const char* next_slash_or_dot(const char* word)
- // Search for next '.' or '/' character in this word. Return
- // a pointer to it, or to NULL if it wasn't found.
+// Search for next '.' or '/' character in this word. Return
+// a pointer to it, or to NULL if it wasn't found.
+static const char*
+next_slash_or_dot(const char* word)
{
- for (const char* p = word; *p; p++)
- {
- if (*p == '.' && p[1] == '.')
- {
- p++;
- }
- else if (*p == '.' || *p == '/')
- {
- return p;
- }
+ for (const char* p = word; *p; p++) {
+ if (*p == '.' && p[1] == '.') {
+ p++;
+ } else if (*p == '.' || *p == '/') {
+ return p;
}
-
+ }
+
return NULL;
}
-
-movie* as_environment::find_target(const tu_string& path) const
- // Find the sprite/movie referenced by the given path.
+// Find the sprite/movie referenced by the given path.
+movie*
+as_environment::find_target(const tu_string& path) const
{
- if (path.length() <= 0)
- {
- return m_target;
- }
-
+ if (path.length() <= 0) {
+ return m_target;
+ }
+
assert(path.length() > 0);
-
+
movie* env = m_target;
assert(env);
-
+
const char* p = path.c_str();
tu_string subpart;
- if (*p == '/')
- {
- // Absolute path. Start at the root.
- env = env->get_relative_target("_level0");
- p++;
- }
-
- if (*p == '\0')
+ if (*p == '/') {
+ // Absolute path. Start at the root.
+ env = env->get_relative_target("_level0");
+ p++;
+ }
+
+ if (*p == '\0') {
return env;
+ }
- for (;;)
- {
- const char* next_slash = next_slash_or_dot(p);
- subpart = p;
- if (next_slash == p)
- {
- log_error("error: invalid path '%s'\n", path.c_str());
- break;
- }
- else if (next_slash)
- {
- // Cut off the slash and everything after it.
- subpart.resize(next_slash - p);
- }
-
- env = env->get_relative_target(subpart);
- //@@ _level0 --> root, .. --> parent, . --> this, other ==
character
-
- if (env == NULL || next_slash == NULL)
- {
- break;
- }
-
- p = next_slash + 1;
+ for (;;) {
+ const char* next_slash = next_slash_or_dot(p);
+ subpart = p;
+ if (next_slash == p) {
+ log_error("error: invalid path '%s'\n", path.c_str());
+ break;
+ } else if (next_slash) {
+ // Cut off the slash and everything after it.
+ subpart.resize(next_slash - p);
+ }
+
+ env = env->get_relative_target(subpart);
+ //@@ _level0 --> root, .. --> parent, . --> this, other == character
+
+ if (env == NULL || next_slash == NULL) {
+ break;
}
+
+ p = next_slash + 1;
+ }
return env;
}
@@ -3357,7 +2091,8 @@
// event_id
//
-const tu_string& event_id::get_function_name() const
+const tu_string&
+event_id::get_function_name() const
{
static tu_string s_function_names[EVENT_COUNT] =
{
@@ -3400,49 +2135,48 @@
return s_function_names[m_id];
}
-
// Standard member lookup.
-as_standard_member get_standard_member(const tu_stringi& name)
+as_standard_member
+get_standard_member(const tu_stringi& name)
{
static bool s_inited = false;
static stringi_hash<as_standard_member> s_standard_member_map;
- if (!s_inited)
- {
- s_inited = true;
-
- s_standard_member_map.resize(int(AS_STANDARD_MEMBER_COUNT));
-
- s_standard_member_map.add("_x", M_X);
- s_standard_member_map.add("_y", M_Y);
- s_standard_member_map.add("_xscale", M_XSCALE);
- s_standard_member_map.add("_yscale", M_YSCALE);
- s_standard_member_map.add("_currentframe", M_CURRENTFRAME);
- s_standard_member_map.add("_totalframes", M_TOTALFRAMES);
- s_standard_member_map.add("_alpha", M_ALPHA);
- s_standard_member_map.add("_visible", M_VISIBLE);
- s_standard_member_map.add("_width", M_WIDTH);
- s_standard_member_map.add("_height", M_HEIGHT);
- s_standard_member_map.add("_rotation", M_ROTATION);
- s_standard_member_map.add("_target", M_TARGET);
- s_standard_member_map.add("_framesloaded", M_FRAMESLOADED);
- s_standard_member_map.add("_name", M_NAME);
- s_standard_member_map.add("_droptarget", M_DROPTARGET);
- s_standard_member_map.add("_url", M_URL);
- s_standard_member_map.add("_highquality", M_HIGHQUALITY);
- s_standard_member_map.add("_focusrect", M_FOCUSRECT);
- s_standard_member_map.add("_soundbuftime", M_SOUNDBUFTIME);
- s_standard_member_map.add("_xmouse", M_XMOUSE);
- s_standard_member_map.add("_ymouse", M_YMOUSE);
- s_standard_member_map.add("_parent", M_PARENT);
- s_standard_member_map.add("text", M_TEXT);
- s_standard_member_map.add("textWidth", M_TEXTWIDTH);
- s_standard_member_map.add("textColor", M_TEXTCOLOR);
- s_standard_member_map.add("onLoad", M_ONLOAD);
- }
-
+ if (!s_inited) {
+ s_inited = true;
+
+ s_standard_member_map.resize(int(AS_STANDARD_MEMBER_COUNT));
+
+ s_standard_member_map.add("_x", M_X);
+ s_standard_member_map.add("_y", M_Y);
+ s_standard_member_map.add("_xscale", M_XSCALE);
+ s_standard_member_map.add("_yscale", M_YSCALE);
+ s_standard_member_map.add("_currentframe", M_CURRENTFRAME);
+ s_standard_member_map.add("_totalframes", M_TOTALFRAMES);
+ s_standard_member_map.add("_alpha", M_ALPHA);
+ s_standard_member_map.add("_visible", M_VISIBLE);
+ s_standard_member_map.add("_width", M_WIDTH);
+ s_standard_member_map.add("_height", M_HEIGHT);
+ s_standard_member_map.add("_rotation", M_ROTATION);
+ s_standard_member_map.add("_target", M_TARGET);
+ s_standard_member_map.add("_framesloaded", M_FRAMESLOADED);
+ s_standard_member_map.add("_name", M_NAME);
+ s_standard_member_map.add("_droptarget", M_DROPTARGET);
+ s_standard_member_map.add("_url", M_URL);
+ s_standard_member_map.add("_highquality", M_HIGHQUALITY);
+ s_standard_member_map.add("_focusrect", M_FOCUSRECT);
+ s_standard_member_map.add("_soundbuftime", M_SOUNDBUFTIME);
+ s_standard_member_map.add("_xmouse", M_XMOUSE);
+ s_standard_member_map.add("_ymouse", M_YMOUSE);
+ s_standard_member_map.add("_parent", M_PARENT);
+ s_standard_member_map.add("text", M_TEXT);
+ s_standard_member_map.add("textWidth", M_TEXTWIDTH);
+ s_standard_member_map.add("textColor", M_TEXTCOLOR);
+ s_standard_member_map.add("onLoad", M_ONLOAD);
+ }
+
as_standard_member result = M_INVALID_MEMBER;
s_standard_member_map.get(name, &result);
-
+
return result;
}
@@ -3451,418 +2185,222 @@
// Disassembler
//
+// Disassemble one instruction to the log.
+void
+log_disasm(const unsigned char* instruction_data)
+{
+ as_arg_t fmt = ARG_HEX;
+ action_type action_id = (action_type)instruction_data[0];
+ unsigned char num[10];
+ memset(num, 0, 10);
-#define COMPILE_DISASM 1
-
-#ifndef COMPILE_DISASM
-
-void log_disasm(const unsigned char* instruction_data)
- // No disassembler in this version...
-{
- log_msg("<no disasm>\n");
-}
-
-#else // COMPILE_DISASM
-
-void log_disasm(const unsigned char* instruction_data)
- // Disassemble one instruction to the log.
-{
- enum arg_format {
- ARG_NONE = 0,
- ARG_STR,
- ARG_HEX, // default hex dump, in case the format is unknown or
unsupported
- ARG_U8,
- ARG_U16,
- ARG_S16,
- ARG_PUSH_DATA,
- ARG_DECL_DICT,
- ARG_FUNCTION2
- };
- struct inst_info
- {
- int m_action_id;
- const char* m_instruction;
-
- arg_format m_arg_format;
- };
-
- static inst_info s_instruction_table[] = {
- { SWF::ACTION_NEXTFRAME, "next_frame", ARG_NONE },
- { SWF::ACTION_PREVFRAME, "prev_frame", ARG_NONE },
- { SWF::ACTION_PLAY, "play", ARG_NONE },
- { SWF::ACTION_STOP, "stop", ARG_NONE },
- { SWF::ACTION_TOGGLEQUALITY, "toggle_qlty", ARG_NONE },
- { SWF::ACTION_STOPSOUNDS, "stop_sounds", ARG_NONE },
- { SWF::ACTION_ADD, "add", ARG_NONE },
- { SWF::ACTION_SUBTRACT, "sub", ARG_NONE },
- { SWF::ACTION_MULTIPLY, "mul", ARG_NONE },
- { SWF::ACTION_DIVIDE, "div", ARG_NONE },
- { SWF::ACTION_EQUAL, "equ", ARG_NONE },
- { SWF::ACTION_LESSTHAN, "lt", ARG_NONE },
- { SWF::ACTION_LOGICALAND, "and", ARG_NONE },
- { SWF::ACTION_LOGICALOR, "or", ARG_NONE },
- { SWF::ACTION_LOGICALNOT, "not", ARG_NONE },
- { SWF::ACTION_STRINGEQ, "str_eq", ARG_NONE },
- { SWF::ACTION_STRINGLENGTH, "str_len", ARG_NONE },
- { SWF::ACTION_SUBSTRING, "substr", ARG_NONE },
- { SWF::ACTION_POP, "pop", ARG_NONE },
- { SWF::ACTION_INT, "floor", ARG_NONE },
- { SWF::ACTION_GETVARIABLE, "get_var", ARG_NONE },
- { SWF::ACTION_SETVARIABLE, "set_var", ARG_NONE },
- { SWF::ACTION_SETTARGETEXPRESSION, "set_target_exp", ARG_NONE },
- { SWF::ACTION_STRINGCONCAT, "str_cat", ARG_NONE },
- { SWF::ACTION_GETPROPERTY, "get_prop", ARG_NONE },
- { SWF::ACTION_SETPROPERTY, "set_prop", ARG_NONE },
- { SWF::ACTION_DUPLICATECLIP, "dup_sprite", ARG_NONE },
- { SWF::ACTION_REMOVECLIP, "rem_sprite", ARG_NONE },
- { SWF::ACTION_TRACE, "trace", ARG_NONE },
- { SWF::ACTION_STARTDRAGMOVIE, "start_drag", ARG_NONE },
- { SWF::ACTION_STOPDRAGMOVIE, "stop_drag", ARG_NONE },
- { SWF::ACTION_STRINGCOMPARE, "str_lt", ARG_NONE },
- { SWF::ACTION_THROW, "throw_fixme", ARG_NONE },
- { SWF::ACTION_CASTOP, "cast_fixme", ARG_NONE },
- { SWF::ACTION_IMPLEMENTSOP, "implements_fixme", ARG_NONE },
- { SWF::ACTION_RANDOM, "random", ARG_NONE },
- { SWF::ACTION_MBLENGTH, "mb_length_fixme", ARG_NONE },
- { SWF::ACTION_ORD, "ord", ARG_NONE },
- { SWF::ACTION_CHR, "chr", ARG_NONE },
- { SWF::ACTION_GETTIMER, "get_timer", ARG_NONE },
- { SWF::ACTION_MBSUBSTRING, "substr_mb_fixme", ARG_NONE },
- { SWF::ACTION_MBORD, "ord_mb", ARG_NONE },
- { SWF::ACTION_MBCHR, "chr_mb_fixme", ARG_NONE },
- { SWF::ACTION_DELETEVAR, "delete_fixme", ARG_NONE },
- { SWF::ACTION_DELETE, "delete_all_fixme", ARG_NONE },
- { SWF::ACTION_VAREQUALS, "set_local", ARG_NONE },
- { SWF::ACTION_CALLFUNCTION, "call_func", ARG_NONE },
- { SWF::ACTION_RETURN, "return", ARG_NONE },
- { SWF::ACTION_MODULO, "mod", ARG_NONE },
- { SWF::ACTION_NEW, "new", ARG_NONE },
- { SWF::ACTION_VAR, "decl_local", ARG_NONE },
- { SWF::ACTION_INITARRAY, "decl_array", ARG_NONE },
- { SWF::ACTION_INITOBJECT, "decl_obj_fixme", ARG_NONE },
- { SWF::ACTION_TYPEOF, "type_of", ARG_NONE },
- { SWF::ACTION_TARGETPATH, "get_target_fixme", ARG_NONE },
- { SWF::ACTION_ENUMERATE, "enumerate", ARG_NONE },
- { SWF::ACTION_NEWADD, "add_t", ARG_NONE },
- { SWF::ACTION_NEWLESSTHAN, "lt_t", ARG_NONE },
- { SWF::ACTION_NEWEQUALS, "eq_t", ARG_NONE },
- { SWF::ACTION_TONUMBER, "number", ARG_NONE },
- { SWF::ACTION_TOSTRING, "string", ARG_NONE },
- { SWF::ACTION_DUP, "dup", ARG_NONE },
- { SWF::ACTION_SWAP, "swap", ARG_NONE },
- { SWF::ACTION_GETMEMBER, "get_member", ARG_NONE },
- { SWF::ACTION_SETMEMBER, "set_member", ARG_NONE },
- { SWF::ACTION_INCREMENT, "inc", ARG_NONE },
- { SWF::ACTION_DECREMENT, "dec", ARG_NONE },
- { SWF::ACTION_CALLMETHOD, "call_method", ARG_NONE },
- { SWF::ACTION_NEWMETHOD, "new_method_fixme", ARG_NONE },
- { SWF::ACTION_INSTANCEOF, "is_inst_of_fixme", ARG_NONE },
- { SWF::ACTION_ENUM2, "enum_object_fixme", ARG_NONE },
- { SWF::ACTION_BITWISEAND, "bit_and", ARG_NONE },
- { SWF::ACTION_BITWISEOR, "bit_or", ARG_NONE },
- { SWF::ACTION_BITWISEXOR, "bit_xor", ARG_NONE },
- { SWF::ACTION_SHIFTLEFT, "shl", ARG_NONE },
- { SWF::ACTION_SHIFTRIGHT, "asr", ARG_NONE },
- { SWF::ACTION_SHIFTRIGHT2, "lsr", ARG_NONE },
- { SWF::ACTION_STRICTEQ, "eq_strict", ARG_NONE },
- { SWF::ACTION_GREATER, "gt_t", ARG_NONE },
- { SWF::ACTION_EXTENDS, "extends_fixme", ARG_NONE },
- { SWF::ACTION_GOTOFRAME, "goto_frame", ARG_U16 },
- { SWF::ACTION_GETURL, "get_url", ARG_STR },
- { SWF::ACTION_SETREGISTER, "store_register", ARG_U8 },
- { SWF::ACTION_CONSTANTPOOL, "decl_dict", ARG_DECL_DICT },
- { SWF::ACTION_WAITFORFRAME, "wait_for_frame", ARG_HEX },
- { SWF::ACTION_SETTARGET, "set_target", ARG_STR },
- { SWF::ACTION_GOTOLABEL, "goto_frame_lbl", ARG_STR },
- { SWF::ACTION_WAITFORFRAMEEXPRESSION, "wait_for_fr_exp", ARG_HEX },
- { SWF::ACTION_DEFINEFUNCTION2, "function2", ARG_FUNCTION2 },
- { SWF::ACTION_TRY, "try_fixme", ARG_FUNCTION2 },
- { SWF::ACTION_WITH, "with", ARG_U16 },
- { SWF::ACTION_PUSHDATA, "push_data", ARG_PUSH_DATA },
- { SWF::ACTION_BRANCHALWAYS, "goto", ARG_S16 },
- { SWF::ACTION_GETURL2, "get_url2", ARG_HEX },
- { SWF::ACTION_DEFINEFUNCTION, "func", ARG_HEX },
- { SWF::ACTION_BRANCHIFTRUE, "branch_if_true", ARG_S16 },
- { SWF::ACTION_CALLFRAME, "call_frame", ARG_HEX },
- { SWF::ACTION_GOTOEXPRESSION, "goto_frame_exp", ARG_HEX },
- { SWF::ACTION_END, "<end>", ARG_NONE }
- };
-
- int action_id = instruction_data[0];
- inst_info* info = NULL;
-
- for (int i = 0; ; i++)
- {
- if (s_instruction_table[i].m_action_id == action_id)
- {
- info = &s_instruction_table[i];
- }
-
- if (s_instruction_table[i].m_action_id == 0)
- {
- // Stop at the end of the table and give up.
- break;
- }
- }
-
- arg_format fmt = ARG_HEX;
-
+ dbglogfile.setStamp(false);
// Show instruction.
- if (info == NULL)
- {
- log_msg("<unknown>[0x%02X]", action_id);
- }
- else
- {
- log_msg("%-15s", info->m_instruction);
- fmt = info->m_arg_format;
- }
+ if (action_id > ash.lastType()) {
+ dbglogfile << "<unknown>[0x" << action_id << "]" << endl;
+ } else {
+ dbglogfile << ash[action_id].getName().c_str() << endl;
+ fmt = ash[action_id].getArgFormat();
+ }
// Show instruction argument(s).
- if (action_id & 0x80)
- {
- assert(fmt != ARG_NONE);
-
- int length = instruction_data[1] | (instruction_data[2] << 8);
-
- // log_msg(" [%d]", length);
-
- if (fmt == ARG_HEX)
- {
- for (int i = 0; i < length; i++)
- {
- log_msg(" 0x%02X", instruction_data[3 + i]);
- }
- log_msg("\n");
- }
- else if (fmt == ARG_STR)
- {
- log_msg(" \"");
- for (int i = 0; i < length; i++)
- {
- log_msg("%c", instruction_data[3 + i]);
- }
- log_msg("\"\n");
- }
- else if (fmt == ARG_U8)
- {
- int val = instruction_data[3];
- log_msg(" %d\n", val);
- }
- else if (fmt == ARG_U16)
- {
- int val = instruction_data[3] | (instruction_data[4] << 8);
- log_msg(" %d\n", val);
- }
- else if (fmt == ARG_S16)
- {
- int val = instruction_data[3] | (instruction_data[4] << 8);
- if (val & 0x8000) val |= ~0x7FFF; // sign-extend
- log_msg(" %d\n", val);
- }
- else if (fmt == ARG_PUSH_DATA)
- {
- log_msg("\n");
- int i = 0;
- while (i < length)
- {
- int type = instruction_data[3 + i];
- i++;
- log_msg("\t\t"); // indent
- if (type == 0)
- {
- // string
- log_msg("\"");
- while (instruction_data[3 + i])
- {
- log_msg("%c", instruction_data[3 +
i]);
- i++;
- }
- i++;
- log_msg("\"\n");
- }
- else if (type == 1)
- {
- // float (little-endian)
- union {
- float f;
- uint32_t i;
- } u;
- compiler_assert(sizeof(u) == sizeof(u.i));
-
- memcpy(&u.i, instruction_data + 3 + i, 4);
- u.i = swap_le32(u.i);
- i += 4;
-
- log_msg("(float) %f\n", u.f);
- }
- else if (type == 2)
- {
- log_msg("NULL\n");
- }
- else if (type == 3)
- {
- log_msg("undef\n");
- }
- else if (type == 4)
- {
- // contents of register
- int reg = instruction_data[3 + i];
- i++;
- log_msg("reg[%d]\n", reg);
- }
- else if (type == 5)
- {
- int bool_val = instruction_data[3 + i];
- i++;
- log_msg("bool(%d)\n", bool_val);
- }
- else if (type == 6)
- {
- // double
- // wacky format: 45670123
- union {
- double d;
- uint64 i;
- struct {
- uint32_t lo;
- uint32_t hi;
- } sub;
- } u;
- compiler_assert(sizeof(u) == sizeof(u.i));
-
- memcpy(&u.sub.hi, instruction_data + 3 + i,
4);
- memcpy(&u.sub.lo, instruction_data + 3 + i
+ 4, 4);
- u.i = swap_le64(u.i);
- i += 8;
-
- log_msg("(double) %f\n", u.d);
- }
- else if (type == 7)
- {
- // int32
- int32_t val = instruction_data[3 + i]
- | (instruction_data[3 + i + 1] << 8)
- | (instruction_data[3 + i + 2] << 16)
- | (instruction_data[3 + i + 3] << 24);
- i += 4;
- log_msg("(int) %d\n", val);
- }
- else if (type == 8)
- {
- int id = instruction_data[3 + i];
- i++;
- log_msg("dict_lookup[%d]\n", id);
- }
- else if (type == 9)
- {
- int id = instruction_data[3 + i] |
(instruction_data[3 + i + 1] << 8);
- i += 2;
- log_msg("dict_lookup_lg[%d]\n", id);
- }
- }
- }
- else if (fmt == ARG_DECL_DICT)
- {
- int i = 0;
- int count = instruction_data[3 + i] | (instruction_data[3 +
i + 1] << 8);
+ if (action_id & 0x80) {
+ assert(fmt != ARG_NONE);
+ int length = instruction_data[1] | (instruction_data[2] << 8);
+ if (fmt == ARG_HEX) {
+ for (int i = 0; i < length; i++) {
+ hexify(num, (const unsigned char *)&instruction_data[3 + i], 1);
+ dbglogfile << "0x" << num << " ";
+// dbglogfile << instruction_data[3 + i] << " ";
+ }
+ dbglogfile << endl;
+ } else if (fmt == ARG_STR) {
+ string str;
+ for (int i = 0; i < length; i++) {
+ str = instruction_data[3 + i];
+ }
+ dbglogfile << "\"" << str.c_str() << "\"" << endl;
+ } else if (fmt == ARG_U8) {
+ int val = instruction_data[3];
+ dbglogfile << " " << val << endl;
+ } else if (fmt == ARG_U16) {
+ int val = instruction_data[3] | (instruction_data[4] << 8);
+ dbglogfile << " " << val << endl;
+ } else if (fmt == ARG_S16) {
+ int val = instruction_data[3] | (instruction_data[4] << 8);
+ if (val & 0x8000) val |= ~0x7FFF; // sign-extend
+ dbglogfile << " " << val << endl;
+ } else if (fmt == ARG_PUSH_DATA) {
+ dbglogfile << endl;
+ int i = 0;
+ while (i < length) {
+ int type = instruction_data[3 + i];
+ i++;
+ if (type == 0) {
+ // string
+ string str;
+ while (instruction_data[3 + i]) {
+ str += instruction_data[3 + i];
+ i++;
+ }
+ i++;
+ dbglogfile << "\t\"" << str.c_str() << "\"" << endl;
+ } else if (type == 1) {
+ // float (little-endian)
+ union {
+ float f;
+ uint32_t i;
+ } u;
+ compiler_assert(sizeof(u) == sizeof(u.i));
+
+ memcpy(&u.i, instruction_data + 3 + i, 4);
+ u.i = swap_le32(u.i);
+ i += 4;
+
+ dbglogfile << "(float) " << u.f << endl;
+ } else if (type == 2) {
+ dbglogfile << "NULL" << endl;
+ } else if (type == 3) {
+ dbglogfile << "undef" << endl;
+ } else if (type == 4) {
+ // contents of register
+ int reg = instruction_data[3 + i];
+ i++;
+ dbglogfile << "reg[" << reg << "]" << endl;
+ } else if (type == 5) {
+ int bool_val = instruction_data[3 + i];
+ i++;
+ dbglogfile << "bool(" << bool_val << ")" << endl;
+ } else if (type == 6) {
+ // double
+ // wacky format: 45670123
+ union {
+ double d;
+ uint64 i;
+ struct {
+ uint32_t lo;
+ uint32_t hi;
+ } sub;
+ } u;
+ compiler_assert(sizeof(u) == sizeof(u.i));
+
+ memcpy(&u.sub.hi, instruction_data + 3 + i, 4);
+ memcpy(&u.sub.lo, instruction_data + 3 + i + 4, 4);
+ u.i = swap_le64(u.i);
+ i += 8;
+
+ dbglogfile << "(double) " << u.d << endl;
+ } else if (type == 7) {
+ // int32
+ int32_t val = instruction_data[3 + i]
+ | (instruction_data[3 + i + 1] << 8)
+ | (instruction_data[3 + i + 2] << 16)
+ | (instruction_data[3 + i + 3] << 24);
+ i += 4;
+ dbglogfile << "(int) " << val << endl;
+ } else if (type == 8) {
+ int id = instruction_data[3 + i];
+ i++;
+ dbglogfile << "dict_lookup[" << id << "]" << endl;
+ } else if (type == 9) {
+ int id = instruction_data[3 + i] | (instruction_data[3 + i
+ 1] << 8);
i += 2;
-
- log_msg(" [%d]\n", count);
-
- // Print strings.
- for (int ct = 0; ct < count; ct++)
- {
- log_msg("\t\t"); // indent
-
- log_msg("\"");
- while (instruction_data[3 + i])
- {
- // safety check.
- if (i >= length)
- {
- log_msg("<disasm error -- length
exceeded>\n");
- break;
- }
-
- log_msg("%c", instruction_data[3 + i]);
- i++;
- }
- log_msg("\"\n");
- i++;
- }
+ dbglogfile << "dict_lookup_lg[" << id << "]" << endl;
}
- else if (fmt == ARG_FUNCTION2)
- {
- // Signature info for a function2 opcode.
- int i = 0;
- const char* function_name = (const char*)
&instruction_data[3 + i];
- i += strlen(function_name) + 1;
-
- int arg_count = instruction_data[3 + i] |
(instruction_data[3 + i + 1] << 8);
- i += 2;
-
- int reg_count = instruction_data[3 + i];
+ }
+ } else if (fmt == ARG_DECL_DICT) {
+ int i = 0;
+ int count = instruction_data[3 + i] | (instruction_data[3 + i + 1]
<< 8);
+ i += 2;
+
+ dbglogfile << " [" << count << "]" << endl;
+
+ // Print strings.
+ for (int ct = 0; ct < count; ct++) {
+ dbglogfile << "\t" << endl; // indent
+
+ string str;
+ while (instruction_data[3 + i]) {
+ // safety check.
+ if (i >= length) {
+ dbglogfile << "<disasm error -- length exceeded>" <<
endl;
+ break;
+ }
+ str += instruction_data[3 + i];
i++;
-
- log_msg("\n\t\tname = '%s', arg_count = %d, reg_count =
%d\n",
- function_name, arg_count, reg_count);
-
- uint16 flags = (instruction_data[3 + i]) |
(instruction_data[3 + i + 1] << 8);
- i += 2;
-
- // @@ What is the difference between "super" and "_parent"?
-
- bool preload_global = (flags & 0x100) != 0;
- bool preload_parent = (flags & 0x80) != 0;
- bool preload_root = (flags & 0x40) != 0;
- bool suppress_super = (flags & 0x20) != 0;
- bool preload_super = (flags & 0x10) != 0;
- bool suppress_args = (flags & 0x08) != 0;
- bool preload_args = (flags & 0x04) != 0;
- bool suppress_this = (flags & 0x02) != 0;
- bool preload_this = (flags & 0x01) != 0;
-
- log_msg("\t\t pg = %d\n"
- "\t\t pp = %d\n"
- "\t\t pr = %d\n"
- "\t\tss = %d, ps = %d\n"
- "\t\tsa = %d, pa = %d\n"
- "\t\tst = %d, pt = %d\n",
- int(preload_global),
- int(preload_parent),
- int(preload_root),
- int(suppress_super),
- int(preload_super),
- int(suppress_args),
- int(preload_args),
- int(suppress_this),
- int(preload_this));
-
- for (int argi = 0; argi < arg_count; argi++)
- {
- int arg_register = instruction_data[3 + i];
- i++;
- const char* arg_name = (const char*)
&instruction_data[3 + i];
- i += strlen(arg_name) + 1;
-
- log_msg("\t\targ[%d] - reg[%d] - '%s'\n", argi,
arg_register, arg_name);
- }
-
- int function_length = instruction_data[3 + i] |
(instruction_data[3 + i + 1] << 8);
- i += 2;
-
- log_msg("\t\tfunction length = %d\n", function_length);
}
+ dbglogfile << "\"" << str.c_str() << "\"" << endl;
+ i++;
+ }
+ } else if (fmt == ARG_FUNCTION2) {
+ // Signature info for a function2 opcode.
+ int i = 0;
+ const char* function_name = (const char*) &instruction_data[3 + i];
+ i += strlen(function_name) + 1;
+
+ int arg_count = instruction_data[3 + i] | (instruction_data[3 + i +
1] << 8);
+ i += 2;
+
+ int reg_count = instruction_data[3 + i];
+ i++;
+
+ dbglogfile << "\t\tname = '" << function_name << "'"
+ << " arg_count = " << arg_count
+ << " reg_count = " << reg_count << endl;
+
+ uint16 flags = (instruction_data[3 + i]) | (instruction_data[3
+ i + 1] << 8);
+ i += 2;
+
+ // @@ What is the difference between "super" and "_parent"?
+
+ bool preload_global = (flags & 0x100) != 0;
+ bool preload_parent = (flags & 0x80) != 0;
+ bool preload_root = (flags & 0x40) != 0;
+ bool suppress_super = (flags & 0x20) != 0;
+ bool preload_super = (flags & 0x10) != 0;
+ bool suppress_args = (flags & 0x08) != 0;
+ bool preload_args = (flags & 0x04) != 0;
+ bool suppress_this = (flags & 0x02) != 0;
+ bool preload_this = (flags & 0x01) != 0;
+
+ log_msg("\t\t pg = %d\n"
+ "\t\t pp = %d\n"
+ "\t\t pr = %d\n"
+ "\t\tss = %d, ps = %d\n"
+ "\t\tsa = %d, pa = %d\n"
+ "\t\tst = %d, pt = %d\n",
+ int(preload_global),
+ int(preload_parent),
+ int(preload_root),
+ int(suppress_super),
+ int(preload_super),
+ int(suppress_args),
+ int(preload_args),
+ int(suppress_this),
+ int(preload_this));
+
+ for (int argi = 0; argi < arg_count; argi++) {
+ int arg_register = instruction_data[3 + i];
+ i++;
+ const char* arg_name = (const char*) &instruction_data[3 +
i];
+ i += strlen(arg_name) + 1;
+
+ dbglogfile << "\t\targ[" << argi << "]"
+ << " - reg[" << arg_register << "]"
+ << " - '" << arg_name << "'" << endl;
+ }
+
+ int function_length = instruction_data[3 + i] | (instruction_data[3
+ i + 1] << 8);
+ i += 2;
+
+ dbglogfile << "\t\tfunction length = " << function_length << endl;
}
- else
- {
- log_msg("\n");
- }
+ } else {
+ dbglogfile << endl;
+ }
+ dbglogfile.setStamp(true);
}
-#endif // COMPILE_DISASM
-
};
Index: gnash/server/text.cpp
diff -u gnash/server/text.cpp:1.17 gnash/server/text.cpp:1.18
--- gnash/server/text.cpp:1.17 Tue May 9 15:34:16 2006
+++ gnash/server/text.cpp Mon May 15 03:21:07 2006
@@ -855,7 +855,7 @@
void
edit_text_character::display()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
if (m_def->m_border)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog libbase/Makefile.am libbase/l...,
Rob Savoye <=