Changeset 22923 for v6

Timestamp:

11/08/08 10:26:25 (2 months ago)

Author:

pmurias

Message:

[smop] mold is used to call DESTROYALL, we still don't have a free this register RI

Location:

v6/smop

Files:

• include/smop_s1p.h (modified) (2 diffs)
• sm0p.pl (modified) (3 diffs)
• src/lowlevel.sm0p (modified) (3 diffs)

v6/smop/include/smop_s1p.h

@@ -65 +65 @@
 #define ___CONST_IDENTIFIER_ONLY___ \
     if (SMOP_RI(identifier) != SMOP_RI(SMOP__ID__new)) {\
-        fprintf("%s\n",SMOP_RI(SMOP__ID__new)->id);\
+        fprintf(stderr,"%s\n",SMOP_RI(SMOP__ID__new)->id);\
     }\
     assert(SMOP_RI(identifier) == SMOP_RI(SMOP__ID__new))
@@ -73 +73 @@
     assert(SMOP_RI(invocant) == (SMOP__ResponderInterface*)self)
 #define ___VALUE_FETCH___\
-    SMOP_REFERENCE(interpreter,invocant);\
+    SMOP_REFERENCE(interpreter,(SMOP__Object*) invocant);\
     ret = invocant;
 #define ___VALUE_STORE___ \

v6/smop/sm0p.pl

@@ -44 +44 @@
         $out_count++;
         quasi(
-            'sm0p' => \&preprocess_sm0p,
             'm0ld' => \&preprocess_m0ld,
-            'v6-sm0p' => \&preprocess_p6_sm0p,
             'v6-m0ld' => \&preprocess_p6_m0ld,
         ) and next;
@@ -96 +94 @@
     return $retbuf;
 }
-sub preprocess_p6_sm0p {
-    my $code = shift;
-    my ($writer, $reader, $error) = map { gensym } 1..3;
-    my $sm0p = preprocess('','perl',"$base/../../misc/elfish/elfX/elfX",'-C','sm0p','-s','-e',$code);
-    return preprocess_sm0p(
-        $sm0p
-        . "\$SMOP__SLIME__CurrentFrame.\$SMOP__ID__forget();\n"
-        . "\$interpreter.goto(|\$continuation);\n"
-        );
-}
 sub preprocess_p6_m0ld {
     my $code = shift;
@@ -112 +100 @@
     return preprocess_m0ld($m0ld);
 }
-sub preprocess_sm0p {
-    my $code = shift;
-    #warn "got sm0p code <$code>\n";
-    return preprocess($code,'perl',"-I$base/../../src/perl6",
-        '-I'.$base.'/sm0p',
-        $base.'/sm0p/sm0p_with_actions');
-}
 sub preprocess_m0ld {
     my $code = shift;

v6/smop/src/lowlevel.sm0p

@@ -7 +7 @@
 
 #include <smop.h>
+#include <smop_mold.h>
 #include <smop_lowlevel.h>
 #include <stdlib.h>
@@ -170 +171 @@
 
       smop_lowlevel_free(value);
+    } else if ((SMOP__Object*)SMOP_RI(value) == SMOP__Mold ||
+               (SMOP__Object*)SMOP_RI(value) == SMOP__Mold__Frame) {
+        SMOP_DISPATCH(interpreter, SMOP_RI(value), SMOP__ID__DESTROYALL, SMOP__NATIVE__capture_create(interpreter,value,NULL,NULL));
+#ifdef SMOP_LOWLEVEL_MEM_TRACE
+      smop_mem_trace_del(value);
+#endif
+      smop_lowlevel_free(value);
     } else if ((SMOP__Object*)SMOP_RI(value) == SMOP__INTPTR__InterpreterInstance ||
                (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture ||
@@ -183 +191 @@
 
     } else {
-       SMOP_DISPATCH(interpreter, SMOP_RI(value), SMOP__ID__DESTROYALL, SMOP__NATIVE__capture_create(interpreter,value,NULL,NULL));
-#ifdef SMOP_LOWLEVEL_MEM_TRACE
-      smop_mem_trace_del(value);
-#endif
-
-      smop_lowlevel_free(value);
+      SMOP__Object* current = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter), SMOP__ID__continuation,
+                                             SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,interpreter),NULL,NULL));
+      SMOP__Object* free_obj = q:m0ld {
+        my $interpreter;
+        my $current;
+        my $value;
+        my $void = $value."DESTROYALL"($value);
+        $void = $interpreter."goto"($current);
+      };
+      SMOP__Object* frame = SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,free_obj));
+      mold_reg_set(interpreter,frame,0,SMOP_REFERENCE(interpreter,interpreter));
+      mold_reg_set(interpreter,frame,1,current);
+      mold_reg_set(interpreter,frame,2,value);
+      SMOP_DISPATCH(interpreter, SMOP_RI(interpreter), SMOP__ID__goto,  frame);
+#ifdef SMOP_LOWLEVEL_MEM_TRACE
+      smop_mem_trace_del(value);
+#endif
+      //smop_lowlevel_free(value);
+      SMOP_RELEASE(interpreter,free_obj);
     }
     return NULL;