diff options
Diffstat (limited to 'chapter22/src/test/java/com')
4 files changed, 23 insertions, 15 deletions
diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 4c4ac4e4..f442ae1a 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -66,7 +66,7 @@ val sqrt = { int x -> int cast_int = arg+2; return sqrt(arg) + sqrt(cast_int); """; - testCPU(src,"x86_64_v2", "Win64" ,23,null); + testCPU(src,"x86_64_v2", "Win64" ,55,null); testCPU(src,"riscv" , "SystemV",19,null); testCPU(src,"arm" , "SystemV",19,null); } diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java index 304fb1cf..4823dff8 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java @@ -116,12 +116,14 @@ return cc.cz; int trap = R5.step(100); assertEquals(0,trap); assertEquals(0,R5.regs[riscv.A0]); + assertEquals("Hello, World!",R5._stdout.toString()); // Evaluate on ARM emulator EvalArm64 arm = TestArm64.build("helloWorld", 0, 2, false); trap = arm.step(100); assertEquals(0,trap); assertEquals(0,arm.regs[0]); + assertEquals("Hello, World!",arm._stdout.toString()); } @Test @@ -131,7 +133,7 @@ int N=4; i32[] !is = new i32[N]; for( int i=0; i<N; i++ ) is[i] = i*i; -val sum = { i32[~] is -> +val sum = { i32[~] is -> // final array int sum=0; for( int i=0; i<is#; i++ ) sum += is[i]; diff --git a/chapter22/src/test/java/com/seaofnodes/simple/EvalArm64.java b/chapter22/src/test/java/com/seaofnodes/simple/EvalArm64.java index 08cd7c8d..981799bb 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/EvalArm64.java +++ b/chapter22/src/test/java/com/seaofnodes/simple/EvalArm64.java @@ -2,8 +2,7 @@ package com.seaofnodes.simple; import com.seaofnodes.simple.codegen.Encoding; import com.seaofnodes.simple.node.cpus.arm.arm; - -import java.io.PrintStream; +import java.io.ByteArrayOutputStream; public class EvalArm64 { // Memory image, always 0-based @@ -15,8 +14,13 @@ public class EvalArm64 { final double[] fregs; int _pc; + // Start of free memory for allocation int _heap; + + // Standard out and err streams + ByteArrayOutputStream _stdout, _stderr; + // Cycle counters int _cycle; @@ -340,12 +344,12 @@ public class EvalArm64 { rdid = -1; } if( pc == Encoding.SENTINEL_WRITE ) { - PrintStream ps = switch((int)regs[0]) { - case 1 -> System.out; - case 2 -> System.err; + ByteArrayOutputStream baos = switch((int)regs[0]) { + case 1 -> _stdout==null ? (_stdout = new ByteArrayOutputStream()) : _stdout; + case 2 -> _stderr==null ? (_stderr = new ByteArrayOutputStream()) : _stderr; default -> throw new IllegalArgumentException(); }; - ps.write(_buf,(int)regs[1],(int)regs[2]); + baos.write(_buf,(int)regs[1],(int)regs[2]); regs[0] = regs[2]; pc = (int)rval; rdid = -1; diff --git a/chapter22/src/test/java/com/seaofnodes/simple/EvalRisc5.java b/chapter22/src/test/java/com/seaofnodes/simple/EvalRisc5.java index d2255278..0a1c034f 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/EvalRisc5.java +++ b/chapter22/src/test/java/com/seaofnodes/simple/EvalRisc5.java @@ -10,11 +10,10 @@ import com.seaofnodes.simple.codegen.Encoding; import com.seaofnodes.simple.node.cpus.riscv.riscv; - -import java.io.PrintStream; +import java.io.ByteArrayOutputStream; import java.util.Arrays; - public class EvalRisc5 { +public class EvalRisc5 { // Memory image, always 0-based public final byte[] _buf; @@ -29,6 +28,9 @@ import java.util.Arrays; // Start of free memory for allocation int _heap; + // Standard out and err streams + ByteArrayOutputStream _stdout, _stderr; + // Cycle counters int _cycle; @@ -102,12 +104,12 @@ import java.util.Arrays; rval = pc + 4; pc = pc + reladdy - 4; if( pc+4 == Encoding.SENTINEL_WRITE ) { - PrintStream ps = switch((int)regs[10]) { - case 1 -> System.out; - case 2 -> System.err; + ByteArrayOutputStream baos = switch((int)regs[10]) { + case 1 -> _stdout==null ? (_stdout = new ByteArrayOutputStream()) : _stdout; + case 2 -> _stderr==null ? (_stderr = new ByteArrayOutputStream()) : _stderr; default -> throw new IllegalArgumentException(); }; - ps.write(_buf,(int)regs[11],(int)regs[12]); + baos.write(_buf,(int)regs[11],(int)regs[12]); regs[10] = regs[12]; rdid = 0; pc = (int)(rval - 4); // Unwind PC, as-if returned from write |