Changeset 323 for trunk/thune/internal.h

Timestamp:

12/26/06 22:10:34 (2 years ago)

Author:

krobillard

Message:

Rune is now stand-alone.

Files:

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

trunk/thune/internal.h

@@ -45 +45 @@
 
 
+#ifdef LANG_THUNE
 /* Control Stack */
 
@@ -109 +110 @@
     CECell iter;
     CECell reduce;
-    CECell localFrame;
     CEFunc func;
     //CEHold hold;
@@ -161 +161 @@
 #endif
 
-
-#define UR_CALL_OP          ur_thread->callOp
 
 #define OP_NOP              0
@@ -198 +196 @@
 
 
-/* Control Stack */
-
 #define UR_TOC              ((CEntry*) ur_thread->toc)
 #define UR_BOC              ((CEntry*) ur_thread->cstack)
@@ -205 +201 @@
 #define UR_C_DEC            --ur_thread->toc
 #define UR_C_DECN(n)        ur_thread->toc -= n
-
-
-#define UR_LF_BEG           ((CEntry*) ur_thread->localFT)
-#define UR_LF_END           ((CEntry*) ur_thread->cstack + UR_CSTACK_SIZE)
+#endif
+
+
+#ifdef LANG_RUNE
+/* Control Stack */
+
+#define OP_NOP              0
+#define OP_DO               1
+#define OP_THROW            2
+#define OP_REDUCE           3
+#define OP_HALT             4
+#define OP_QUIT             5
+
+
+#define UR_TOC              ur_thread->toc
+#define UR_BOC              ur_thread->cstack
+#define UR_C_GROW           ++ur_thread->toc
+#define UR_C_DEC            --ur_thread->toc
+#endif
+
+
+#define UR_CALL_OP          ur_thread->callOp
+
+
+/* Local Frame */
+
+typedef union
+{
+    UCell  makesUs16bytes;
+    struct
+    {
+        UCell*  cell;   // Points into data stack.
+        int32_t n;
+    }
+    localFrame;
+}
+LocalFrame;
+
+#define UR_LF_BEG           ((LocalFrame*) ur_thread->localFT)
+#define UR_LF_END           ((LocalFrame*)(ur_thread->cstack + UR_CSTACK_SIZE))
 #define UR_LF_POP           ++ur_thread->localFT
 #define UR_LF_PUSH(negBN,ptr) \