Changeset 20d93fb737c36e2fa36fb1e9ac36734be14a77c6

Timestamp:

06/20/10 04:33:21 (2 years ago)

Author:

redbrain <redbrain@…>

Parents:

1eb94519d291051d1a07e4c29ecb03fc82fddc59

Children:

aaca19fb68c3cfe89e2acb105d2c3e8f5e028275

git-committer:

redbrain <redbrain@crules.org> / 2010-06-20T04:33:21Z+0100

Message:

fixed return address garbage collection and a signed vs unsigned ref count issue

Files:

• include/crules/symbols.h (modified) (1 diff)
• src/gg_garbage.c (modified) (3 diffs)
• src/rr_context.c (modified) (2 diffs)
• src/rr_runtime.c (modified) (2 diffs)

include/crules/symbols.h

@@ -29 +29 @@
   char *identifier; crl_opcode_t exp;
   crl_opcode_t type, op_a_t, op_b_t;
-  unsigned int n_ref;
+  signed int n_ref;
   union {
     // literal primitive semantic types!

src/gg_garbage.c

@@ -179 +179 @@
 
                   // If no references remain
-                  if( o->n_ref == 0 )
+                  if( o->n_ref <= 0 )
                     {
                       crl_garbage_mark_obj( &o );
@@ -436 +436 @@
           if( it )
             {
-              if( it->n_ref == 0 )
+              if( it->n_ref <= 0 )
                 {
                   crl_debug("marking object <%p>!\n", (void*)it );
@@ -457 +457 @@
                             (void*)it, it->n_ref );
                   crl_dd_stack_push( head->symbol_stack, it );
+                  s_arr[idx] = NULL;
                 }
               else

src/rr_context.c

@@ -85 +85 @@
   if( deref )
     {
+      crl_symbol_obj *xret = ctx->return_address;
       void ** arr = ctx->symbol_stack->array;
       unsigned int idx = 0;
@@ -93 +94 @@
           if( o )
             {
-              o->n_ref--;
-              crl_debug("de-referencing object <%p> to count <%i>!\n",
-                        (void*)o, o->n_ref );
+              if( o != xret )
+                {
+                  o->n_ref--;
+                  crl_debug("de-referencing object <%p> to count <%i>!\n",
+                            (void*)o, o->n_ref );
+                }
             }
         }

src/rr_runtime.c

@@ -1269 +1269 @@
             {
               c->return_address= retval;
+              Crl_Ctx_Head_Branch( ctx )->return_address = retval;
               f= true; break;
             }
@@ -1380 +1381 @@
         break;
     }
-  crl_garbage_invoke_sweep( context );
 
   return rex;