Changeset 72

Timestamp:

03/04/06 19:57:01 (3 years ago)

Author:

krobillard

Message:

Added 'rot opcode.
Replaced UR_BIG_ENDIAN with BIG_ENDIAN.

Location:

trunk/thune

Files:

• boot.c (modified) (1 diff)
• doc/UserManual (modified) (1 diff)
• doc/thune.vim (modified) (1 diff)
• eval.c (modified) (2 diffs)
• internal.h (modified) (1 diff)
• tests/working/factorial.good (modified) (1 diff)
• tests/working/factorial.t (modified) (1 diff)
• urlan.c (modified) (2 diffs)
• urlan.h (modified) (2 diffs)

trunk/thune/boot.c

@@ -10 +10 @@
   "  opcode!  8 'nip     make :nip\n"
   "  opcode!  9 'tuck    make :tuck\n"
-  "  opcode! 10 'do      make :xx-do\n"
-  "  opcode! 11 'func    make :func\n"
-  "  opcode! 12 'iter    make :iter\n"
-  "  opcode! 13 'recurse make :recurse\n"
-  "  opcode! 14 'loop    make :xx-loop\n"
-  "  opcode! 15 'return  make :return\n"
-  "  opcode! 16 'throw   make :throw\n"
-  "  opcode! 17 'try     make :try\n"
-  "  opcode! 18 'ift     make :ift\n"
-  "  opcode! 19 'iff     make :iff\n"
-  "  opcode! 20 '!       make :!\n"
-  "  opcode! 21 'quit    make :quit\n"
-  "  opcode! 22 'inc     make :inc\n"
-  "  opcode! 23 'dec     make :dec\n"
-  "  opcode! 24 'verify    make :verify\n"
-  "  opcode! 25 'verify.2  make :verify.2\n"
-  "  opcode! 26 'verify.3  make :verify.3\n"
+  "  opcode! 10 'rot     make :rot\n"
+  "  opcode! 11 'do      make :xx-do\n"
+  "  opcode! 12 'func    make :func\n"
+  "  opcode! 13 'iter    make :iter\n"
+  "  opcode! 14 'recurse make :recurse\n"
+  "  opcode! 15 'loop    make :xx-loop\n"
+  "  opcode! 16 'return  make :return\n"
+  "  opcode! 17 'throw   make :throw\n"
+  "  opcode! 18 'try     make :try\n"
+  "  opcode! 19 'ift     make :ift\n"
+  "  opcode! 20 'iff     make :iff\n"
+  "  opcode! 21 '!       make :!\n"
+  "  opcode! 22 'quit    make :quit\n"
+  "  opcode! 23 'inc     make :inc\n"
+  "  opcode! 24 'dec     make :dec\n"
+  "  opcode! 25 'verify    make :verify\n"
+  "  opcode! 26 'verify.2  make :verify.2\n"
+  "  opcode! 27 'verify.3  make :verify.3\n"
   "] make :urlan-ops\n"
 ;

trunk/thune/doc/UserManual

@@ -122 +122 @@
 nip      (a b -- b)         Remove second value on stack.
 tuck     (a b -- b a b)     Copy top value under second value.
+rot      (a b c -- b c a)   Rotate third value to top.
 =======  =================  =================
 

trunk/thune/doc/thune.vim

@@ -41 +41 @@
 " Booleans
 syn keyword     thuneBoolean    true false on off yes no
-syn keyword     thuneOpcode     drop dup dup2 over swap inc dec
+syn keyword     thuneOpcode     drop dup dup2 over swap inc dec nip tuck
 
 " Values

trunk/thune/eval.c

@@ -429 +429 @@
                         break;
 
-                    //case OP_ROT:          // (a b c -- b c a)
-
                     case OP_TUCK:         // (a b -- b a b)
                     {
@@ -437 +435 @@
                         UR_TOS[1] = UR_TOS[2];
                         UR_TOS[2] = *UR_TOS;
+                    }
+                        ++pc;
+                        break;
+
+                    case OP_ROT:          // (a b c -- b c a)
+                    {
+                        UCell tmp = UR_TOS[2];
+                        UR_TOS[2] = UR_TOS[1];
+                        UR_TOS[1] = *UR_TOS;
+                        *UR_TOS = tmp;
                     }
                         ++pc;

trunk/thune/internal.h

@@ -118 +118 @@
 #define OP_NIP              8
 #define OP_TUCK             9
-#define OP_DO               10
-#define OP_FUNC             11
-#define OP_ITER             12
-#define OP_RECURSE          13
-#define OP_LOOP             14
-#define OP_RETURN           15
-#define OP_THROW            16
-#define OP_TRY              17
-#define OP_IF_TRUE          18
-#define OP_IF_FALSE         19
-#define OP_HALT             20
-#define OP_QUIT             21
-#define OP_INCREMENT        22
-#define OP_DECREMENT        23
-#define OP_VERIFY           24
-#define OP_VERIFY_2         25
-#define OP_VERIFY_3         26
+#define OP_ROT              10
+#define OP_DO               11
+#define OP_FUNC             12
+#define OP_ITER             13
+#define OP_RECURSE          14
+#define OP_LOOP             15
+#define OP_RETURN           16
+#define OP_THROW            17
+#define OP_TRY              18
+#define OP_IF_TRUE          19
+#define OP_IF_FALSE         20
+#define OP_HALT             21
+#define OP_QUIT             22
+#define OP_INCREMENT        23
+#define OP_DECREMENT        24
+#define OP_VERIFY           25
+#define OP_VERIFY_2         26
+#define OP_VERIFY_3         27
 //#define OP_END              255
 

trunk/thune/tests/working/factorial.good

@@ -1 +1 @@
 1409286144
+10946

trunk/thune/tests/working/factorial.t

@@ -8 +8 @@
 30 factorial .
 
+
+[
+    dup 2 lt? ift (drop 1 return)
+    dup 1 sub fibonacci
+    swap 2 sub fibonacci add
+]
+func :fibonacci   ; (n -- res)
+
+20 fibonacci .

trunk/thune/urlan.c

@@ -141 +141 @@
 
 
+#ifdef DEBUG
+static void _validateEnv()
+{
+    int i;
+
+    assert( sizeof(UCell) == 16 );
+    assert( sizeof(CEntry) == 16 );
+
+    // Make sure endianess is correct.
+    i = 1;
+#ifdef __BIG_ENDIAN__
+    assert(0 == *(char*)&i && "Undefine __BIG_ENDIAN__");
+#else
+    assert(1 == *(char*)&i && "Define __BIG_ENDIAN__");
+#endif
+}
+#endif
+
+
 extern void ur_makeCallsEval();
 extern void ur_makeCallsSeries();
@@ -154 +173 @@
     int n;
 
-    assert( sizeof(UCell) == 16 );
-    assert( sizeof(CEntry) == 16 );
+#ifdef DEBUG
+    _validateEnv();
+#endif
 
     ur_env = env;

trunk/thune/urlan.h

@@ -36 +36 @@
 #define UR_VERSION_STR  "0.0.1"
 #define UR_VERSION      0x000001
-
-
-#if defined(__APPLE__) && defined(__BIG_ENDIAN__)
-#define UR_BIG_ENDIAN   1
-#endif
 
 
@@ -448 +443 @@
 
 #define ur_type(c)          (c)->id.type
-#ifdef UR_BIG_ENDIAN
+#ifdef __BIG_ENDIAN__
 #define ur_setType(c,t)     *((uint32_t*) (c)) = t << 24
 #else