NewXXX honors declared CC

2 files changed, 2 insertions, 9 deletions

diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
index d67bd43d..19be4569 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java
@@ -66,7 +66,7 @@ public class Chapter21Test {
     @Test
     public void testAntiDeps1() throws IOException {
         String src = Files.readString(Path.of("src/test/java/com/seaofnodes/simple/progs/antiDep1.smp"));
-        testCPU(src,"x86_64_v2", "SystemV", 3,"return mov(mov(S));");
+        testCPU(src,"x86_64_v2", "SystemV", 7,"return mov(mov(S));");
         testCPU(src,"riscv"    , "SystemV",10,"return mov(mov(S));");
         testCPU(src,"arm"      , "SystemV",10,"return mov(mov(S));");
     }
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/TestC.java b/chapter21/src/test/java/com/seaofnodes/simple/TestC.java
index c6e0b196..4294606c 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/TestC.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/TestC.java
@@ -35,14 +35,7 @@ public abstract class TestC {
 
         // Compile and export Simple
         String src = Files.readString(Path.of(sfile));
-
-        // On X86, compile both win64 and sys5 variants
-        if( CPU_PORT.equals("x86_64_v2") ) {
-            _run(src,"Win64"  ,"ms_abi"  ,cfile,efile,"W",expected);
-            _run(src,"SystemV","sysv_abi",cfile,efile,"S",expected);
-        } else {
-            _run(src,CALL_CONVENTION,"",cfile,efile,"S",expected);
-        }
+        _run(src,CALL_CONVENTION,"",cfile,efile,"S",expected);
     }
 
     static void _run( String src, String simple_conv, String c_conv, String cfile, String efile, String xtn, String expected ) throws IOException {