Changeset 418 for branches/thune/thread_safe/rune/rune.c

Timestamp:

06/22/07 20:53:36 (17 months ago)

Author:

krobillard

Message:

Rune works again.

Files:

• branches/thune/thread_safe/rune/rune.c (modified) (21 diffs)

branches/thune/thread_safe/rune/rune.c

@@ -41 +41 @@
 
 
-#define OR_TOC          ur_thread->toc
-#define OR_BOC          ur_thread->cstack
+#define OR_TOC          ut->toc
+#define OR_BOC          ut->cstack
 
 #define ur_funcFetch(cell)  cell->func.closureN
@@ -140 +140 @@
 
 #ifdef DEBUG
-void dumpControl()
+void dumpControl( UThread* ut )
 {
     UString str;
     UString* sp = &str;
-    UCell* it  = ur_env->threads->cstack;
-    UCell* end = ur_env->threads->toc + 1;
+    UCell* it  = ut->cstack;
+    UCell* end = ut->toc + 1;
 
     ur_arrayInit( sp, 1, 0 );
@@ -164 +164 @@
 
 
-static int _verifyArgs( UThread* ur_thread, UCell* dt, int count )
+static int _verifyArgs( UThread* ut, UCell* dt, int count )
 {
     UCell* it;
@@ -210 +210 @@
 extern int ur_getSelector( UThread*, const UCell* sel, UCell* res );
 
-int ur_eval( UThread* ur_thread, UIndex blkN, UIndex si )
+int ur_eval( UThread* ut, UIndex blkN, UIndex si )
 {
     UBlock* blk;
@@ -245 +245 @@
                 {
                     // Return from function.
-                    cval = UR_LF_BEG->localFrame.cell;
+                    cval = UR_LF_BEG->cell;
                     UR_LF_POP;
                     ur_copyCell(cval, *val);
@@ -285 +285 @@
     if( ur_is(pc, UT_WORD) )
     {
-        val = ur_wordCell( ur_thread, pc );
+        val = ur_wordCell( ut, pc );
     }
     else
@@ -301 +301 @@
 
         case UT_GETWORD:
-            val = ur_wordCell( ur_thread, val );
+            val = ur_wordCell( ut, val );
             break;
 
@@ -373 +373 @@
 
         case UT_SELECT:
-            if( ! ur_getSelector( ur_thread, val, UR_TOS ) )
+            if( ! ur_getSelector( ut, val, UR_TOS ) )
             {
                 --pc;
@@ -523 +523 @@
                 case ROP_EACH_LOOP:
                     val = ur_s_prev(UR_TOS);
-                    if( ur_itLen( val ) > 0 )
+                    if( ur_itLen( ut, val ) > 0 )
                     {
-                        cval = ur_wordCell( ur_thread, ur_s_prev(val) );
+                        cval = ur_wordCell( ut, ur_s_prev(val) );
                         if( ! cval )
                             goto op_throw;
-                        ur_pick( val, 0, cval );
+                        ur_pick( ut, val, 0, cval );
                         val->series.it++;
                         val = UR_TOS;
@@ -553 +553 @@
         case UT_SETWORD:
             LOOK_AHEAD_FOR_INFIX
-            cval = ur_wordCell( ur_thread, OR_TOC );
+            cval = ur_wordCell( ut, OR_TOC );
             if( ! cval )
             {
@@ -636 +636 @@
 do_call:
 
-    //printf( "KR call %ld\n", UR_TOS - ur_thread->dstack );
-
-    val->call.addr( ur_thread, UR_TOS );
+    //printf( "KR call %ld\n", UR_TOS - ut->dstack );
+
+    val->call.addr( ut, UR_TOS );
     val = UR_TOS;
     UR_S_DROP;
@@ -680 +680 @@
         int locc = totc - argc;
 
-        UR_LF_PUSH( -val->func.sigN, UR_TOS - (argc - 1) );
+        //UR_LF_PUSH( -val->func.sigN, UR_TOS - (argc - 1) );
+        --ut->localFT;
+        UR_LF_BEG->cell = UR_TOS - (argc - 1);
+        UR_LF_BEG->n    = val->func.sigN;
+
 
         if( argc )
         {
             blk = ur_blockPtr( val->func.sigN );
-            if( ! _verifyArgs( ur_thread, blk->ptr.cells + totc, argc ) )
+            if( ! _verifyArgs( ut, blk->ptr.cells + totc, argc ) )
                 goto op_throw;
         }
@@ -854 +858 @@
 trace_error:
 
-    _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
+    _appendTraceBlk( ut, &UR_TOS->err, blkN, pc - start );
 
 error:
@@ -886 +890 @@
         putchar( ur_char(tos) );
     }
-    else if( ur_stringSlice(tos, &it, &end) && it )
+    else if( ur_stringSlice(ut, tos, &it, &end) && it )
     {
         if( ur_encoding(tos) == UR_ENC_UTF16 )
@@ -908 +912 @@
 {
     UString* str;
-    str = ur_binPtr( ur_thread->callTempBinN );
+    str = ur_binPtr( BIN_THREAD_TMP );
     str->used = 0;
     ur_toStr( tos, str, 0 );
@@ -917 +921 @@
     tos = UR_TOS;
     ur_initType( tos, UT_STRING );
-    ur_setSeries( tos, ur_thread->callTempBinN, 0 );
-    rc_cout( ur_thread, tos );
+    ur_setSeries( tos, BIN_THREAD_TMP, 0 );
+    rc_cout( ut, tos );
     UR_S_DROP;
 }
@@ -927 +931 @@
 UR_CALL( rc_func_loop )
 {
-    uc_func( ur_thread, tos );
+    uc_func( ut, tos );
     UR_TOS->func.flags |= UR_FLAG_FUNC_LOOP;
 }
@@ -940 +944 @@
 
 
-extern UIndex _funcSignature( const UCell* scell, int* pArgc, int* pVarc );
+extern UIndex _funcSignature( UThread*, const UCell*, int* pArgc, int* pVarc );
 
 // (block -- block)
@@ -961 +965 @@
         {
             assert( ur_is(it, UT_WORD) );
-            val = ur_wordCell( ur_thread, it );
+            val = ur_wordCell( ut, it );
             ++it;
             assert( ur_is(it, UT_BLOCK) );
@@ -968 +972 @@
             {
                 /* LIMIT: All Rune call sigN blocks must be in first 65k. */
-                val->call.sigN  = _funcSignature( it, &argc, &varc );
+                val->call.sigN  = _funcSignature( ut, it, &argc, &varc );
                 ur_argc(val)    = argc;
                 ur_varc(val)    = 0; //varc
@@ -999 +1003 @@
 
 
-void rune_install( UrlanEnv* env )
-{
-    ur_makeCalls( env, rune_calls, sizeof(rune_calls) / sizeof(UCallDef) );
+void rune_install( UThread* ut )
+{
+    ur_makeCalls( ut, rune_calls, sizeof(rune_calls) / sizeof(UCallDef) );
 
     // Bootstrap declare-natives
     {
-    UCell* val = ur_resolveArgPath( UT_WORD,
-                                    ur_intern(env, "declare-natives", 15),
-                                    UT_NONE );
+    UCell* val = ur_resolvePath( ut, ur_intern("declare-natives", 15),
+                                 UT_NONE );
     if( val )
     {