From d90baa2a8c0a8ce9a84befec756b39ec49360b8e Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Wed, 26 Mar 2025 12:16:15 -0700
Subject: Minor improves to portability

---
 chapter21/src/main/java/com/seaofnodes/simple/codegen/BuildLRG.java   | 2 +-
 chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java       | 2 +-
 .../main/java/com/seaofnodes/simple/node/cpus/riscv/BranchRISC.java   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'chapter21')

diff --git a/chapter21/src/main/java/com/seaofnodes/simple/codegen/BuildLRG.java b/chapter21/src/main/java/com/seaofnodes/simple/codegen/BuildLRG.java
index 88b49863..ca5157c7 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/codegen/BuildLRG.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/codegen/BuildLRG.java
@@ -27,7 +27,7 @@ abstract public class BuildLRG {
                                 break;
                     // If none, make one.
                     if( lrg==null ) lrg = alloc.newLRG(n);
-                    if( phi instanceof MachNode mach ) defLRG(alloc,n);
+                    if( phi instanceof MachNode ) defLRG(alloc,n);
                     // Pass 2: everybody uses the same LRG
                     lrg=alloc.union(lrg,phi);
                     for( int i=phi instanceof ParmNode ? 2 : 1; i<n.nIns(); i++ )
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java
index 6c51b613..9199baa5 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java
@@ -13,7 +13,7 @@ public class PhiNode extends Node {
     final Type _declaredType;
 
     public PhiNode(String label, Type declaredType, Node... inputs) { super(inputs); _label = label;  assert declaredType!=null; _declaredType = declaredType; }
-    public PhiNode(PhiNode phi, String label, Type declaredType) { super(phi); _label = label; _declaredType = declaredType; }
+    public PhiNode(PhiNode phi, String label, Type declaredType) { super(phi); _label = label; _type = _declaredType = declaredType; }
     public PhiNode(PhiNode phi) { super(phi); _label = phi._label; _declaredType = phi._declaredType;  }
 
     public PhiNode(RegionNode r, Node sample) {
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/riscv/BranchRISC.java b/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/riscv/BranchRISC.java
index 6325c90d..c9e7a5b5 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/riscv/BranchRISC.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/riscv/BranchRISC.java
@@ -62,7 +62,9 @@ public class BranchRISC extends IfNode implements MachNode, RIPRelSize {
     }
 
     @Override public void asm(CodeGen code, SB sb) {
-        sb.p(code.reg(in(1))).p(" ").p(_bop).p(" ").p(in(2)==null ? "#0" : code.reg(in(2))).p(" ");
+        String src1 = in(1)==null ? "#0" : code.reg(in(1));
+        String src2 = in(2)==null ? "#0" : code.reg(in(2));
+        sb.p(src1).p(" ").p(_bop).p(" ").p(src2).p(" ");
         CFGNode prj = cproj(0);
         while( prj.nOuts() == 1 )
             prj = prj.uctrl();       // Skip empty blocks
-- 
cgit v1.2.3