Add sp_p6ogetvt_o

Relatively large and complex op, now compiles correctly owing to the earlier fix for maintaining the heap order.
MoarVM · May 11, 2017 · d7fee2a · d7fee2a
1 parent 79062b0
commit d7fee2a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 37 deletions.
diff --git a/src/jit/core.expr b/src/jit/core.expr
@@ -147,3 +147,13 @@
 (template: sp_p6obind_s
     (dov 2 (^write_barrier $0 $2)
            (store (add (^p6obody $0) $1) $2 ptr_sz)))
+
+(template: sp_p6ogetvt_o
+   (let: (($addr (add (^p6obody $1) $2))
+          ($val (load $addr ptr_sz)))
+       (if (nz $val)
+            $val
+            (let: (($type (load (^spesh_slot $3) ptr_sz)))
+                 (^write_barrier $1 $type)
+                 (store $addr $type ptr_sz)
+                 (copy $type)))))
diff --git a/src/jit/unsafe.expr b/src/jit/unsafe.expr
@@ -1,41 +1,7 @@
 # Difficult stuff, that hasn't been tested sufficiently adequately to support
 
-(macro: ^objflag (,cv) (const (&QUOTE ,cv) (&SIZEOF_MEMBER MVMObject header.flags)))
-
-(macro: ^func (,a) (const (&CONST_PTR ,a) ptr_sz))
-
-# hit write barrier for object - this one is rather large
-# NB - it is probably better to use direct variables, rather than trees,
-# as arguments to the write-barrier macro. Usually the compiler can
-# eliminate duplications, but call is a notable exception
-
-(macro: ^write_barrier (,obj ,ref)
-   (when (all 3 (nz (and (^getf ,obj MVMCollectable flags) (^objflag MVM_CF_SECOND_GEN)))
-                (nz ,ref)
-                (zr (and (^getf ,ref MVMCollectable flags) (^objflag MVM_CF_SECOND_GEN))))
-         (call (^func &MVM_gc_write_barrier_hit)
-               (arglist 2 (carg (tc) ptr)
-                          (carg ,obj ptr))
-                 void)))
-
-(template: sp_p6ogetvt_o
-           (let: (($addr (add (^p6obody $1) $2))
-                 ($val (load $addr ptr_sz))
-                 ($type (load (^spesh_slot $3) ptr_sz)))
-                 (if (nz $val)
-                      $val
-                      (do 3 (^write_barrier $1 $type)
-                            (store $addr $type ptr_sz)
-                             $type))))
-
-(template: sp_p6obind_i (store (add (^p6obody $0) $1) $2 int_sz))
-(template: sp_p6obind_n (store (add (^p6obody $0) $1) $2 int_sz))
-(template: sp_p6obind_o (let: (($addr (add (^p6obody $0) $1)))
-                             (do 2 (^write_barrier $0 $2)
-                                   (store $addr $2 ptr_sz))))
-(template: sp_p6obind_s (let: (($addr (add (^p6obody $0) $1)))
-                             (do 2 (^write_barrier $0 $2)
-                                   (store $addr $2 ptr_sz))))
+
+
 
 
 

diff --git a/tools/expr-template-compiler.pl b/tools/expr-template-compiler.pl
@@ -65,7 +65,7 @@ sub validate_template {
         for my $def (@$defs) {
             validate_template($def->[1]);
         }
-        validate_template($_) for @expr;
+        validate_template($_) for grep ref($_) eq 'ARRAY', @expr;
         return;
     }