1 files changed, 62 insertions, 80 deletions
diff --git a/tests/files/VMTests/vmIOandFlowOperationsTest.json b/tests/files/VMTests/vmIOandFlowOperationsTest.json
index 027328d0d..8542a7dba 100644
--- a/tests/files/VMTests/vmIOandFlowOperationsTest.json
+++ b/tests/files/VMTests/vmIOandFlowOperationsTest.json
@@ -1,5 +1,5 @@
 {
-    "dupAt51doesNotExistAnymore" : {
+    "dupAt51becameMload" : {
         "callcreates" : [
         ],
         "env" : {
@@ -21,6 +21,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9695",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -64,6 +66,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9688",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -107,6 +111,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9698",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -150,6 +156,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9696",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -172,8 +180,6 @@
         }
     },
     "jump0_foreverOutOfGas" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -192,17 +198,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x600056",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -235,6 +230,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9695",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -278,6 +275,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9696",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -321,6 +320,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9693",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -343,8 +344,6 @@
         }
     },
     "jump0_jumpdest3" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -363,17 +362,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x6023600b6008505660015b600255",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -385,8 +373,6 @@
         }
     },
     "jump1" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -405,17 +391,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x620fffff620fffff0156",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -448,6 +423,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9695",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -491,6 +468,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9694",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -534,6 +513,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9695",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -577,6 +558,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9997",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -619,6 +602,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9896",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -661,6 +646,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9892",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -682,8 +669,6 @@
         }
     },
     "mloadOutOfGasError2" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -702,17 +687,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x6272482551600155",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -745,6 +719,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9694",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -788,6 +764,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9694",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -831,6 +809,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9690",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -874,6 +854,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9688",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -917,6 +899,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9692",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -960,6 +944,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9690",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1003,6 +989,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "10000",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1045,6 +1033,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9692",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1088,6 +1078,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9690",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1131,6 +1123,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "10000",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1173,6 +1167,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9693",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1216,6 +1212,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9898",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1258,6 +1256,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9596",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1301,6 +1301,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9696",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1323,8 +1325,6 @@
         }
     },
     "pop1" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1343,17 +1343,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x5060026003600455",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
@@ -1386,6 +1375,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9074",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1431,6 +1422,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "9274",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1475,6 +1468,8 @@
             "value" : "1000000000000000000"
         },
         "gas" : "8450",
+        "logs" : {
+        },
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -1500,9 +1495,7 @@
             }
         }
     },
-    "swapAt52doesNotExistAnymore" : {
-        "callcreates" : [
-        ],
+    "swapAt52becameMstore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "256",
@@ -1521,17 +1514,6 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x600260035255",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",