Merge pull request #196 from lrettig/byzantium-opcodes

Adds support for Byzantium opcodes (WIP)
ewasm · Aug 2, 2018 · 0eb7f7b · 0eb7f7b
2 parents eb40b00 + f369469
commit 0eb7f7b
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 2 deletions.
diff --git a/include/evm2wasm.h b/include/evm2wasm.h
@@ -47,6 +47,8 @@ enum class opcodeEnum
     GASPRICE,
     EXTCODESIZE,
     EXTCODECOPY,
+    RETURNDATASIZE,
+    RETURNDATACOPY,
     BLOCKHASH,
     COINBASE,
     TIMESTAMP,
@@ -75,8 +77,9 @@ enum class opcodeEnum
     RETURN,
     DELEGATECALL,
     STATICCALL,
-    SELFDESTRUCT,
+    REVERT,
     INVALID,
+    SELFDESTRUCT,
     bswap_i32,
     bswap_i64,
     bswap_m128,
@@ -164,6 +167,8 @@ static std::map<int, std::tuple<opcodeEnum, int, int, int>> codes = {
     {0x3a, Opcode{opcodeEnum::GASPRICE, 0, 0, 1}},
     {0x3b, Opcode{opcodeEnum::EXTCODESIZE, 0, 1, 1}},
     {0x3c, Opcode{opcodeEnum::EXTCODECOPY, 0, 4, 0}},
+    {0x3d, Opcode{opcodeEnum::RETURNDATASIZE, 0, 0, 1}},
+    {0x3e, Opcode{opcodeEnum::RETURNDATACOPY, 0, 3, 0}},
 
     // "0x40" range - block operations
     {0x40, Opcode{opcodeEnum::BLOCKHASH, 0, 1, 1}},
@@ -270,6 +275,8 @@ static std::map<int, std::tuple<opcodeEnum, int, int, int>> codes = {
     {0xfa, Opcode{opcodeEnum::STATICCALL, 0, 6, 1}},
 
     // "0x70", range - other
+    {0xfd, Opcode{opcodeEnum::REVERT, 0, 2, 0}},
+    {0xfe, Opcode{opcodeEnum::INVALID, 0, 0, 0}},
     {0xff, Opcode{opcodeEnum::SELFDESTRUCT, 0, 1, 0}}};
 
 static std::map<opcodeEnum, std::vector<opcodeEnum>> depMap = {
@@ -306,6 +313,7 @@ static std::map<opcodeEnum, std::vector<opcodeEnum>> depMap = {
     {opcodeEnum::EXTCODECOPY, {opcodeEnum::bswap_m256, opcodeEnum::callback, opcodeEnum::memusegas,
                                   opcodeEnum::check_overflow, opcodeEnum::memset}},
     {opcodeEnum::EXTCODESIZE, {opcodeEnum::callback_32, opcodeEnum::bswap_m256}},
+    {opcodeEnum::RETURNDATACOPY, {opcodeEnum::memusegas, opcodeEnum::check_overflow, opcodeEnum::memset}},
     {opcodeEnum::LOG, {opcodeEnum::memusegas, opcodeEnum::check_overflow}},
     {opcodeEnum::BLOCKHASH, {opcodeEnum::check_overflow, opcodeEnum::callback_256}},
     {opcodeEnum::SHA3, {opcodeEnum::memusegas, opcodeEnum::bswap_m256, opcodeEnum::check_overflow,
@@ -326,6 +334,7 @@ static std::map<opcodeEnum, std::vector<opcodeEnum>> depMap = {
     {opcodeEnum::CREATE, {opcodeEnum::bswap_m256, opcodeEnum::bswap_m160, opcodeEnum::callback_160,
                              opcodeEnum::memusegas, opcodeEnum::check_overflow}},
     {opcodeEnum::RETURN, {opcodeEnum::memusegas, opcodeEnum::check_overflow}},
+    {opcodeEnum::REVERT, {opcodeEnum::memusegas, opcodeEnum::check_overflow}},
     {opcodeEnum::BALANCE, {opcodeEnum::bswap_m256, opcodeEnum::callback_128}},
     {opcodeEnum::SELFDESTRUCT, {opcodeEnum::bswap_m256}},
     {opcodeEnum::SSTORE, {opcodeEnum::bswap_m256, opcodeEnum::callback}},

diff --git a/include/wast-async.h b/include/wast-async.h
@@ -138,6 +138,16 @@ namespace evm2wasm
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $STATICCALL (param $callback i32)(local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -64)))\n          (i64.load (i32.add (get_global $sp) (i32.const -56)))\n          (i64.load (i32.add (get_global $sp) (i32.const -48)))\n          (i64.load (i32.add (get_global $sp) (i32.const -40)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -96)))\n          (i64.load (i32.add (get_global $sp) (i32.const -88)))\n          (i64.load (i32.add (get_global $sp) (i32.const -80)))\n          (i64.load (i32.add (get_global $sp) (i32.const -72)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -160))\n      (i64.extend_u/i32\n        (i32.eqz (call $callStatic(call $check_overflow_i64\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(get_local $offset0)(get_local $length0)(get_local $callback)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0)))",
     .imports = "(import \"ethereum\" \"callStatic\" (func $callStatic (param i64 i32 i32 i32 i32) (result i32)))"
   }
+},{
+  opcodeEnum::RETURNDATACOPY, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURNDATACOPY (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -64)))\n          (i64.load (i32.add (get_global $sp) (i32.const -56)))\n          (i64.load (i32.add (get_global $sp) (i32.const -48)))\n          (i64.load (i32.add (get_global $sp) (i32.const -40)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $returnDataCopy(get_local $offset0)(call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8))))(get_local $length0)))",
+    .imports = "(import \"ethereum\" \"returnDataCopy\" (func $returnDataCopy (param i32 i32 i32) ))"
+  }
+},{
+  opcodeEnum::RETURNDATASIZE, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURNDATASIZE   (i64.store\n      (i32.add (get_global $sp) (i32.const 32))\n      (i64.extend_u/i32\n        (call $getReturnDataSize)))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const 56)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const 48)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const 40)) (i64.const 0)))",
+    .imports = "(import \"ethereum\" \"getReturnDataSize\" (func $getReturnDataSize  (result i32)))"
+  }
 },{
   opcodeEnum::SSTORE, {
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $SSTORE (param $callback i32)  (call $storageStore(get_global $sp)(i32.add (get_global $sp) (i32.const -32))(get_local $callback)))",
@@ -158,6 +168,11 @@ namespace evm2wasm
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURN (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $return(get_local $offset0)(get_local $length0)))",
     .imports = "(import \"ethereum\" \"return\" (func $return (param i32 i32) ))"
   }
+},{
+  opcodeEnum::REVERT, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $REVERT (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $revert(get_local $offset0)(get_local $length0)))",
+    .imports = "(import \"ethereum\" \"revert\" (func $revert (param i32 i32) ))"
+  }
 },{
   opcodeEnum::ADD, {
     .wast = "(func $ADD\n  (local $sp i32)\n\n  (local $a i64)\n  (local $c i64)\n  (local $d i64)\n  (local $carry i64)\n\n  (set_local $sp (get_global $sp))\n  \n  ;; d c b a\n  ;; pop the stack \n  (set_local $a (i64.load (i32.add (get_local $sp) (i32.const 24))))\n  (set_local $c (i64.load (i32.add (get_local $sp) (i32.const 8))))\n  (set_local $d (i64.load (get_local $sp)))\n  ;; decement the stack pointer\n  (set_local $sp (i32.sub (get_local $sp) (i32.const 8)))\n\n  ;; d \n  (set_local $carry (i64.add (get_local $d) (i64.load (i32.sub (get_local $sp) (i32.const 24)))))\n  ;; save d  to mem\n  (i64.store (i32.sub (get_local $sp) (i32.const 24)) (get_local $carry))\n  ;; check  for overflow\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $carry) (get_local $d))))\n\n  ;; c use $d as reg\n  (set_local $d     (i64.add (i64.load (i32.sub (get_local $sp) (i32.const 16))) (get_local $carry)))\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $carry))))\n  (set_local $d     (i64.add (get_local $c) (get_local $d)))\n  ;; store the result\n  (i64.store (i32.sub (get_local $sp) (i32.const 16)) (get_local $d))\n  ;; check overflow\n  (set_local $carry (i64.or (i64.extend_u/i32  (i64.lt_u (get_local $d) (get_local $c))) (get_local $carry)))\n\n  ;; b\n  ;; add carry\n  (set_local $d     (i64.add (i64.load (i32.sub (get_local $sp) (i32.const 8))) (get_local $carry)))\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $carry))))\n\n  ;; use reg c\n  (set_local $c (i64.load (i32.add (get_local $sp) (i32.const 24))))\n  (set_local $d (i64.add (get_local $c) (get_local $d)))\n  (i64.store (i32.sub (get_local $sp) (i32.const 8)) (get_local $d))\n  ;; a\n  (i64.store (get_local $sp) \n             (i64.add        ;; add a \n               (get_local $a)\n               (i64.add\n                 (i64.load (get_local $sp))  ;; load the operand\n                 (i64.or  ;; carry \n                   (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $c))) \n                   (get_local $carry)))))\n)\n",

diff --git a/include/wast.h b/include/wast.h
@@ -138,6 +138,16 @@ namespace evm2wasm
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $STATICCALL (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -64)))\n          (i64.load (i32.add (get_global $sp) (i32.const -56)))\n          (i64.load (i32.add (get_global $sp) (i32.const -48)))\n          (i64.load (i32.add (get_global $sp) (i32.const -40)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -96)))\n          (i64.load (i32.add (get_global $sp) (i32.const -88)))\n          (i64.load (i32.add (get_global $sp) (i32.const -80)))\n          (i64.load (i32.add (get_global $sp) (i32.const -72)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -160))\n      (i64.extend_u/i32\n        (i32.eqz (call $callStatic(call $check_overflow_i64\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(get_local $offset0)(get_local $length0)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0)))",
     .imports = "(import \"ethereum\" \"callStatic\" (func $callStatic (param i64 i32 i32 i32) (result i32)))"
   }
+},{
+  opcodeEnum::RETURNDATACOPY, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURNDATACOPY (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -64)))\n          (i64.load (i32.add (get_global $sp) (i32.const -56)))\n          (i64.load (i32.add (get_global $sp) (i32.const -48)))\n          (i64.load (i32.add (get_global $sp) (i32.const -40)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $returnDataCopy(get_local $offset0)(call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8))))(get_local $length0)))",
+    .imports = "(import \"ethereum\" \"returnDataCopy\" (func $returnDataCopy (param i32 i32 i32) ))"
+  }
+},{
+  opcodeEnum::RETURNDATASIZE, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURNDATASIZE   (i64.store\n      (i32.add (get_global $sp) (i32.const 32))\n      (i64.extend_u/i32\n        (call $getReturnDataSize)))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const 56)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const 48)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const 40)) (i64.const 0)))",
+    .imports = "(import \"ethereum\" \"getReturnDataSize\" (func $getReturnDataSize  (result i32)))"
+  }
 },{
   opcodeEnum::SSTORE, {
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $SSTORE   (call $storageStore(get_global $sp)(i32.add (get_global $sp) (i32.const -32))))",
@@ -158,6 +168,11 @@ namespace evm2wasm
     .wast = ";; generated by ./wasm/generateInterface.js\n(func $RETURN (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $return(get_local $offset0)(get_local $length0)))",
     .imports = "(import \"ethereum\" \"return\" (func $return (param i32 i32) ))"
   }
+},{
+  opcodeEnum::REVERT, {
+    .wast = ";; generated by ./wasm/generateInterface.js\n(func $REVERT (local $offset0 i32)(local $length0 i32) (set_local $offset0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const 0)))\n          (i64.load (i32.add (get_global $sp) (i32.const 8)))\n          (i64.load (i32.add (get_global $sp) (i32.const 16)))\n          (i64.load (i32.add (get_global $sp) (i32.const 24)))))(set_local $length0 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -32)))\n          (i64.load (i32.add (get_global $sp) (i32.const -24)))\n          (i64.load (i32.add (get_global $sp) (i32.const -16)))\n          (i64.load (i32.add (get_global $sp) (i32.const -8)))))\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (call $revert(get_local $offset0)(get_local $length0)))",
+    .imports = "(import \"ethereum\" \"revert\" (func $revert (param i32 i32) ))"
+  }
 },{
   opcodeEnum::ADD, {
     .wast = "(func $ADD\n  (local $sp i32)\n\n  (local $a i64)\n  (local $c i64)\n  (local $d i64)\n  (local $carry i64)\n\n  (set_local $sp (get_global $sp))\n  \n  ;; d c b a\n  ;; pop the stack \n  (set_local $a (i64.load (i32.add (get_local $sp) (i32.const 24))))\n  (set_local $c (i64.load (i32.add (get_local $sp) (i32.const 8))))\n  (set_local $d (i64.load (get_local $sp)))\n  ;; decement the stack pointer\n  (set_local $sp (i32.sub (get_local $sp) (i32.const 8)))\n\n  ;; d \n  (set_local $carry (i64.add (get_local $d) (i64.load (i32.sub (get_local $sp) (i32.const 24)))))\n  ;; save d  to mem\n  (i64.store (i32.sub (get_local $sp) (i32.const 24)) (get_local $carry))\n  ;; check  for overflow\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $carry) (get_local $d))))\n\n  ;; c use $d as reg\n  (set_local $d     (i64.add (i64.load (i32.sub (get_local $sp) (i32.const 16))) (get_local $carry)))\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $carry))))\n  (set_local $d     (i64.add (get_local $c) (get_local $d)))\n  ;; store the result\n  (i64.store (i32.sub (get_local $sp) (i32.const 16)) (get_local $d))\n  ;; check overflow\n  (set_local $carry (i64.or (i64.extend_u/i32  (i64.lt_u (get_local $d) (get_local $c))) (get_local $carry)))\n\n  ;; b\n  ;; add carry\n  (set_local $d     (i64.add (i64.load (i32.sub (get_local $sp) (i32.const 8))) (get_local $carry)))\n  (set_local $carry (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $carry))))\n\n  ;; use reg c\n  (set_local $c (i64.load (i32.add (get_local $sp) (i32.const 24))))\n  (set_local $d (i64.add (get_local $c) (get_local $d)))\n  (i64.store (i32.sub (get_local $sp) (i32.const 8)) (get_local $d))\n  ;; a\n  (i64.store (get_local $sp) \n             (i64.add        ;; add a \n               (get_local $a)\n               (i64.add\n                 (i64.load (get_local $sp))  ;; load the operand\n                 (i64.or  ;; carry \n                   (i64.extend_u/i32 (i64.lt_u (get_local $d) (get_local $c))) \n                   (get_local $carry)))))\n)\n",

diff --git a/index.js b/index.js
@@ -34,6 +34,7 @@ const depMap = new Map([
   ['CALLVALUE', ['bswap_m128']],
   ['EXTCODECOPY', ['bswap_m256', 'callback', 'memusegas', 'check_overflow', 'memset']],
   ['EXTCODESIZE', ['callback_32', 'bswap_m256']],
+  ['RETURNDATACOPY', ['memusegas', 'check_overflow', 'memset']],
   ['LOG', ['memusegas', 'check_overflow']],
   ['BLOCKHASH', ['check_overflow', 'callback_256']],
   ['SHA3', ['memusegas', 'bswap_m256', 'check_overflow', 'keccak']],
@@ -43,6 +44,7 @@ const depMap = new Map([
   ['CALLCODE', ['bswap_m256', 'callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'check_overflow_i64', 'memset', 'callback_32']],
   ['CREATE', ['bswap_m256', 'bswap_m160', 'callback_160', 'memusegas', 'check_overflow']],
   ['RETURN', ['memusegas', 'check_overflow']],
+  ['REVERT', ['memusegas', 'check_overflow']],
   ['BALANCE', ['bswap_m256', 'callback_128']],
   ['SELFDESTRUCT', ['bswap_m256']],
   ['SSTORE', ['bswap_m256', 'callback']],
@@ -299,6 +301,7 @@ exports.evm2wast = function (evmCode, opts = {
         break
       case 'SELFDESTRUCT':
       case 'RETURN':
+      case 'REVERT':
         segment += `(call $${op.name}) (br $done)\n`
         if (jumpFound) {
           pc = findNextJumpDest(evmCode, pc)