Changeset 187 for trunk/thune/internal.h

Timestamp:

06/20/06 05:09:27 (3 years ago)

Author:

krobillard

Message:

Thune - Major improvement to the handling of local function values.
Locals can now be passed to inner functions and caught when returned.
Functions are no longer tied to the thread which created them.

The localArgBlk has been eliminated and locals are now stored on the stack.
To accomodate this, the data stack is now separate from the control stack
and grows upwards. This also means that functions can no longer access the
stack below the function call. A limit of one returned value is in place.

To regain full stack usage, locals could be stored on the control stack.
The only downside would be an extra copy of arguments from the data to
the control stack.

ur_wordCell() is now a function rather than a macro.

uc_do() has been merged into ur_eval() and 'do is now implemented as an opcode.

. & .s now use uc_console_out() rather than dprint.

Files:

• trunk/thune/internal.h (modified) (4 diffs)

trunk/thune/internal.h

@@ -75 +75 @@
 {
     int16_t code;
-    int16_t argc;
+    int16_t locals;
     int32_t bodyN;
     int32_t sigN;
@@ -116 +116 @@
 
 
-//#define CC_LEN_FUNC         1  // + argc
+#define CC_LEN_FUNC         1
 #define CC_LEN_EVAL         1
 #define CC_LEN_FOREVER      1
@@ -186 +186 @@
 
 #define UR_TOS              ur_thread->tos
-#define UR_BOS              ur_thread->bos
-#define UR_S_PUSH(v)        *--UR_TOS = v
-#define UR_S_GROW           --UR_TOS
-#define UR_S_GROWN(n)       UR_TOS -= n
-#define UR_S_DROP           ++UR_TOS
-#define UR_S_DROPN(n)       UR_TOS += n
+#define UR_BOS              ur_thread->dstack
+#define UR_S_PUSH(v)        *++UR_TOS = v
+#define UR_S_GROW           ++UR_TOS
+#define UR_S_GROWN(n)       UR_TOS += n
+#define UR_S_DROP           --UR_TOS
+#define UR_S_DROPN(n)       UR_TOS -= n
 #define UR_S_SAFE_DROP          if(UR_TOS != UR_BOS) UR_S_DROP
-#define UR_S_DUP            --UR_TOS; *UR_TOS = UR_TOS[1]
-#define UR_S_NIP            UR_TOS[1] = *UR_TOS; UR_S_DROP
-#define ur_s_atBottom(sp)   (sp == ur_thread->bos)
-#define ur_s_notBottom(sp)  (sp != ur_thread->bos)
-#define ur_s_prev(v)        (v + 1)
-#define ur_s_next(v)        (v - 1)
-#define ur_s_backN(v,n)     (v + (n))
-#define ur_s_aheadN(v,n)    (v - (n))
+#define UR_S_DUP            UR_TOS[1] = *UR_TOS; ++UR_TOS
+#define UR_S_NIP            --UR_TOS; *UR_TOS = UR_TOS[1]
+#define ur_s_atBottom(sp)   (sp == ur_thread->dstack)
+#define ur_s_notBottom(sp)  (sp != ur_thread->dstack)
+#define ur_s_prev(v)        (v - 1)
+#define ur_s_next(v)        (v + 1)
+#define ur_s_backN(v,n)     (v - (n))
+#define ur_s_aheadN(v,n)    (v + (n))
 
 
@@ -206 +206 @@
 
 #define UR_TOC              ((CEntry*) ur_thread->toc)
-#define UR_BOC              ((CEntry*) ur_thread->boc)
+#define UR_BOC              ((CEntry*) ur_thread->cstack)
 #define UR_C_GROW           ++ur_thread->toc
 #define UR_C_DEC            --ur_thread->toc