Merge branch 'mplamann' into run_vm

Conflicts: public/vm/index.js
2015-04-13 23:12:40 -04:00
parent bbd72c2111 be1848a055
commit d2841cd48f
48 changed files with 1678 additions and 291 deletions
--- a/public/vm/opcodes.js
+++ b/public/vm/opcodes.js
@@ -90,12 +90,12 @@ exports.lookup_table = {
    0x13: "ILDC",
    0x14: "ALDC",
    0x00: "NOP",
-    0x9F: "IF",
-    0xA0: "IF",
-    0xA1: "IF",
-    0xA2: "IF",
-    0xA3: "IF",
-    0xA4: "IF",
+    0x9F: "IF_CMPEQ",
+    0xA0: "IF_CMPNE",
+    0xA1: "IF_ICMPLT",
+    0xA2: "IF_ICMPGE",
+    0xA3: "IF_ICMPGT",
+    0xA4: "IF_ICMPLE",
    0xA7: "GOTO",
    0xBF: "ATHROW",
    0xCF: "ASSERT",