Merge branch 'add-functions' into split-stack

parrt · Apr 14, 2015 · 2db2c0a · 2db2c0a
2 parents c1b1d29 + 207a161
commit 2db2c0a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/vm/Bytecode.java b/src/vm/Bytecode.java
@@ -30,8 +30,7 @@ public Instruction(String name, int nargs) {
 	public static final short CALL = 16;
 	public static final short RET  = 17;    // return with/without value
 
-
-	public static final short HALT = 19;
+	public static final short HALT = 18;
 
 	public static Instruction[] instructions = new Instruction[] {
 		null, // <INVALID>