Changeset 169

Timestamp:

05/20/07 17:35:04 (2 years ago)

Author:

JarrettBillingsley

Message:

--

Files:

• trunk/mdcl.zip (modified) (previous)
• trunk/minid/baselib.d (modified) (1 diff)
• trunk/minid/compiler.d (modified) (1 diff)
• trunk/minid/opcodes.d (modified) (1 diff)
• trunk/minid/types.d (modified) (16 diffs)
• trunk/test.opt (modified) (previous)

trunk/minid/baselib.d

@@ -430 +430 @@
-    int mdtypeof(MDState s, uint numParams)
-    {
-typeStrings[s.getParam(0u).type]
+s.getParam(0u).typeString()
-        return 1;
-    }

trunk/minid/compiler.d

@@ -3149 +3149 @@
-        ret.mNumParams = mNumParams;
-        ret.mNumUpvals = mUpvals.length;
-
+ + 1
-        ret.mCode = mCode;
-        ret.mLineInfo = mLineInfo;

trunk/minid/opcodes.d

@@ -171 +171 @@
-PopCatch..........I: n/a, n/a
-PopFinally........I: n/a, n/a
-
+   
-PushCatch.........J: exception reg, branch offset
-PushFinally.......J: n/a, branch offset

trunk/minid/types.d

@@ -2871 +2871 @@
-        writefln();
-        writefln("-----Stack Dump-----");
-CurrentAR.savedTop
+Stack.length
-            writefln("[%2d:%3d]: %s", i, i - cast(int)mCurrentAR.base, mStack[i].toString());
-
@@ -3717 +3717 @@
-            mCurrentAR.numReturns = numReturns;
-            mCurrentAR.env = closure.environment();
-
+
-            mStackIndex = base + funcDef.mStackSize;
-
@@ -3793 +3793 @@
-        }
-
-        mStackIndex = destSlot;
-
-        if(mARIndex == 0)
-            mState = State.Dead;
-
-
+
+
+
-            mStackIndex = mCurrentAR.savedTop;
-
@@ -4869 +4869 @@
-    }
-    
-
+final 
-    {
-        MDValue* v;
@@ -4924 +4924 @@
-    }
-    
-
+final 
-    {
-        debug(TIMINGS) scope _profiler_ = new Profiler("Cat");
@@ -4964 +4964 @@
-    }
-    
-
+final 
-    {
-        debug(TIMINGS) scope _profiler_ = new Profiler("CatEq");
@@ -5095 +5095 @@
-                Instruction i = *mCurrentAR.pc;
-                mCurrentAR.pc++;
-
-                MM operation = void;
-
-                switch(i.opcode)
@@ -5553 +5551 @@
-                            if(numParams == -1)
-                                numParams = getBasedStackIndex() - funcReg - 1;
+                            else
+                                mStackIndex = funcReg + numParams + 1;
-    
-                            if(callPrologue(funcReg, numResults, numParams) == true)
@@ -5558 +5558 @@
-                                depth++;
-                                constTable = mCurrentAR.func.script.func.mConstants;
+                            }
+                            else
+                            {
+                                if(numResults >= 0)
+                                    mStackIndex = mCurrentAR.savedTop;
-                            }
-                        }
@@ -5570 +5575 @@
-                            if(numParams == -1)
-                                numParams = getBasedStackIndex() - funcReg - 1;
-
+
+
+
-                            funcReg = basedIndexToAbs(funcReg);
-    
@@ -5615 +5622 @@
-                            if(numParams == -1)
-                                numParams = getBasedStackIndex() - funcReg - 1;
+                            else
+                                mStackIndex = funcReg + numParams + 1;
-
-                            if(callPrologue(funcReg, numResults, numParams) == true)
@@ -5621 +5630 @@
-                                constTable = mCurrentAR.func.script.func.mConstants;
-                            }
+                            else
+                            {
+                                if(numResults >= 0)
+                                    mStackIndex = mCurrentAR.savedTop;
+                            }
-                        }
-                        else
@@ -5633 +5647 @@
-                            if(numParams == -1)
-                                numParams = getBasedStackIndex() - funcReg - 1;
+                            else
+                                mStackIndex = funcReg + numParams + 1;
-    
-                            funcReg = basedIndexToAbs(funcReg);
@@ -5665 +5681 @@
-
-                        int numResults = i.imm - 1;
+                        
+                        if(numResults >= 0)
+                            mStackIndex = i.rd + numResults;
-
-                        close(0);
@@ -5672 +5691 @@
-                        if(depth == 0)
-                            return;
-
+
-                        constTable = mCurrentAR.func.script.func.mConstants;
-                        break;
@@ -5681 +5700 @@
-                        int numNeeded = i.imm - 1;
-                        int numVarargs = mCurrentAR.base - mCurrentAR.vargBase;
+                        uint dest = basedIndexToAbs(i.rd);
-    
-                        if(numNeeded == -1)
+                        {
-                            numNeeded = numVarargs;
-
-
+
+
+
-
-                        uint src = mCurrentAR.vargBase;
-                        uint dest = basedIndexToAbs(i.rd);
-
-                        for(uint index = 0; index < numNeeded; index++)
-                        {
-                            if(index < numVarargs)
- + index
+
-                            else
- + index
-
+
+
-                            src++;
+                            dest++;
-                        }
-
-mStackIndex = dest + numNeeded
+
+debug(STACKINDEX) writefln("Op.Vararg set stack index to ", mStackIndex)
-                        break;
-