Chapter 22: A Hello, World!linear-chapter22

Co-authored-by: godalming123 <68993177+godalming123@users.noreply.github.com>
Co-authored-by: Tamás Hadházy <85063808+Hels15@users.noreply.github.com>

1 files changed, 15 insertions, 7 deletions

diff --git a/src/test/java/com/seaofnodes/simple/Eval2.java b/src/test/java/com/seaofnodes/simple/Eval2.java
index ecea97dd..86f0e9db 100644
--- a/src/test/java/com/seaofnodes/simple/Eval2.java
+++ b/src/test/java/com/seaofnodes/simple/Eval2.java
@@ -114,11 +114,10 @@ public abstract class Eval2 {
 
     public static String eval( CodeGen code, long arg ) { return eval(code,arg,1000); }
     public static String eval( CodeGen code, long arg, int timeout ) {
+        if( code._start.uctrl()==null ) return ""; // The empty program
         SB trace = null; // new SB(); // TRACE, set to null for off, new SB() for on
         // Force local scheduling phase
-        if( code._phase.ordinal() < CodeGen.Phase.TypeCheck .ordinal() )  code.typeCheck();
-        if( code._phase.ordinal() < CodeGen.Phase.Schedule  .ordinal() )  code.GCM();
-        if( code._phase.ordinal() < CodeGen.Phase.LocalSched.ordinal() )  code.localSched();
+        code.driver(CodeGen.Phase.LocalSched);
         // Set global, so don't have to pass everywhere
         CODE = code;
 
@@ -290,9 +289,9 @@ public abstract class Eval2 {
     // Fetch without unboxing, searching up-Frame
     static Object val( Node n ) { return F.get(n); }
     // Fetch and unbox as primitive long
-    static long   x( Node n ) { Object d = F.get(n); return d==null ? 0 : (Long)  F.get(n);  }
+    static long   x( Node n ) { Object d = F.get(n); return d==null ? 0 : (Long)d;  }
     // Fetch and unbox as primitive double
-    static double d( Node n ) { Object d = F.get(n); return d==null ? 0 : (Double)F.get(n);  }
+    static double d( Node n ) { Object d = F.get(n); return d==null ? 0 : (Double)d;  }
     // Fetch and unbox a function constant
     static TypeFunPtr tfp(Node n) { return (TypeFunPtr)F.get(n); }
     // Fetch and unbox a closure
@@ -348,10 +347,19 @@ public abstract class Eval2 {
     }
 
     private static Object load( LoadNode ld ) {
-        TypeMemPtr tmp = (TypeMemPtr)ld.ptr()._type;
-        Object[] fs = (Object[])val(ld.ptr());
+        Object f = val(ld.ptr());
+        // Check for dense constant array
+        if( f instanceof TypeMemPtr tmp ) {
+            assert tmp._obj._con != TypeConAry.BOT;
+            if( ld._name.equals("#") )
+                return (long)tmp._obj._con.len();
+            int idx = offToIdx(x(ld.off()),tmp._obj);
+            return tmp._obj._con.at(idx);
+        }
+        Object[] fs = (Object[])f;
         if( ld._name.equals("#") )
             return (long)fs.length;
+        TypeMemPtr tmp = (TypeMemPtr)ld.ptr()._type;
         int idx = tmp._obj.isAry()
             ? offToIdx(x(ld.off()),tmp._obj)
             : tmp._obj.find(ld._name);