From fe32ff391c03f3418b9621acb90c3345306461a9 Mon Sep 17 00:00:00 2001
From: Bernhard Urban <lewurm@gmail.com>
Date: Thu, 26 Apr 2012 17:42:34 +0200
Subject: [PATCH] tests: don't use `pop' hack anymore, but System.out.printf
 \o/

---
 Makefile                    | 54 ++++++++++++++----------------
 Mate/X86CodeGen.hs          |  7 +---
 tests/AbsurdlyHuge.java     | 67 ++++++++++++++++---------------------
 tests/ArgumentPassing1.java |  4 +--
 tests/Array1.java           |  4 +--
 tests/CallConv1.java        |  6 +---
 tests/CallConv2.java        |  6 +---
 tests/CallConv3.java        |  8 ++---
 tests/DifferentClass1.java  |  4 +--
 tests/Fac.java              | 18 ++++------
 tests/Fib.java              |  9 ++---
 tests/Instance1.java        |  5 ++-
 tests/Instance2.java        |  2 +-
 tests/Instance3.java        |  4 +--
 tests/Instance4.java        | 19 -----------
 tests/Instance5.java        | 21 ------------
 tests/Integer1.java         |  2 +-
 tests/Native1.java          | 18 ----------
 tests/Native2.java          |  2 +-
 tests/Native3.java          |  2 +-
 tests/Static1.java          |  2 +-
 tests/Static2.java          |  2 +-
 tests/Static3.java          |  3 +-
 tests/Static4.java          |  6 ++--
 tests/Static5.java          |  5 ++-
 tests/Static6.java          |  2 +-
 tests/Static7.java          |  3 +-
 tests/Static8.java          |  6 ++--
 tests/Strings1.java         | 12 +++----
 tests/Test.java             | 11 ------
 tests/While.java            |  5 +++
 31 files changed, 108 insertions(+), 211 deletions(-)
 delete mode 100644 tests/Instance4.java
 delete mode 100644 tests/Instance5.java
 delete mode 100644 tests/Native1.java
 delete mode 100644 tests/Test.java

diff --git a/Makefile b/Makefile
index 87aca3b..0f3f55c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,57 +18,55 @@ GHC_LD := -optl-Xlinker -optl-x
 all: mate $(CLASS_FILES)
 
 test: mate $(CLASS_FILES)
-	./$< tests/Fib | grep mainresult
+	./$< tests/While | grep -e "^result"
+	@printf "should be:  0x%08x 0x%08x\n" 0x19 0x19
+	./$< tests/Fib | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x2ac2
-	./$< tests/Fac | grep mainresult
+	./$< tests/Fac | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x63e1a
-	./$< tests/ArgumentPassing1 | grep mainresult
+	./$< tests/ArgumentPassing1 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
-	./$< tests/DifferentClass1 | grep mainresult
+	./$< tests/DifferentClass1 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 8 13
-	./$< tests/Native1 | egrep -i -e '^printsomething: '
-	@printf "should be:  woot 0x%08x 0x%08x woot 0x%08x\n" 0x1337 0x1338 0x15a5
-	./$< tests/Static1 | grep mainresult
+	./$< tests/Static1 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x33
-	./$< tests/Static2 | grep mainresult
+	./$< tests/Static2 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x55
-	./$< tests/Static3 | grep mainresult
+	./$< tests/Static3 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x6dd
-	./$< tests/Static4 | grep mainresult
+	./$< tests/Static4 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x33 0x77
-	./$< tests/Static5 | grep mainresult
+	./$< tests/Static5 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x33 0x33
-	./$< tests/Static6 | grep mainresult
+	./$< tests/Static6 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x33
-	./$< tests/Static7 | grep mainresult
+	./$< tests/Static7 | grep -e "^result"
 	@printf "should be:  0x%08x\n" $$((0x1337 + 0x555))
-	./$< tests/Static8 | grep mainresult
+	./$< tests/Static8 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x33 $$((0x1337 + 0x555))
-	./$< tests/CallConv1 | grep mainresult
+	./$< tests/CallConv1 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/CallConv2 | grep mainresult
+	./$< tests/CallConv2 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/CallConv3 | grep mainresult
+	./$< tests/CallConv3 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x 0x%08x 0x%08x\n" 0x1000 0x300 0x30 0x7
-	./$< tests/Instance1 | grep mainresult
+	./$< tests/Instance1 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x55 0x11
-	./$< tests/Instance2 | grep mainresult
+	./$< tests/Instance2 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x198 0x22
-	./$< tests/Instance3 | grep mainresult
+	./$< tests/Instance3 | grep -e "^result"
 	@printf "should be:  0x%08x 0x%08x\n" 0x33 0x44
-	./$< tests/Instance4 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x1337 0x1337
-	./$< tests/Native2 | grep "printstream"
+	./$< tests/Native2 | grep -e "^result"
 	@printf "should be:   0x%08x\n" 0x1337
-	./$< tests/Native3 | egrep -e "^Hello World"
+	./$< tests/Native3 | egrep -e "^result"
 	@printf "should be: %s\n" "Hello World"
-	./$< tests/Strings1 | egrep -c -e "^okay :-\)"
+	./$< tests/Strings1 | egrep -c -e "^result"
 	@printf "should be: %d\n" 3
-	./$< tests/Array1 | grep "printstream"
+	./$< tests/Array1 | grep -e "^result"
 	@printf "should be:   0x%08x 0x%08x\n" 0x264 0x8
-	./$< tests/Integer1 | grep mainresult
+	./$< tests/Integer1 | grep -e "^result"
 	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/VarArgs1 | grep mainresult
+	./$< tests/VarArgs1 | grep -e "^result"
 
 %.class: %.java
 	$(JAVAC) $<
diff --git a/Mate/X86CodeGen.hs b/Mate/X86CodeGen.hs
index 1eb9057..00e9303 100644
--- a/Mate/X86CodeGen.hs
+++ b/Mate/X86CodeGen.hs
@@ -226,12 +226,7 @@ emitFromBB method cls hmap =  do
     emit' insn = emit insn >> return Nothing
 
     emit :: J.Instruction -> CodeGen e s ()
-    emit POP = do -- print dropped value
-        calladdr <- getCurrentOffset
-        -- '5' is the size of the `call' instruction ( + immediate)
-        let w32_calladdr = 5 + calladdr
-        let trapaddr = (fromIntegral getaddr :: Word32)
-        call (trapaddr - w32_calladdr)
+    emit POP = do -- dropp value
         add esp (4 :: Word32)
     emit DUP = push (Disp 0, esp)
     emit AASTORE = emit IASTORE
diff --git a/tests/AbsurdlyHuge.java b/tests/AbsurdlyHuge.java
index ba1707d..78cb7a3 100644
--- a/tests/AbsurdlyHuge.java
+++ b/tests/AbsurdlyHuge.java
@@ -1,41 +1,30 @@
-public class AbsurdlyHuge
-{
-public static int absurdlyHuge(int x)
-{
-for(int i=0;i<x;i++)
-{
-for(int u=0;u<x;u++)
-{
-for(int k=0;k<x;k++)
-{
-for(int v=0;v<x;v++)
-{
-for(int w=0;w<x;w++)
-{
-for(int z=0;z<x;z++)
-{
-for(int g=0;w<x;w++)
-{
-if(i+u+k+v+w+z<x)
-{
-return absurdlyHuge(k+v);
-}
-else
-{
-return absurdlyHuge(w+z);
-}
-}
-}
-}
-}
-}
-}
-}
-return 0;
-}
+package tests;
+
+public class AbsurdlyHuge {
+	public static int absurdlyHuge(int x) {
+		for(int i=0;i<x;i++) {
+			for(int u=0;u<x;u++) {
+				for(int k=0;k<x;k++) {
+					for(int v=0;v<x;v++) {
+						for(int w=0;w<x;w++) {
+							for(int z=0;z<x;z++) {
+								for(int g=0;w<x;w++) {
+									if(i+u+k+v+w+z<x) {
+										return absurdlyHuge(k+v);
+									} else {
+										return absurdlyHuge(w+z);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return 0;
+	}
 
-   public static void main(String[] args)
-   {
-      absurdlyHuge(1);
-   }
+	public static void main(String[] args) {
+		System.out.printf("result: 0x%08x\n", absurdlyHuge(1));
+	}
 }
diff --git a/tests/ArgumentPassing1.java b/tests/ArgumentPassing1.java
index 7867cfd..29b6fdc 100644
--- a/tests/ArgumentPassing1.java
+++ b/tests/ArgumentPassing1.java
@@ -2,9 +2,9 @@ package tests;
 
 public class ArgumentPassing1 {
 	public static void main(String []args) {
-		myadder(23, 4, 0x77); // 0x92
+		System.out.printf("result: 0x%08x\n", myadder(23, 4, 0x77)); // 0x92
 		noreturn(23, 4, 0x77); // nothing
-		noargs(); // 0x1337
+		System.out.printf("result: 0x%08x\n", noargs()); // 0x1337
 	}
 
 	public static int myadder(int a, int b, int c) {
diff --git a/tests/Array1.java b/tests/Array1.java
index 074477a..1f6e6bb 100644
--- a/tests/Array1.java
+++ b/tests/Array1.java
@@ -10,7 +10,7 @@ public class Array1 {
 		for (int i = 0; i < 0x8; i++) {
 			sum += arr[i];
 		}
-		System.out.printf(sum); // 0x264
-		System.out.printf(arr.length); // 0x8
+		System.out.printf("result: 0x%08x\n", sum); // 0x264
+		System.out.printf("result: 0x%08x\n", arr.length); // 0x8
 	}
 }
diff --git a/tests/CallConv1.java b/tests/CallConv1.java
index acb6a56..a341936 100644
--- a/tests/CallConv1.java
+++ b/tests/CallConv1.java
@@ -4,11 +4,7 @@ public class CallConv1 {
 	public static void main(String []args) {
 		int sum = 0;
 		sum += manyVars(0x1348);
-		id(sum); // 0x1337
-	}
-
-	public static int id(int a) {
-		return a;
+		System.out.printf("result: 0x%08x\n", sum);
 	}
 
 	public static int manyVars(int a) {
diff --git a/tests/CallConv2.java b/tests/CallConv2.java
index ef8e3f8..3fb2c48 100644
--- a/tests/CallConv2.java
+++ b/tests/CallConv2.java
@@ -4,11 +4,7 @@ public class CallConv2 {
 	public static void main(String []args) {
 		int sum = 0;
 		sum += manyVars(0x125A, 0x11, 0x33, 0x44);
-		id(sum); // 0x1337
-	}
-
-	public static int id(int a) {
-		return a;
+		System.out.printf("result: 0x%08x\n", sum);
 	}
 
 	public static int manyVars(int a, int b, int c, int d) {
diff --git a/tests/CallConv3.java b/tests/CallConv3.java
index d5fa6da..1df0d02 100644
--- a/tests/CallConv3.java
+++ b/tests/CallConv3.java
@@ -2,10 +2,10 @@ package tests;
 
 public class CallConv3 {
 	public static void main(String []args) {
-		manyVars_A(0x1000, 0x300, 0x30, 0x7);
-		manyVars_B(0x1000, 0x300, 0x30, 0x7);
-		manyVars_C(0x1000, 0x300, 0x30, 0x7);
-		manyVars_D(0x1000, 0x300, 0x30, 0x7);
+		System.out.printf("result: 0x%08x\n", manyVars_A(0x1000, 0x300, 0x30, 0x7));
+		System.out.printf("result: 0x%08x\n", manyVars_B(0x1000, 0x300, 0x30, 0x7));
+		System.out.printf("result: 0x%08x\n", manyVars_C(0x1000, 0x300, 0x30, 0x7));
+		System.out.printf("result: 0x%08x\n", manyVars_D(0x1000, 0x300, 0x30, 0x7));
 	}
 
 	public static int manyVars_A(int a, int b, int c, int d) {
diff --git a/tests/DifferentClass1.java b/tests/DifferentClass1.java
index ec397f1..dbe95d8 100644
--- a/tests/DifferentClass1.java
+++ b/tests/DifferentClass1.java
@@ -2,7 +2,7 @@ package tests;
 
 public class DifferentClass1 {
 	public static void main(String[] args) {
-		Fib.fib(5);
-		Fib.fib(6);
+		System.out.printf("result: 0x%08x\n", Fib.fib(5));
+		System.out.printf("result: 0x%08x\n", Fib.fib(6));
 	}
 }
diff --git a/tests/Fac.java b/tests/Fac.java
index 9929dcb..381a7cb 100644
--- a/tests/Fac.java
+++ b/tests/Fac.java
@@ -4,15 +4,10 @@ public class Fac {
 	public static void main(String args[]) {
 		int sum = 0;
 		for (int i = 0; i < 10; i++) {
-			// fac(i);
 			sum += fac(i);
 		}
-		id(sum);
-		// System.out.printf("fac: 0x%08x\n", sum);
-	}
-
-	public static int id(int i) {
-		return i;
+		System.out.printf("result: 0x%08x\n", sum);
+		// System.out.printf("result: 0x%08x\n", facFor(0x10));
 	}
 
 	public static int fac(int a) {
@@ -24,11 +19,10 @@ public class Fac {
 		return b;
 	}
 
-	public static int facFor(int n){
-        	int p = 1;
- 		for(int i=1;i<=n;i++)
-		{
-			p = p * i;
+	public static int facFor(int n) {
+		int p = 1;
+		for(int i = 1; i <= n; i++) {
+			p *= i;
 		}
 		return p;
 	}
diff --git a/tests/Fib.java b/tests/Fib.java
index 11522e7..871b03f 100644
--- a/tests/Fib.java
+++ b/tests/Fib.java
@@ -2,12 +2,13 @@ package tests;
 
 public class Fib {
 	public static int fib(int n) {
-		if(n<=1) return 1;
-		else return fib(n-1) + fib(n-2);
+		if (n <= 1)
+			return 1;
+		else
+			return fib(n - 1) + fib(n - 2);
 	}
 
 	public static void main(String[] args) {
-		fib(20);
-		// System.out.printf("%x\n", fib(20));
+		System.out.printf("result: 0x%08x\n", fib(20));
 	}
 }
diff --git a/tests/Instance1.java b/tests/Instance1.java
index e15505e..fb24f7a 100644
--- a/tests/Instance1.java
+++ b/tests/Instance1.java
@@ -14,8 +14,7 @@ public class Instance1 {
 		id(a.x); // 0x11
 	}
 
-	public static int id(int a) {
-		// System.out.printf("0x%08x\n", a);
-		return a;
+	public static void id(int a) {
+		System.out.printf("result: 0x%08x\n", a);
 	}
 }
diff --git a/tests/Instance2.java b/tests/Instance2.java
index 687d7f9..b336aef 100644
--- a/tests/Instance2.java
+++ b/tests/Instance2.java
@@ -19,7 +19,7 @@ public class Instance2 extends Instance1 {
 		b.x = 0x22; sum += b.x; // 0x22
 		b.y = 0x33; sum += b.y; // 0x33
 		Instance1.id(sum); // 0x198
-		b.getX(); // 0x22
+		System.out.printf("0x%08x\n", b.getX()); // 0x22
 	}
 
 	public int getX() {
diff --git a/tests/Instance3.java b/tests/Instance3.java
index f5ca160..af30d36 100644
--- a/tests/Instance3.java
+++ b/tests/Instance3.java
@@ -5,8 +5,8 @@ public class Instance3 extends Instance2 {
 		int sum = 0;
 		Instance3 a = new Instance3();
 		a.setX(0x33);
-		a.getX(); // 0x33
+		System.out.printf("result: 0x%08x\n", a.getX()); // 0x33
 		a.setX(0x44);
-		a.getX(); // 0x44
+		System.out.printf("result: 0x%08x\n", a.getX()); // 0x44
 	}
 }
diff --git a/tests/Instance4.java b/tests/Instance4.java
deleted file mode 100644
index 0ecd257..0000000
--- a/tests/Instance4.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tests;
-
-public class Instance4 extends Instance2 {
-	public Instance4() {
-		x = 0x11;
-		y = 0x22;
-	}
-
-	public static void main(String []args) {
-		Instance2 a = new Instance4();
-		a.getX(); // 0x1337
-		Instance4 b = (Instance4) a;
-		b.getX(); // 0x1337;
-	}
-
-	public int getX() {
-		return 0x1337;
-	}
-}
diff --git a/tests/Instance5.java b/tests/Instance5.java
deleted file mode 100644
index 8c8ff84..0000000
--- a/tests/Instance5.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tests;
-
-public class Instance5 {
-	public int x;
-	public Instance5() {
-		x = 0x11;
-	}
-
-	public static void main(String []args) {
-		Instance5 a = new Instance5();
-
-		a.setX(0x1337);
-		a.printX(a.x);
-	}
-
-	public void setX(int a) {
-		this.x = a;
-	}
-
-	public native void printX(int x);
-}
diff --git a/tests/Integer1.java b/tests/Integer1.java
index 2220aca..7ca6d5c 100644
--- a/tests/Integer1.java
+++ b/tests/Integer1.java
@@ -3,6 +3,6 @@ package tests;
 public class Integer1 {
 	public static void main(String []args) {
 		Integer a = new Integer(0x1337);
-		a.intValue(); // 0x1337
+		System.out.printf("result: 0x%08x\n", a.intValue()); // 0x1337
 	}
 }
diff --git a/tests/Native1.java b/tests/Native1.java
deleted file mode 100644
index d35c1a0..0000000
--- a/tests/Native1.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package tests;
-
-public class Native1 {
-	public static void main(String []args) {
-		printSomething();
-		for (int i = 0; i < 2; i++)
-			printNumber(0x1337 + i);
-		printSomething();
-		printNumber(0x15a5);
-	}
-
-	public static void printNumber(int a) {
-		printSomething(a);
-	}
-
-	public static native void printSomething();
-	public static native void printSomething(int a);
-}
diff --git a/tests/Native2.java b/tests/Native2.java
index 0c3c701..7da841e 100644
--- a/tests/Native2.java
+++ b/tests/Native2.java
@@ -2,6 +2,6 @@ package tests;
 
 public class Native2 {
 	public static void main(String []args) {
-		System.out.printf(0x1337);
+		System.out.printf("result: 0x%08x\n", 0x1337);
 	}
 }
diff --git a/tests/Native3.java b/tests/Native3.java
index 60916e6..f26ea55 100644
--- a/tests/Native3.java
+++ b/tests/Native3.java
@@ -2,6 +2,6 @@ package tests;
 
 public class Native3 {
 	public static void main(String []args) {
-		System.out.println("Hello World");
+		System.out.println("result: Hello World");
 	}
 }
diff --git a/tests/Static1.java b/tests/Static1.java
index 74ca4fd..45e03d2 100644
--- a/tests/Static1.java
+++ b/tests/Static1.java
@@ -6,7 +6,7 @@ public class Static1 {
 
 	public static void main(String []args) {
 		setNumbers();
-		addNumbers(); // 0x33
+		System.out.printf("result: 0x%08x\n", addNumbers()); // 0x33
 	}
 
 	public static void setNumbers() {
diff --git a/tests/Static2.java b/tests/Static2.java
index cfc85dc..50dddc2 100644
--- a/tests/Static2.java
+++ b/tests/Static2.java
@@ -11,6 +11,6 @@ public class Static2 {
 		// in Static2 as in Static1
 		Static1.x = 0x33;
 		Static1.y = 0x22;
-		Static1.addNumbers();
+		System.out.printf("result: 0x%08x\n", Static1.addNumbers());
 	}
 }
diff --git a/tests/Static3.java b/tests/Static3.java
index a5a732c..4314581 100644
--- a/tests/Static3.java
+++ b/tests/Static3.java
@@ -12,8 +12,7 @@ public class Static3 extends Static1 {
 		sum += Static1.addNumbers(); // 0x33
 		Static3.z = 0x11;
 		sum += Static3.addNumbers(); // 0x44
-		getSum(); // 0x666 + 0x33 + 0x44 = 0x6dd
-		// System.out.printf("%x\n", getSum());
+		System.out.printf("result: 0x%08x\n", getSum()); // 0x666 + 0x33 + 0x44 = 0x6dd
 	}
 
 	public static int getSum() {
diff --git a/tests/Static4.java b/tests/Static4.java
index 7f17bf9..fbf29b5 100644
--- a/tests/Static4.java
+++ b/tests/Static4.java
@@ -7,10 +7,8 @@ public class Static4 extends Static1 {
 	public static void main(String []args) {
 		Static1.setNumbers();
 		Static4.setNumbers();
-		Static1.addNumbers(); // 0x33
-		// System.out.printf("%x\n", Static1.addNumbers());
-		Static4.addNumbers(); // 0x77
-		// System.out.printf("%x\n", Static4.addNumbers());
+		System.out.printf("result: 0x%08x\n", Static1.addNumbers()); // 0x33
+		System.out.printf("result: 0x%08x\n", Static4.addNumbers()); // 0x77
 	}
 
 	public static void setNumbers() {
diff --git a/tests/Static5.java b/tests/Static5.java
index 14c41d4..d49a45c 100644
--- a/tests/Static5.java
+++ b/tests/Static5.java
@@ -6,8 +6,7 @@ public class Static5 extends Static1 {
 
 	public static void main(String []args) {
 		Static5.setNumbers();
-		Static5.addNumbers(); // 0x33
-		Static1.addNumbers(); // 0x33
-		// System.out.printf("%x\n", Static5.addNumbers());
+		System.out.printf("result: 0x%08x\n", Static5.addNumbers()); // 0x33
+		System.out.printf("result: 0x%08x\n", Static1.addNumbers()); // 0x33
 	}
 }
diff --git a/tests/Static6.java b/tests/Static6.java
index 49913ad..97748c1 100644
--- a/tests/Static6.java
+++ b/tests/Static6.java
@@ -10,7 +10,7 @@ public class Static6 {
 	}
 
 	public static void main(String []args) {
-		addNumbers(); // 0x33
+		System.out.printf("result: 0x%08x\n", addNumbers()); // 0x33
 	}
 
 	public static int addNumbers() {
diff --git a/tests/Static7.java b/tests/Static7.java
index d587e08..640fc75 100644
--- a/tests/Static7.java
+++ b/tests/Static7.java
@@ -10,7 +10,6 @@ public class Static7 extends Static6 {
 	}
 
 	public static void main(String []args) {
-		addNumbers(); // 0x188c
-		// System.out.printf("%x\n", addNumbers());
+		System.out.printf("result: 0x%08x\n", addNumbers()); // 0x188c
 	}
 }
diff --git a/tests/Static8.java b/tests/Static8.java
index 1359642..c908a1e 100644
--- a/tests/Static8.java
+++ b/tests/Static8.java
@@ -10,8 +10,7 @@ public class Static8 extends Static8_local {
 	}
 
 	public static void main(String []args) {
-		Static8.addNumbers(); // 0x188c
-		// System.out.printf("%x\n", Static8.addNumbers());
+		System.out.printf("result: 0x%08x\n", Static8.addNumbers()); // 0x188c
 	}
 }
 
@@ -22,8 +21,7 @@ class Static8_local {
 	static {
 		Static8_local.x = 0x11;
 		Static8_local.y = 0x22;
-		Static8_local.addNumbers(); // 0x33
-		// System.out.printf("%x\n", addNumbers());
+		System.out.printf("result: 0x%08x\n", addNumbers()); // 0x33
 	}
 
 	public static int addNumbers() {
diff --git a/tests/Strings1.java b/tests/Strings1.java
index 9a6a9ba..5fa12cf 100644
--- a/tests/Strings1.java
+++ b/tests/Strings1.java
@@ -7,21 +7,21 @@ public class Strings1 {
 		String c = "wtf";
 
 		if (a == b) {
-			System.out.println("okay :-)");
+			System.out.println("result: okay :-)");
 		} else {
-			System.out.println("bad :-(");
+			System.out.println("result: bad :-(");
 		}
 
 		if (a != c) {
-			System.out.println("okay :-)");
+			System.out.println("result: okay :-)");
 		} else {
-			System.out.println("bad :-(");
+			System.out.println("result: bad :-(");
 		}
 
 		if (a == c) {
-			System.out.println("bad :-(");
+			System.out.println("result: bad :-(");
 		} else {
-			System.out.println("okay :-)");
+			System.out.println("result: okay :-)");
 		}
 	}
 }
diff --git a/tests/Test.java b/tests/Test.java
deleted file mode 100644
index 4c08a1b..0000000
--- a/tests/Test.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package tests;
-
-public class Test {
-    private static int foo;
-    private static int bar;
-
-    public static void main(String [] args) {
-      foo = 0x42;
-      bar = 2 * foo;
-    }
-}
diff --git a/tests/While.java b/tests/While.java
index 929b56b..d34f959 100644
--- a/tests/While.java
+++ b/tests/While.java
@@ -1,6 +1,11 @@
 package tests;
 
 public class While {
+	public static void main(String []args) {
+		System.out.printf("result: f: 0x%08x\n", f(4, 6));
+		System.out.printf("result: g: 0x%08x\n", g(4, 6));
+	}
+
 	public static int f(int a, int b) {
 		do {
 			a += b;
-- 
2.25.1