Series of minor fixes

Author: cliffclick

chapter21/src/test/java/com/seaofnodes/simple/Simple.java

@@ -152,7 +152,7 @@ static void print_compilation_times(CodeGen code) {
         System.out.println(String.format("TOTAL COMPILATION TIME:     %.3f sec", total));
     }
 
-    static String getInput() {
+    static String getInput() throws IOException {
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
             return reader.lines().collect(Collectors.joining("\n"));
         }

chapter22/README.md

@@ -29,7 +29,7 @@ Let's break it down.
   pool*, and from there in an ELF file's RODATA section.
 
 
-    You can also read [this chapter](https://github.com/SeaOfNodes/Simple/tree/linear-chapter22) in a linear Git revision history on the [linear](https://github.com/SeaOfNodes/Simple/tree/linear) branch and [compare](https://github.com/SeaOfNodes/Simple/compare/linear-chapter21...linear-chapter22) it to the previous chapter.
+You can also read [this chapter](https://github.com/SeaOfNodes/Simple/tree/linear-chapter22) in a linear Git revision history on the [linear](https://github.com/SeaOfNodes/Simple/tree/linear) branch and [compare](https://github.com/SeaOfNodes/Simple/compare/linear-chapter21...linear-chapter22) it to the previous chapter.
 
 
 ## Nested Types and Static Fields

chapter22/src/test/java/com/seaofnodes/simple/Simple.java

@@ -143,9 +143,10 @@ static void print_compilation_times(CodeGen code) {
         System.out.printf( "TOTAL COMPILATION TIME:   %.3f sec%n", total);
     }
 
-    static String getInput() {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-        return reader.lines().collect(Collectors.joining("\n"));
+    static String getInput() throws IOException {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
+            return reader.lines().collect(Collectors.joining("\n"));
+        }
     }
 
     public static void main(String[] args) throws Exception {

chapter22/src/test/java/com/seaofnodes/simple/progs/jig.smp

@@ -1,6 +1,16 @@
 // -*- mode: java;  -*-
-// Should fold away sign extend
-struct Person { i8 age;};
-Person !p = new Person;
-p.age = (arg<<48)>>48;
-return 0;
+val fib = {int n ->
+    int temp=0;
+    int f1=1;
+    int f2=1;
+    int i=n;
+    while( i>1 ){
+        temp = f1+f2;
+        f1=f2;
+        f2=temp;
+        i=i-1;
+    }
+    return f2;
+};
+
+fib(10);

chapter23/src/main/java/com/seaofnodes/simple/Parser.java

@@ -245,8 +245,13 @@ private ReturnNode parseFunctionBody( TypeFunPtr sig, Lexer loc, String... ids)
             last = parseStatement();
 
         // Last expression is the return except for the top-level main
-        if( ctrl()._type==Type.CONTROL && fun.sig() != _code._main )
-            fun.addReturn(ctrl(), _scope.mem().merge(), last);
+        if( ctrl()._type==Type.CONTROL )
+            if( fun.sig() != _code._main )
+                fun.addReturn(ctrl(), _scope.mem().merge(), last);
+            else {
+                fun.setDef(1,XCTRL); // Kill default main
+                _code.addAll(fun._outputs);
+            }
 
         // Pop off the inProgress node on the multi-exit Region merge
         assert r.inProgress();

chapter23/src/main/java/com/seaofnodes/simple/codegen/GlobalCodeMotion.java

@@ -36,7 +36,7 @@ private static void _rpo_cfg(CFGNode def, Node use, BitSet visit, Ary<CFGNode> r
             return;             // Been there, done that
         if( def instanceof ReturnNode && use instanceof CallEndNode )
             return;
-        assert !( def instanceof CallNode && use instanceof FunNode );
+        assert !( def instanceof CallNode && use instanceof FunNode ); // All calls unwired now
         visit.set(cfg._nid);
         for( Node useuse : cfg._outputs )
             _rpo_cfg(cfg,useuse,visit,rpo);

chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java

@@ -13,7 +13,7 @@
 
 public class Chapter22Test {
 
-    @Test @Ignore
+    @Test
     public void testJig() throws IOException {
         String src = Files.readString(Path.of("src/test/java/com/seaofnodes/simple/progs/jig.smp"));
         //String src = Files.readString(Path.of("docs/examples/BubbleSort.smp"));

chapter23/src/test/java/com/seaofnodes/simple/Simple.java

@@ -143,9 +143,10 @@ static void print_compilation_times(CodeGen code) {
         System.out.printf( "TOTAL COMPILATION TIME:   %.3f sec%n", total);
     }
 
-    static String getInput() {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-        return reader.lines().collect(Collectors.joining("\n"));
+    static String getInput() throws IOException {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
+            return reader.lines().collect(Collectors.joining("\n"));
+        }
     }
 
     public static void main(String[] args) throws Exception {

chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp

@@ -1,19 +1,16 @@
 // -*- mode: java;  -*-
-//2298769344378917493
-//========= Reduced =========
-struct s0 {
-    bool v1;
-    i16 v2;
-    int v3;
-    i8 v4;
-    byte v5;
-};
-while(new s0.v3)
-    while(new s0.v5<<new s0.v4) {}
-if(0) {
-    if(0) {
-        flt !P5ZUD4=new s0.v2;
+val fib = {int n ->
+    int temp=0;
+    int f1=1;
+    int f2=1;
+    int i=n;
+    while( i>1 ){
+        temp = f1+f2;
+        f1=f2;
+        f2=temp;
+        i=i-1;
     }
-    while(0) {}
-}
-return new s0.v1;
+    return f2;
+};
+
+fib(10);

chapter24/README.md

@@ -7,7 +7,7 @@ We also present an Interprocedural Sparse Conditional Constant Propagation
 algorithm.
 
 
-You can also read [this chapter](https://github.com/SeaOfNodes/Simple/tree/linear-chapter23) in a linear Git revision history on the [linear](https://github.com/SeaOfNodes/Simple/tree/linear) branch and [compare](https://github.com/SeaOfNodes/Simple/compare/linear-chapter22...linear-chapter23) it to the previous chapter.
+You can also read [this chapter](https://github.com/SeaOfNodes/Simple/tree/linear-chapter24) in a linear Git revision history on the [linear](https://github.com/SeaOfNodes/Simple/tree/linear) branch and [compare](https://github.com/SeaOfNodes/Simple/compare/linear-chapter23...linear-chapter24) it to the previous chapter.
 
 
 ## Chaining Relational Tests