From 94bb5fbec96a8e1f498ee5941ba8c0b3f66ad023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Mon, 11 Jun 2018 18:17:20 +0200
Subject: [PATCH] Separate instruction names from metrics

---
 lib/instructions/CMakeLists.txt        |   1 +
 lib/instructions/instruction_metrics.c | 265 ------------------------
 lib/instructions/instruction_names.c   | 270 +++++++++++++++++++++++++
 3 files changed, 271 insertions(+), 265 deletions(-)
 create mode 100644 lib/instructions/instruction_names.c

diff --git a/lib/instructions/CMakeLists.txt b/lib/instructions/CMakeLists.txt
index 25aea11..4d9905e 100644
--- a/lib/instructions/CMakeLists.txt
+++ b/lib/instructions/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(
     instructions
     ${include_dir}/evmc/instructions.h
     instruction_metrics.c
+    instruction_names.c
 )
 
 add_library(evmc::instructions ALIAS instructions)
diff --git a/lib/instructions/instruction_metrics.c b/lib/instructions/instruction_metrics.c
index 9270075..a1f0a9e 100644
--- a/lib/instructions/instruction_metrics.c
+++ b/lib/instructions/instruction_metrics.c
@@ -1335,268 +1335,3 @@ const struct evmc_instruction_metrics* evmc_get_instruction_metrics_table(
     }
     return NULL;
 }
-
-
-static const char* names[256] = {
-    "STOP",
-    "ADD",
-    "MUL",
-    "SUB",
-    "DIV",
-    "SDIV",
-    "MOD",
-    "SMOD",
-    "ADDMOD",
-    "MULMOD",
-    "EXP",
-    "SIGNEXTEND",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "LT",
-    "GT",
-    "SLT",
-    "SGT",
-    "EQ",
-    "ISZERO",
-    "AND",
-    "OR",
-    "XOR",
-    "NOT",
-    "BYTE",
-    "SHL",
-    "SHR",
-    "SAR",
-    NULL,
-    NULL,
-    "SHA3",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "ADDRESS",
-    "BALANCE",
-    "ORIGIN",
-    "CALLER",
-    "CALLVALUE",
-    "CALLDATALOAD",
-    "CALLDATASIZE",
-    "CALLDATACOPY",
-    "CODESIZE",
-    "CODECOPY",
-    "GASPRICE",
-    "EXTCODESIZE",
-    "EXTCODECOPY",
-    "RETURNDATASIZE",
-    "RETURNDATACOPY",
-    NULL,
-    "BLOCKHASH",
-    "COINBASE",
-    "TIMESTAMP",
-    "NUMBER",
-    "DIFFICULTY",
-    "GASLIMIT",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "POP",
-    "MLOAD",
-    "MSTORE",
-    "MSTORE8",
-    "SLOAD",
-    "SSTORE",
-    "JUMP",
-    "JUMPI",
-    "PC",
-    "MSIZE",
-    "GAS",
-    "JUMPDEST",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "PUSH1",
-    "PUSH2",
-    "PUSH3",
-    "PUSH4",
-    "PUSH5",
-    "PUSH6",
-    "PUSH7",
-    "PUSH8",
-    "PUSH9",
-    "PUSH10",
-    "PUSH11",
-    "PUSH12",
-    "PUSH13",
-    "PUSH14",
-    "PUSH15",
-    "PUSH16",
-    "PUSH17",
-    "PUSH18",
-    "PUSH19",
-    "PUSH20",
-    "PUSH21",
-    "PUSH22",
-    "PUSH23",
-    "PUSH24",
-    "PUSH25",
-    "PUSH26",
-    "PUSH27",
-    "PUSH28",
-    "PUSH29",
-    "PUSH30",
-    "PUSH31",
-    "PUSH32",
-    "DUP1",
-    "DUP2",
-    "DUP3",
-    "DUP4",
-    "DUP5",
-    "DUP6",
-    "DUP7",
-    "DUP8",
-    "DUP9",
-    "DUP10",
-    "DUP11",
-    "DUP12",
-    "DUP13",
-    "DUP14",
-    "DUP15",
-    "DUP16",
-    "SWAP1",
-    "SWAP2",
-    "SWAP3",
-    "SWAP4",
-    "SWAP5",
-    "SWAP6",
-    "SWAP7",
-    "SWAP8",
-    "SWAP9",
-    "SWAP10",
-    "SWAP11",
-    "SWAP12",
-    "SWAP13",
-    "SWAP14",
-    "SWAP15",
-    "SWAP16",
-    "LOG0",
-    "LOG1",
-    "LOG2",
-    "LOG3",
-    "LOG4",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "CREATE",
-    "CALL",
-    "CALLCODE",
-    "RETURN",
-    "DELEGATECALL",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "STATICCALL",
-    NULL,
-    NULL,
-    "REVERT",
-    "INVALID",
-    "SUICIDE",
-};
-
-const char* const* evmc_get_instruction_name_table()
-{
-    return names;
-}
diff --git a/lib/instructions/instruction_names.c b/lib/instructions/instruction_names.c
new file mode 100644
index 0000000..0e83606
--- /dev/null
+++ b/lib/instructions/instruction_names.c
@@ -0,0 +1,270 @@
+/* EVMC: Ethereum Client-VM Connector API.
+ * Copyright 2018 Pawel Bylica.
+ * Licensed under the MIT License. See the LICENSE file.
+ */
+
+#include <evmc/instructions.h>
+
+static const char* names[256] = {
+    "STOP",
+    "ADD",
+    "MUL",
+    "SUB",
+    "DIV",
+    "SDIV",
+    "MOD",
+    "SMOD",
+    "ADDMOD",
+    "MULMOD",
+    "EXP",
+    "SIGNEXTEND",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "LT",
+    "GT",
+    "SLT",
+    "SGT",
+    "EQ",
+    "ISZERO",
+    "AND",
+    "OR",
+    "XOR",
+    "NOT",
+    "BYTE",
+    "SHL",
+    "SHR",
+    "SAR",
+    NULL,
+    NULL,
+    "SHA3",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "ADDRESS",
+    "BALANCE",
+    "ORIGIN",
+    "CALLER",
+    "CALLVALUE",
+    "CALLDATALOAD",
+    "CALLDATASIZE",
+    "CALLDATACOPY",
+    "CODESIZE",
+    "CODECOPY",
+    "GASPRICE",
+    "EXTCODESIZE",
+    "EXTCODECOPY",
+    "RETURNDATASIZE",
+    "RETURNDATACOPY",
+    NULL,
+    "BLOCKHASH",
+    "COINBASE",
+    "TIMESTAMP",
+    "NUMBER",
+    "DIFFICULTY",
+    "GASLIMIT",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "POP",
+    "MLOAD",
+    "MSTORE",
+    "MSTORE8",
+    "SLOAD",
+    "SSTORE",
+    "JUMP",
+    "JUMPI",
+    "PC",
+    "MSIZE",
+    "GAS",
+    "JUMPDEST",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "PUSH1",
+    "PUSH2",
+    "PUSH3",
+    "PUSH4",
+    "PUSH5",
+    "PUSH6",
+    "PUSH7",
+    "PUSH8",
+    "PUSH9",
+    "PUSH10",
+    "PUSH11",
+    "PUSH12",
+    "PUSH13",
+    "PUSH14",
+    "PUSH15",
+    "PUSH16",
+    "PUSH17",
+    "PUSH18",
+    "PUSH19",
+    "PUSH20",
+    "PUSH21",
+    "PUSH22",
+    "PUSH23",
+    "PUSH24",
+    "PUSH25",
+    "PUSH26",
+    "PUSH27",
+    "PUSH28",
+    "PUSH29",
+    "PUSH30",
+    "PUSH31",
+    "PUSH32",
+    "DUP1",
+    "DUP2",
+    "DUP3",
+    "DUP4",
+    "DUP5",
+    "DUP6",
+    "DUP7",
+    "DUP8",
+    "DUP9",
+    "DUP10",
+    "DUP11",
+    "DUP12",
+    "DUP13",
+    "DUP14",
+    "DUP15",
+    "DUP16",
+    "SWAP1",
+    "SWAP2",
+    "SWAP3",
+    "SWAP4",
+    "SWAP5",
+    "SWAP6",
+    "SWAP7",
+    "SWAP8",
+    "SWAP9",
+    "SWAP10",
+    "SWAP11",
+    "SWAP12",
+    "SWAP13",
+    "SWAP14",
+    "SWAP15",
+    "SWAP16",
+    "LOG0",
+    "LOG1",
+    "LOG2",
+    "LOG3",
+    "LOG4",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "CREATE",
+    "CALL",
+    "CALLCODE",
+    "RETURN",
+    "DELEGATECALL",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    "STATICCALL",
+    NULL,
+    NULL,
+    "REVERT",
+    "INVALID",
+    "SUICIDE",
+};
+
+const char* const* evmc_get_instruction_name_table()
+{
+    return names;
+}