Changeset 22192 for v6

Timestamp:

09/08/08 22:15:26 (3 months ago)

Author:

ruoso

Message:

[smop] more plumbing... there was circularity in some code... mold frames now dont add a refcount when it stores itself on its registers..

Location:

v6/smop/src

Files:

• smop_mold.c (modified) (5 diffs)
• smop_s1p_code.sm0p (modified) (1 diff)

v6/smop/src/smop_mold.c

@@ -11 +11 @@
 static SMOP__Object* SMOP__ID__set_reg;
 static SMOP__Object* SMOP__ID__set_back;
+
+static SMOP__Object* mold_reference(SMOP__Object* interpreter, SMOP__ResponderInterface* responder, SMOP__Object* obj) {
+  //printf("+ %p\n", obj);
+  if ((SMOP__Object*)responder != obj) {
+    smop_lowlevel_refcnt_inc(interpreter, responder, obj);
+  }
+  return obj;
+}
+
+static SMOP__Object* mold_release(SMOP__Object* interpreter, SMOP__ResponderInterface* responder, SMOP__Object* obj) {
+  //printf("- %p\n", obj);
+  if ((SMOP__Object*)responder != obj) {
+    smop_lowlevel_refcnt_dec(interpreter, responder, obj);
+  }
+  return obj;
+}
+
 
 typedef struct smop_mold {
@@ -87 +104 @@
     }
 
+
+    //printf("Mold Frame! %p\n",ret);
     return (SMOP__Object*) ret;
 }
@@ -197 +216 @@
       printf("got null as a result of a call (reg = %d, pos = %d) via setr\n",frame->target, frame->position);
       abort();
+    }
+
+    if (value == invocant) {
+      SMOP_RELEASE(interpreter, value);
     }
 
@@ -250 +273 @@
                  frame->target, frame->position, identifier_size, s);
           abort();
+        } else if (ret == invocant) {
+          // this circularity is saved by releasing once...
+          SMOP_RELEASE(interpreter, ret);
         }
 
@@ -332 +358 @@
   SMOP__Mold__Frame = calloc(1,sizeof(SMOP__ResponderInterface));
   ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->MESSAGE = smop_mold_frame_message;
-  ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->REFERENCE = smop_lowlevel_generic_reference;
-  ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->RELEASE = smop_lowlevel_generic_release;
+  ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->REFERENCE = mold_reference;
+  ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->RELEASE = mold_release;
   ((SMOP__ResponderInterface*)SMOP__Mold__Frame)->id = "mold frame";
 }

v6/smop/src/smop_s1p_code.sm0p

@@ -82 +82 @@
 
     smop_lowlevel_rdlock(invocant);
-    SMOP__Object* mold = code->mold;
+    SMOP__Object* mold = code->mold;    
+    code->mold = NULL;
+    SMOP__Object* signature = code->signature;
+    code->signature = NULL;
+    SMOP__Object* outer = code->outer;
+    code->outer = NULL;
     smop_lowlevel_unlock(invocant);
 
-    //SMOP_RELEASE(interpreter,mold);
+    if (mold) SMOP_RELEASE(interpreter,mold);
+    if (signature) SMOP_RELEASE(interpreter,signature);
+    if (outer) SMOP_RELEASE(interpreter,outer);
 
   } else {