Progress on not-encoding tests

3 files changed, 8 insertions, 9 deletions

diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter19Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter19Test.java
index bb7e8716..7bef13f5 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter19Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter19Test.java
@@ -139,25 +139,25 @@ hashCode(s)+hashCode(s);""");
     @Test
     public void testBasic12() {
         CodeGen code = new CodeGen("return arg + 2.0;").parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return (addf,(i2f8,arg),2.0f);", code._stop.toString());
+        assertEquals("return (addf,(cvtf,arg),2.0f);", code._stop.toString());
     }
 
     @Test
     public void testBasic13() {
         CodeGen code = new CodeGen("return arg - 2.0;").parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return (subf,(i2f8,arg),2.0f);", code._stop.toString());
+        assertEquals("return (subf,(cvtf,arg),2.0f);", code._stop.toString());
     }
 
     @Test
     public void testBasic14() {
         CodeGen code = new CodeGen("return arg * 2.0;").parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return (mulf,(i2f8,arg),2.0f);", code._stop.toString());
+        assertEquals("return (mulf,(cvtf,arg),2.0f);", code._stop.toString());
     }
 
     @Test
     public void testBasic15() {
         CodeGen code = new CodeGen("return arg / 2.0;").parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return (mulf,(i2f8,arg),0.5f);", code._stop.toString());
+        assertEquals("return (mulf,(cvtf,arg),0.5f);", code._stop.toString());
     }
 
     @Test
@@ -188,7 +188,7 @@ return arg1 * arg;
                 return a + 2.0;
                 """
         ).parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return (addf,(i2f8,arg),2.0f);", code._stop.toString());
+        assertEquals("return (addf,(cvtf,arg),2.0f);", code._stop.toString());
     }
 
     @Test
@@ -340,7 +340,7 @@ flt farg = arg;
 return sqrt(farg);
 """);
         code.parse().opto().typeCheck().instSelect(PORTS,"x86_64_v2", "SystemV").GCM().localSched();
-        assertEquals("return Phi(Loop,(i2f8,arg),(mulf,(addf,(divf,i2f8,Phi_guess),Phi_guess),0.5f));", code.print());
+        assertEquals("return Phi(Loop,(cvtf,arg),(mulf,(addf,(divf,cvtf,Phi_guess),Phi_guess),0.5f));", code.print());
     };
 
 
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java
index 70d8dfe4..bf2daf8f 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java
@@ -21,7 +21,6 @@ public class Chapter20Test {
     static void testCPU( String src, String cpu, String os, int spills, String stop ) {
         CodeGen code = new CodeGen(src);
         code.parse().opto().typeCheck().instSelect(PORTS,cpu,os).GCM().localSched().regAlloc();
-        code.encode();
         int delta = spills>>3;
         if( delta==0 ) delta = 1;
         assertEquals("Expect spills:",spills,code._regAlloc._spillScaled,delta);
@@ -43,7 +42,7 @@ public class Chapter20Test {
         String src = "return arg | 2;";
         testCPU(src,"x86_64_v2", "SystemV",1,"return (ori,mov(arg));");
         testCPU(src,"riscv"    , "SystemV",0,"return ( arg | #2 );");
-        testCPU(src,"arm"      , "SystemV",0,"return (ori,arg);");
+        testCPU(src,"arm"      , "SystemV",0,"return (orr,arg,2);");
     }
 
     @Test
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
index 1f605cc1..b0596385 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
@@ -39,7 +39,7 @@ public class Chapter21Test {
         String src = "return arg | 2;";
         testCPU(src,"x86_64_v2", "SystemV",1,"return (ori,mov(arg));");
         testCPU(src,"riscv"    , "SystemV",0,"return ( arg | #2 );");
-        testCPU(src,"arm"      , "SystemV",0,"return (ori,arg);");
+        testCPU(src,"arm"      , "SystemV",0,"return (orr,arg,2);");
     }
 
 }