Port math to boxed arithmetic to simplify memory model.

Author: danielperano

Lang/src/main/java/chipmunk/vm/tree/Context.java

@@ -32,7 +32,8 @@ public class Context {
     int[] frame = new int[40];
     int framePtr = 0;
     int stackPtr = 0;
-    long[] vars = new long[200];
+    long[] locals = new long[200];
+    Object[] localRefs = new Object[200];
 
     volatile boolean interrupt;
     public boolean _return;
@@ -52,12 +53,12 @@ public void postCall() {
     }
 
     public long setLocal(int local, long value) {
-        vars[stackPtr + local] = value;
+        locals[stackPtr + local] = value;
         return value;
     }
 
     public long getLocal(int local) {
-        return vars[stackPtr + local];
+        return locals[stackPtr + local];
     }
 
     public void interrupt(){

Lang/src/main/java/chipmunk/vm/tree/Node.java

@@ -21,5 +21,5 @@
 package chipmunk.vm.tree;
 
 public interface Node {
-    long execute(Context ctx);
+    Object execute(Context ctx);
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/Add.java

@@ -27,7 +27,7 @@ public class Add implements Node {
     public Node l, r;
 
     @Override
-    public long execute(Context ctx) {
-        return l.execute(ctx) + r.execute(ctx);
+    public Object execute(Context ctx) {
+        return ((Number)l.execute(ctx)).longValue() + ((Number)r.execute(ctx)).longValue();
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/Block.java

@@ -27,11 +27,11 @@ public class Block implements Node {
     public Node[] body;
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         long result = 0;
         for (int i = 0; i < body.length; i++) {
             try {
-                result = body[i].execute(ctx);
+                result = (Long)body[i].execute(ctx);
             } catch (Exception e) {
                 throw e;
             }

Lang/src/main/java/chipmunk/vm/tree/nodes/CallNode.java

@@ -35,12 +35,12 @@ public CallNode(int locals, Node f, Node... args) {
     }
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         for (int i = 0; i < args.length; i++) {
-            ctx.setLocal(i + locals, args[i].execute(ctx));
+            ctx.setLocal(i + locals, ((Number)args[i].execute(ctx)).longValue());
         }
         ctx.preCall(locals);
-        long result = f.execute(ctx);
+        long result = (Long)f.execute(ctx);
         ctx.postCall();
         return result;
     }

Lang/src/main/java/chipmunk/vm/tree/nodes/Const.java

@@ -35,7 +35,7 @@ public Const(float f) {
     }
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         return value;
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/FDiv.java

@@ -27,7 +27,7 @@ public class FDiv implements Node {
     public Node l, r;
 
     @Override
-    public long execute(Context ctx) {
-        return Float.floatToIntBits(Float.intBitsToFloat((int)l.execute(ctx)) / Float.intBitsToFloat((int)r.execute(ctx)));
+    public Object execute(Context ctx) {
+        return Float.floatToIntBits(Float.intBitsToFloat(((Number)l.execute(ctx)).intValue()) / Float.intBitsToFloat(((Number)r.execute(ctx)).intValue()));
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/FSub.java

@@ -27,7 +27,7 @@ public class FSub implements Node {
     public Node l, r;
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         return Float.floatToIntBits(Float.intBitsToFloat((int)l.execute(ctx)) - Float.intBitsToFloat((int)r.execute(ctx)));
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/For.java

@@ -30,7 +30,7 @@ public class For implements Node {
     public Node post;
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         doPre(ctx, 0);
         return doBody(ctx, doTest(ctx, 0));
     }
@@ -48,7 +48,7 @@ public int doPre(Context ctx, int prior) {
 
     public long doTest(Context ctx, long prior) {
         try {
-            return test.execute(ctx);
+            return ((Number)test.execute(ctx)).longValue();
         } catch (Exception e) {
             ctx.suspendStateless(e, this::doBody);
         }

Lang/src/main/java/chipmunk/vm/tree/nodes/FunctionNode.java

@@ -27,7 +27,7 @@ public class FunctionNode implements Node {
     public Node[] nodes;
 
     @Override
-    public long execute(Context ctx) {
+    public Object execute(Context ctx) {
         for (int i = 0; i < nodes.length - 1; i++) {
             var v = nodes[i].execute(ctx);
             if (ctx._return) {