[Gnash-commit] /srv/bzr/gnash/avm2 r9502: Clean up some debug statements.

[Tom Stellard]

------------------------------------------------------------
revno: 9502
committer: Tom Stellard <address@hidden>
branch nick: gnash_dev
timestamp: Thu 2008-08-21 13:07:42 +0800
message:
  Clean up some debug statements.
modified:
  libcore/vm/Machine.cpp
  libcore/vm/Machine.h

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2008-08-20 05:04:09 +0000
+++ b/libcore/vm/Machine.cpp    2008-08-21 05:07:42 +0000
@@ -110,7 +110,7 @@
        if (!pool)
                throw ASException();
        asName multiname = pool->mMultinamePool.at(index);
-       LOG_DEBUG_AVM("Finding property id=%u abc name=%u global name = %u abc 
string=%s flags=0x%X 
name_space=%u",index,multiname.getABCName(),multiname.getGlobalName(),pool->mStringPool[multiname.getABCName()],multiname.mFlags
 | 0x0,multiname.getNamespace()->getURI());
+       LOG_DEBUG_AVM("Searching multiname pool for property id=%u abc name=%u 
global name = %u abc string=%s flags=0x%X 
name_space=%u",index,multiname.getABCName(),multiname.getGlobalName(),pool->mStringPool[multiname.getABCName()],multiname.mFlags
 | 0x0,multiname.getNamespace()->getURI());
        return multiname;
 }
 
@@ -263,31 +263,6 @@
        break;                                                                  
                                                                \
 }                                                                              
                                  /* end of JUMPIF */
 
-#ifdef PRETEND
-#define GROW_STACK() log_debug("AVM2: Growing stack")
-#else
-#define GROW_STACK() mStack.grow(1)
-#endif
-
-
-
-#define PRINT_GET_REGISTER(index) log_debug("AVM2: Getting value of register 
%d",index)
-
-#ifdef PRETEND
-#define PUSH_STACK(value) value; log_debug("AVM2: Pushing value onto the 
stack.")
-#else
-#define PUSH_STACK(value) mStack.push(value)
-#endif
-
-
-
-#define PRINT_FIND_PROPERTY(asName_obj) \
-asNamespace* macro_ns = asName_obj.getNamespace(); \
-log_debug("AVM2: Find property id=%d name=%s flags=0x%X 
namespace=%s",asName_obj.getABCName(),mPoolObject->mStringPool[asName_obj.getABCName()],asName_obj.mFlags
 | 0x0,macro_ns ?mPoolObject->mStringPool[macro_ns->getURI()]:"NONE");
-
-#define DEBUG_NOT_COMPLETE() log_debug("AVM2: ***Debug statements not complete 
for opcode.***");
-
-#define LOG_AVM_UNIMPLEMENTED() log_debug("AVM2: Opcode not implemented.");
 void
 Machine::execute()
 {
@@ -301,16 +276,12 @@
        {
 //     opcode = mStreamStack.top(0)->read_as3op();
        opcode = mStream->read_as3op();
-       log_debug("AVM2: Executing opcode: %X",opcode | 0x0);
+       LOG_DEBUG_AVM("** Executing opcode: %X **",opcode | 0x0);
 //     continue;
        switch ((opcode /*= mStream->read_as3op()*/)) // Assignment intentional
        {
        default:
-#ifdef PRETEND
-               log_debug("AVM2: Invalid opcode.");
-#else
                throw ASException();
-#endif
                break;
        case 0:
        {
@@ -1271,7 +1242,6 @@
 ///  .
        case SWF::ABC_ACTION_CONSTRUCTSUPER:
        {
-               LOG_AVM_UNIMPLEMENTED();
                boost::uint32_t argc = mStream->read_V32();
                LOG_DEBUG_AVM("There are %u arguments.",argc);
                get_args(argc);
@@ -1366,7 +1336,6 @@
                        arr->set_indexed(i, pop_stack());
                }
                push_stack(as_value(arr));
-               print_stack();
                break;
        }
 /// 0x57 ABC_ACTION_NEWACTIVATION
@@ -1389,7 +1358,6 @@
 /// NB: This depends on scope and scope base (to determine lifetime(?))
        case SWF::ABC_ACTION_NEWCLASS:
        {
-               LOG_AVM_UNIMPLEMENTED();
                boost::uint32_t cid = mStream->read_V32();
                asClass *c = pool_class(cid, mPoolObject);
                LOG_DEBUG_AVM("Creating new class id=%u 
name=%s",c->getName(),mPoolObject->mStringPool[c->getName()]);
@@ -1405,7 +1373,6 @@
                //Call the class's static constructor.
                load_function(c->getStaticConstructor()->getBody());
 
-               print_stack();
 //             ENSURE_OBJECT(mStack.top(0));
 //             as_object *obj = mStack.top(0).to_object().get();
 //             as_function *func = c->getConstructor()->getPrototype();
@@ -1456,7 +1423,6 @@
        case SWF::ABC_ACTION_FINDPROPSTRICT:
        case SWF::ABC_ACTION_FINDPROPERTY:
        {
-               LOG_AVM_UNIMPLEMENTED();
 //             boost::uint32_t property_name = mStream->read_V32();
                asName a = pool_name(mStream->read_V32(), mPoolObject);
                find_prop_strict(a);
@@ -1536,7 +1502,6 @@
                if(!object->set_member_default(a.getGlobalName(),value,0,true)){
                        
object->init_member(mPoolObject->mStringPool[a.getABCName()],value,0,0);
                }
-               print_stack();
                break;
        }
 /// 0x62 ABC_ACTION_GETLOCAL
@@ -1569,7 +1534,7 @@
        case SWF::ABC_ACTION_GETGLOBALSCOPE:
        {
                push_stack(mAsValueScopeStack.value(0));
-               print_stack();
+//             print_stack();
                break;
        }
 /// 0x65 ABC_ACTION_GETSCOPEOBJECT
@@ -1611,7 +1576,6 @@
 ///  Set obj::(resolve)'name_id' to value, set bindings from the context.
        case SWF::ABC_ACTION_INITPROPERTY:
        {
-               LOG_AVM_UNIMPLEMENTED();
                boost::uint32_t index = mStream->read_V32();
                asName a = pool_name(index, mPoolObject);
                as_value v = pop_stack();
@@ -2377,6 +2341,7 @@
                break;
        }
        } // end of switch statement
+               LOG_DEBUG_AVM("* DONE *");
        } // end of AS3 conditional
        else // beginning of !AS3 (this code is AS2)
        {

=== modified file 'libcore/vm/Machine.h'
--- a/libcore/vm/Machine.h      2008-08-20 05:04:09 +0000
+++ b/libcore/vm/Machine.h      2008-08-21 05:07:42 +0000
@@ -256,12 +256,13 @@
        void push_stack(as_value object){
                LOG_DEBUG_AVM("Pushing value %s onto 
stack.",object.toDebugString());
                mStack.push(object);
-               LOG_DEBUG_AVM("There are now %u items in the 
stack",mStack.size());
+               print_stack();
        }
 
        as_value pop_stack(){
                as_value value = mStack.pop();
-               LOG_DEBUG_AVM("Poping value %s off the stack.  There are now %u 
items in the stack",value.toDebugString(),mStack.size());
+               LOG_DEBUG_AVM("Poping value %s off the 
stack.",value.toDebugString());
+               print_stack();
                return value;
        }
 
@@ -315,8 +316,8 @@
        void print_stack(){
                
                std::stringstream ss;
-               ss << "Stack: ";
-//             log_debug("Stack size is %u",mStack.size());
+               ss << "Stack: size=";
+               ss<< mStack.size()<<" Items: ";
                for(unsigned int i=0;i<mStack.size();++i){
                        as_value value = mStack.value(i);
                        ss << mStack.top(i).toDebugString();
@@ -346,6 +347,18 @@
 
        void load_function(CodeStream* stream){
                saveState();
+               std::stringstream ss;
+               ss << "Loading function:\n";
+               int length = 0;
+               while(int opcode = stream->read_as3op()){
+                       ss << "0x" << std::hex << opcode << " ";
+                       length ++;
+                       if(length%20 == 0){
+                               ss << "\n";
+                       }
+               }
+               LOG_DEBUG_AVM("%s",ss.str());
+               stream->seekTo(0);
                mStream = stream;
        }