Fix CREATE 2 in jumpTable used for VM opcode dispatch on linux & macos

ethereum · Jul 23, 2018 · 4229006 · 4229006
1 parent c950c7c
commit 4229006
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libevm/Instruction.h b/libevm/Instruction.h
@@ -221,8 +221,8 @@ enum class Instruction: uint8_t
     CALLCODE,           ///< message-call with another account's code only
     RETURN,             ///< halt execution returning output data
     DELEGATECALL,       ///< like CALLCODE but keeps caller's value and sender
-    STATICCALL = 0xfa,	///< like CALL except state changing operation are not permitted (will throw)
     CREATE2 = 0xf5,		///< create a new account with associated code. sha3((sender + salt + code)
+    STATICCALL = 0xfa,	///< like CALL except state changing operation are not permitted (will throw)
     REVERT = 0xfd,      ///< stop execution and revert state changes, without consuming all provided gas
     INVALID = 0xfe,     ///< dedicated invalid instruction
     SUICIDE = 0xff      ///< halt execution and register account for later deletion

diff --git a/libevm/LegacyVMConfig.h b/libevm/LegacyVMConfig.h
@@ -408,13 +408,13 @@ namespace dev
         &&CALLCODE,                             \
         &&RETURN,                               \
         &&DELEGATECALL,                         \
-        &&INVALID,                              \
+        &&CREATE2,                              \
         &&INVALID,                              \
         &&INVALID,                              \
         &&INVALID,                              \
         &&INVALID,                              \
         &&STATICCALL,                           \
-        &&CREATE2,                              \
+        &&INVALID,                              \
         &&INVALID,                              \
         &&REVERT,                               \
         &&INVALID,                              \