Changeset 7732 for lang/actionscript

Timestamp:

03/10/08 02:08:04 (5 years ago)

Author:

gyuque

Message:

tinyaction: fixed call/ret

Location:

lang/actionscript/tinyaction/tavm

Files:

• DatLoaderRequest.as (modified) (2 diffs)
• ModuleData.as (modified) (2 diffs)
• TACallFrameStack.as (modified) (4 diffs)
• TAContext.as (modified) (10 diffs)

lang/actionscript/tinyaction/tavm/DatLoaderRequest.as

@@ -60 +60 @@
                         var rval:ModuleData = new ModuleData();
                         
+                        rval.name = parseModuleName();
                         rval.setConstantPool( parseConstantPool() );
                         parseFuncEntries(rval);
@@ -65 +66 @@
                         return rval;
                 }
+
+                private function parseModuleName():String
+                {
+                        var nm:String = nextLine();
+                        return nm;
+                }
                 
                 private function parseConstantPool():Array
                 {
                         var flds:String = nextLine();
-                        return flds.split(/ +/);
+                        return flds.split('\u0000');
                 }
                 

lang/actionscript/tinyaction/tavm/ModuleData.as

@@ -5 +5 @@
                 private var mFuncs:Array;
                 private var mConstantPool:Array;
+                private var mName:String;
+                private var mFuncBuf:TACodeBuffer;
                 
                 function ModuleData()
                 {
                         mFuncs = [];
+                        mFuncBuf = new TACodeBuffer();
+                }
+                
+                public function lookupFunction(nm:String):Object
+                {
+                        return mFuncBuf.funcTable[nm];
+                }
+                
+                public function set name(nm:String):void
+                {
+                        mName = nm;
+                }
+                
+                public function get name():String
+                {
+                        return mName;
                 }
                 
@@ -14 +32 @@
                 {
                         mFuncs.push(f);
+                        mFuncBuf.addFuncObject(f);
                 }
                 

lang/actionscript/tinyaction/tavm/TACallFrameStack.as

@@ -7 +7 @@
                 private var mDataStack:TAStack;
                 private var mFuncStack:Array;
-                private var mReturnStack:Array;
+                private var mReturnVal:Object;
                 private var mReturnAddrStack:Array;
                 
@@ -22 +22 @@
                         mRegStack        = new Array();
                         mFuncStack       = new Array();
-                        mReturnStack     = new Array();
+                        mReturnVal       = undefined;
                         mDataStack       = new TAStack();
                         
@@ -42 +42 @@
                         mRegStack        = new Array();
                         mFuncStack       = new Array();
-                        mReturnStack     = new Array();
+                        mReturnVal       = undefined;
                         mDataStack.clear();
                         
@@ -174 +174 @@
                 public function pushReturn(val:Object):void
                 {
-                        mReturnStack.push(val);
+                        mReturnVal = val;
                 }
 
                 public function popReturn():Object
                 {
-                        return mReturnStack.pop();
+                        var ret:Object = mReturnVal;
+                        mReturnVal = undefined;
+                        return ret;
                 }
                 

lang/actionscript/tinyaction/tavm/TAContext.as

@@ -25 +25 @@
                 
                 
-                private var mCodes:TACodeBuffer;
                 private var mRegs:Array;
                 private var mConsts:Array;
@@ -42 +41 @@
                         mGlobal     = null;
                         mConsts     = null;
-                        mCodes      = new TACodeBuffer();
                         mCallFrames = new TACallFrameStack(this);
                 }
@@ -58 +56 @@
                         return mGlobal.getByName(name);
                 }               
-                
-                public function get codeBuffer():TACodeBuffer
-                {
-                        return mCodes;
-                }
                 
                 public function get progCount():uint
@@ -94 +87 @@
                 public function returnVoid():void
                 {
+                        returnParam(undefined);
+                }
+
+                public function returnParam(val:Object):void
+                {
+                        mCallFrames.pushReturn(val);
+                        resume();
+                }
+                
+                public function resume():void
+                {
+                        var retaddr:int = mCallFrames.returnAddress;
                         mCallFrames.popFrame();
-                        
                         mCurBuf = mCallFrames.empty ? null : mCallFrames.currentFunction.bytecode;
                         if (mCurBuf != null)
-                                mCurBuf.position = mCallFrames.returnAddress;
-                }
-
-                public function returnParam(val:Object):void
-                {
-                        mCallFrames.popFrame();
-                        mCallFrames.pushReturn(val);
-                        
-                        mCurBuf = mCallFrames.empty ? null : mCallFrames.currentFunction.bytecode;
-                        if (mCurBuf != null)
-                                mCurBuf.position = mCallFrames.returnAddress;
+                        {
+                                mCurBuf.position = retaddr;
+                                mCallFrames.pushData( popLastReturnValue() );
+                        }
                 }
                 
@@ -132 +129 @@
                                 return;
                         //---------------------
-                        for (var count:uint = 0;count < max;count++)
-                        {
+                        for (var count:uint = 0;count < max && (mCurBuf != null);count++)
+                        {
+                                if (mCurBuf.bytesAvailable == 0)
+                                {
+                                        returnVoid();
+                                        continue;
+                                }
+                                
                                 code = mCurBuf.readUnsignedByte();
                                 //profiles[code] = profiles[code] ? (profiles[code]+1) : 1;
@@ -192 +195 @@
                                         break;
                                 
-                                case 0x3e:
+                                case 0x3e: // ret
                                         {
                                                 val1 = mCallFrames.popData(); // return param
                                                 returnParam(val1);
-                                                return;
+                                                continue;
                                         }
                                         break;
@@ -292 +295 @@
                                                 
 //                                      TATest.p("  call method '"+name+"' of "+val1+" with "+cm_arg_count+"args");
-                                                mCallFrames.pushData( doCallMethod(val1, name, cm_args) );
+                                                doCallMethod(val1, name, cm_args);
 //                                      TATest.p("  ret= "+mCallFrames.topOfDataStack());
                                         }
@@ -375 +378 @@
                                 } // switch
                                 
-                                if (mCurBuf.bytesAvailable == 0)
-                                {
-                                        returnVoid();
-                                        
-                                        if (mCallFrames.empty)
-                                        {
-                                                //TATest.p("execution has finished.");
-                                                break;
-                                        }
-                                }
                                 
                         } // for loop
@@ -430 +423 @@
                 }
                 
-                private function doCallMethod(obj:Object, name:String, args:Array):Object
-                {
+                private function doCallMethod(obj:Object, name:String, args:Array):void
+                {
+                        if (obj is ModuleData)
+                        {
+                                // script function
+                                callFunctionImmediately(obj, name, args);
+                                // return value will be pushed while execution
+                                return;
+                        }
+                        
                         // native method
-                        return obj[name].apply(obj, args);
-                }
-                
-                public function callFunctionImmediately(name:String, args:Array):void
+                        mCallFrames.pushData( obj[name].apply(obj, args) );
+                        // push return value here.
+                }
+                
+                public function callFunctionImmediately(obj:Object, name:String, args:Array):void
                 {
                         if (mConsts == null)
                                 throw "constant pool must be set";
                         
-                        var func_obj:Object = lookup_func(name);
+                        var func_obj:Object = obj.lookupFunction(name);
                         if (!func_obj)
                                 throw "function not found: "+name;
@@ -527 +529 @@
                 }
                 
-                private function lookup_func(name:String):Object
-                {
-                        return mCodes.funcTable[name] || null;
-                }
-                
-                
                 private static function decodeIEEE754(a:Array, ofs:int):Number
                 {