Compiles helloWorld from CLI

Author: cliffclick

chapter25/src/main/java/com/seaofnodes/simple/codegen/Encoding.java

@@ -390,7 +390,10 @@ else if( bb instanceof FunNode ) {
                 opLen(bb, (byte) (_bits.size() - opStart(bb)));
             }
             for( Node n : bb._outputs ) {
-                if( n instanceof MachNode mach && !(n instanceof FunNode) ) {
+                if( n instanceof MachNode mach && !(n instanceof FunNode) &&
+                    // FunPtrs are encoding in the block of their control, not
+                    // the block of the ReturnNode input - which is also a CFG.
+                    !(n instanceof FunPtrNode && bb instanceof ReturnNode) ) {
                     opStart(n, _bits.size());
                     mach.encoding( this );
                     opLen(n, (byte) (_bits.size() - opStart(n)));
@@ -490,7 +493,7 @@ void patchLocalRelocations() {
             // and, it can only be used to test against zero or equals to
             // another function pointer... i.e., there Is No Code Here.
             int target = dst == null ? start : opStart(dst);
-            ((RIPRelSize)src).patch(this, start, opLen(src), target - start);
+             ((RIPRelSize)src).patch(this, start, opLen(src), target - start);
         }
     }
 

chapter25/src/main/java/com/seaofnodes/simple/codegen/Serialize.java

@@ -422,7 +422,7 @@ public static Ary<Node> nodeOrder( CodeGen code ) {
         // All the CompUnits
         for( CompUnit cu : code._compunits.values() ) {
             // Whole CompUnits have no users, went dead
-            if( !cu._start.isDead() ) {
+            if( cu._start != null && !cu._start.isDead() ) {
                 nodes.add(cu._start);
                 // Memory proj
                 nodes.add(cu._start.proj(1));

chapter25/src/test/java/com/seaofnodes/simple/Chapter25Test.java

@@ -224,14 +224,18 @@ public void testHelloWorldNoInlineImportsSys() throws Exception {
         CodeGen code = new CodeGen(null,"build/objs",new Ary<>(new String[]{RELEASE_SYS_BLDDIR}),
                                    base,prog,123L,TypeInteger.BOT);
         code.driver(TestC.CPU_PORT,TestC.CALL_CONVENTION,false,true);
+        String str = code.toString();
+        String asm = code.asm();
 
         String obj = "build/objs/"+base+".o";
         String exe = "build/objs/"+base+(TestC.OS.startsWith("Windows") ? ".exe" : "");
         String syms = run(new String[]{"nm",obj});
         assertTrue(syms, syms.contains(" U sys.io.p_noInline"));
 
-        run(new String[]{"gcc",obj,RELEASE_SYS_BLDDIR+"/sys.o","-lm","-g","-o",exe});
-        assertEquals(expected, run(new String[]{exe}));
+        String out = run(new String[]{"gcc",obj,RELEASE_SYS_BLDDIR+"/sys.o","-lm","-g","-o",exe});
+        assertEquals("",out);
+        String rez = run(new String[]{exe});
+        assertEquals(expected,rez);
     }
 
     private static String run(String[] cmd) throws Exception {