Add submodule dependency filesHEADmaster

Change-Id: Iaf8d18082d3991dec7c0ebbea540f092188eb4ec

9 files changed, 1084 insertions, 0 deletions

diff --git a/capstone/arch/EVM/EVMDisassembler.c b/capstone/arch/EVM/EVMDisassembler.c
new file mode 100644
index 000000000..23512dbae
--- /dev/null
+++ b/capstone/arch/EVM/EVMDisassembler.c
@@ -0,0 +1,379 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#include <string.h>
+#include <stddef.h> // offsetof macro
+                    // alternatively #include "../../utils.h" like everyone else
+
+#include "EVMDisassembler.h"
+#include "EVMMapping.h"
+
+static const short opcodes[256] = {
+	EVM_INS_STOP,
+	EVM_INS_ADD,
+	EVM_INS_MUL,
+	EVM_INS_SUB,
+	EVM_INS_DIV,
+	EVM_INS_SDIV,
+	EVM_INS_MOD,
+	EVM_INS_SMOD,
+	EVM_INS_ADDMOD,
+	EVM_INS_MULMOD,
+	EVM_INS_EXP,
+	EVM_INS_SIGNEXTEND,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_LT,
+	EVM_INS_GT,
+	EVM_INS_SLT,
+	EVM_INS_SGT,
+	EVM_INS_EQ,
+	EVM_INS_ISZERO,
+	EVM_INS_AND,
+	EVM_INS_OR,
+	EVM_INS_XOR,
+	EVM_INS_NOT,
+	EVM_INS_BYTE,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_SHA3,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_ADDRESS,
+	EVM_INS_BALANCE,
+	EVM_INS_ORIGIN,
+	EVM_INS_CALLER,
+	EVM_INS_CALLVALUE,
+	EVM_INS_CALLDATALOAD,
+	EVM_INS_CALLDATASIZE,
+	EVM_INS_CALLDATACOPY,
+	EVM_INS_CODESIZE,
+	EVM_INS_CODECOPY,
+	EVM_INS_GASPRICE,
+	EVM_INS_EXTCODESIZE,
+	EVM_INS_EXTCODECOPY,
+	EVM_INS_RETURNDATASIZE,
+	EVM_INS_RETURNDATACOPY,
+	-1,
+	EVM_INS_BLOCKHASH,
+	EVM_INS_COINBASE,
+	EVM_INS_TIMESTAMP,
+	EVM_INS_NUMBER,
+	EVM_INS_DIFFICULTY,
+	EVM_INS_GASLIMIT,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_POP,
+	EVM_INS_MLOAD,
+	EVM_INS_MSTORE,
+	EVM_INS_MSTORE8,
+	EVM_INS_SLOAD,
+	EVM_INS_SSTORE,
+	EVM_INS_JUMP,
+	EVM_INS_JUMPI,
+	EVM_INS_PC,
+	EVM_INS_MSIZE,
+	EVM_INS_GAS,
+	EVM_INS_JUMPDEST,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_PUSH1,
+	EVM_INS_PUSH2,
+	EVM_INS_PUSH3,
+	EVM_INS_PUSH4,
+	EVM_INS_PUSH5,
+	EVM_INS_PUSH6,
+	EVM_INS_PUSH7,
+	EVM_INS_PUSH8,
+	EVM_INS_PUSH9,
+	EVM_INS_PUSH10,
+	EVM_INS_PUSH11,
+	EVM_INS_PUSH12,
+	EVM_INS_PUSH13,
+	EVM_INS_PUSH14,
+	EVM_INS_PUSH15,
+	EVM_INS_PUSH16,
+	EVM_INS_PUSH17,
+	EVM_INS_PUSH18,
+	EVM_INS_PUSH19,
+	EVM_INS_PUSH20,
+	EVM_INS_PUSH21,
+	EVM_INS_PUSH22,
+	EVM_INS_PUSH23,
+	EVM_INS_PUSH24,
+	EVM_INS_PUSH25,
+	EVM_INS_PUSH26,
+	EVM_INS_PUSH27,
+	EVM_INS_PUSH28,
+	EVM_INS_PUSH29,
+	EVM_INS_PUSH30,
+	EVM_INS_PUSH31,
+	EVM_INS_PUSH32,
+	EVM_INS_DUP1,
+	EVM_INS_DUP2,
+	EVM_INS_DUP3,
+	EVM_INS_DUP4,
+	EVM_INS_DUP5,
+	EVM_INS_DUP6,
+	EVM_INS_DUP7,
+	EVM_INS_DUP8,
+	EVM_INS_DUP9,
+	EVM_INS_DUP10,
+	EVM_INS_DUP11,
+	EVM_INS_DUP12,
+	EVM_INS_DUP13,
+	EVM_INS_DUP14,
+	EVM_INS_DUP15,
+	EVM_INS_DUP16,
+	EVM_INS_SWAP1,
+	EVM_INS_SWAP2,
+	EVM_INS_SWAP3,
+	EVM_INS_SWAP4,
+	EVM_INS_SWAP5,
+	EVM_INS_SWAP6,
+	EVM_INS_SWAP7,
+	EVM_INS_SWAP8,
+	EVM_INS_SWAP9,
+	EVM_INS_SWAP10,
+	EVM_INS_SWAP11,
+	EVM_INS_SWAP12,
+	EVM_INS_SWAP13,
+	EVM_INS_SWAP14,
+	EVM_INS_SWAP15,
+	EVM_INS_SWAP16,
+	EVM_INS_LOG0,
+	EVM_INS_LOG1,
+	EVM_INS_LOG2,
+	EVM_INS_LOG3,
+	EVM_INS_LOG4,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_CREATE,
+	EVM_INS_CALL,
+	EVM_INS_CALLCODE,
+	EVM_INS_RETURN,
+	EVM_INS_DELEGATECALL,
+	EVM_INS_CALLBLACKBOX,
+	-1,
+	-1,
+	-1,
+	-1,
+	EVM_INS_STATICCALL,
+	-1,
+	-1,
+	EVM_INS_REVERT,
+	-1,
+	EVM_INS_SUICIDE,
+};
+
+bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
+	MCInst *MI, uint16_t *size, uint64_t address, void *inst_info)
+{
+	unsigned char opcode;
+
+	if (code_len == 0)
+		return false;
+
+	opcode = code[0];
+	if (opcodes[opcode] == -1) {
+		// invalid opcode
+		return false;
+	}
+
+	// valid opcode
+	MI->address = address;
+	MI->OpcodePub = MI->Opcode = opcode;
+
+	if (opcode >= EVM_INS_PUSH1 && opcode <= EVM_INS_PUSH32) {
+		unsigned char len = (opcode - EVM_INS_PUSH1 + 1);
+		if (code_len < 1 + len) {
+			// not enough data
+			return false;
+		}
+
+		*size = 1 + len;
+		memcpy(MI->evm_data, code + 1, len);
+	} else
+		*size = 1;
+
+	if (MI->flat_insn->detail) {
+		memset(MI->flat_insn->detail, 0, offsetof(cs_detail, evm)+sizeof(cs_evm));
+		EVM_get_insn_id((cs_struct *)ud, MI->flat_insn, opcode);
+
+		if (MI->flat_insn->detail->evm.pop) {
+			MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STACK_READ;
+			MI->flat_insn->detail->groups_count++;
+		}
+
+		if (MI->flat_insn->detail->evm.push) {
+			MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STACK_WRITE;
+			MI->flat_insn->detail->groups_count++;
+		}
+
+		// setup groups
+		switch(opcode) {
+			default:
+				break;
+			case EVM_INS_ADD:
+			case EVM_INS_MUL:
+			case EVM_INS_SUB:
+			case EVM_INS_DIV:
+			case EVM_INS_SDIV:
+			case EVM_INS_MOD:
+			case EVM_INS_SMOD:
+			case EVM_INS_ADDMOD:
+			case EVM_INS_MULMOD:
+			case EVM_INS_EXP:
+			case EVM_INS_SIGNEXTEND:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MATH;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_MSTORE:
+			case EVM_INS_MSTORE8:
+			case EVM_INS_CALLDATACOPY:
+			case EVM_INS_CODECOPY:
+			case EVM_INS_EXTCODECOPY:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MEM_WRITE;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_MLOAD:
+			case EVM_INS_CREATE:
+			case EVM_INS_CALL:
+			case EVM_INS_CALLCODE:
+			case EVM_INS_RETURN:
+			case EVM_INS_DELEGATECALL:
+			case EVM_INS_REVERT:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MEM_READ;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_SSTORE:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STORE_WRITE;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_SLOAD:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STORE_READ;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_JUMP:
+			case EVM_INS_JUMPI:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_JUMP;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+			case EVM_INS_STOP:
+			case EVM_INS_SUICIDE:
+				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_HALT;
+				MI->flat_insn->detail->groups_count++;
+				break;
+
+		}
+	}
+
+	return true;
+}
diff --git a/capstone/arch/EVM/EVMDisassembler.h b/capstone/arch/EVM/EVMDisassembler.h
new file mode 100644
index 000000000..afd7e4693
--- /dev/null
+++ b/capstone/arch/EVM/EVMDisassembler.h
@@ -0,0 +1,12 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#ifndef CS_EVMDISASSEMBLER_H
+#define CS_EVMDISASSEMBLER_H
+
+#include "../../MCInst.h"
+
+bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
+		MCInst *instr, uint16_t *size, uint64_t address, void *info);
+
+#endif
diff --git a/capstone/arch/EVM/EVMInstPrinter.c b/capstone/arch/EVM/EVMInstPrinter.c
new file mode 100644
index 000000000..7f452800e
--- /dev/null
+++ b/capstone/arch/EVM/EVMInstPrinter.c
@@ -0,0 +1,20 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#include "EVMInstPrinter.h"
+#include "EVMMapping.h"
+
+
+void EVM_printInst(MCInst *MI, struct SStream *O, void *PrinterInfo)
+{
+	SStream_concat(O, EVM_insn_name((csh)MI->csh, MI->Opcode));
+
+	if (MI->Opcode >= EVM_INS_PUSH1 && MI->Opcode <= EVM_INS_PUSH32) {
+		unsigned int i;
+
+		SStream_concat0(O, "\t");
+		for (i = 0; i < MI->Opcode - EVM_INS_PUSH1 + 1; i++) {
+			SStream_concat(O, "%02x", MI->evm_data[i]);
+		}
+	}
+}
diff --git a/capstone/arch/EVM/EVMInstPrinter.h b/capstone/arch/EVM/EVMInstPrinter.h
new file mode 100644
index 000000000..2f1ac2cf9
--- /dev/null
+++ b/capstone/arch/EVM/EVMInstPrinter.h
@@ -0,0 +1,17 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#ifndef CS_EVMINSTPRINTER_H
+#define CS_EVMINSTPRINTER_H
+
+
+#include "capstone/capstone.h"
+#include "../../MCInst.h"
+#include "../../SStream.h"
+#include "../../cs_priv.h"
+
+struct SStream;
+
+void EVM_printInst(MCInst *MI, struct SStream *O, void *Info);
+
+#endif
diff --git a/capstone/arch/EVM/EVMMapping.c b/capstone/arch/EVM/EVMMapping.c
new file mode 100644
index 000000000..bbd8d41c3
--- /dev/null
+++ b/capstone/arch/EVM/EVMMapping.c
@@ -0,0 +1,344 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#ifdef CAPSTONE_HAS_EVM
+
+#include <string.h>
+
+#include "../../cs_priv.h"
+#include "../../utils.h"
+
+#include "EVMMapping.h"
+
+#ifndef CAPSTONE_DIET
+static const cs_evm insns[256] = {
+#include "EVMMappingInsn.inc"
+};
+#endif
+
+// look for @id in @insns, given its size in @max.
+// return -1 if not found
+static int evm_insn_find(const cs_evm *insns, unsigned int max, unsigned int id)
+{
+	if (id >= max)
+		return -1;
+
+	if (insns[id].fee == 0xffffffff)
+		// unused opcode
+		return -1;
+
+	return (int)id;
+}
+
+// fill in details
+void EVM_get_insn_id(cs_struct *h, cs_insn *insn, unsigned int id)
+{
+	insn->id = id;
+#ifndef CAPSTONE_DIET
+	if (evm_insn_find(insns, ARR_SIZE(insns), id) > 0) {
+		if (h->detail) {
+			memcpy(&insn->detail->evm, &insns[id], sizeof(insns[id]));
+		}
+	}
+#endif
+}
+
+#ifndef CAPSTONE_DIET
+static const name_map insn_name_maps[256] = {
+	{ EVM_INS_STOP, "stop" },
+	{ EVM_INS_ADD, "add" },
+	{ EVM_INS_MUL, "mul" },
+	{ EVM_INS_SUB, "sub" },
+	{ EVM_INS_DIV, "div" },
+	{ EVM_INS_SDIV, "sdiv" },
+	{ EVM_INS_MOD, "mod" },
+	{ EVM_INS_SMOD, "smod" },
+	{ EVM_INS_ADDMOD, "addmod" },
+	{ EVM_INS_MULMOD, "mulmod" },
+	{ EVM_INS_EXP, "exp" },
+	{ EVM_INS_SIGNEXTEND, "signextend" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_LT, "lt" },
+	{ EVM_INS_GT, "gt" },
+	{ EVM_INS_SLT, "slt" },
+	{ EVM_INS_SGT, "sgt" },
+	{ EVM_INS_EQ, "eq" },
+	{ EVM_INS_ISZERO, "iszero" },
+	{ EVM_INS_AND, "and" },
+	{ EVM_INS_OR, "or" },
+	{ EVM_INS_XOR, "xor" },
+	{ EVM_INS_NOT, "not" },
+	{ EVM_INS_BYTE, "byte" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_SHA3, "sha3" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_ADDRESS, "address" },
+	{ EVM_INS_BALANCE, "balance" },
+	{ EVM_INS_ORIGIN, "origin" },
+	{ EVM_INS_CALLER, "caller" },
+	{ EVM_INS_CALLVALUE, "callvalue" },
+	{ EVM_INS_CALLDATALOAD, "calldataload" },
+	{ EVM_INS_CALLDATASIZE, "calldatasize" },
+	{ EVM_INS_CALLDATACOPY, "calldatacopy" },
+	{ EVM_INS_CODESIZE, "codesize" },
+	{ EVM_INS_CODECOPY, "codecopy" },
+	{ EVM_INS_GASPRICE, "gasprice" },
+	{ EVM_INS_EXTCODESIZE, "extcodesize" },
+	{ EVM_INS_EXTCODECOPY, "extcodecopy" },
+	{ EVM_INS_RETURNDATASIZE, "returndatasize" },
+	{ EVM_INS_RETURNDATACOPY, "returndatacopy" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_BLOCKHASH, "blockhash" },
+	{ EVM_INS_COINBASE, "coinbase" },
+	{ EVM_INS_TIMESTAMP, "timestamp" },
+	{ EVM_INS_NUMBER, "number" },
+	{ EVM_INS_DIFFICULTY, "difficulty" },
+	{ EVM_INS_GASLIMIT, "gaslimit" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_POP, "pop" },
+	{ EVM_INS_MLOAD, "mload" },
+	{ EVM_INS_MSTORE, "mstore" },
+	{ EVM_INS_MSTORE8, "mstore8" },
+	{ EVM_INS_SLOAD, "sload" },
+	{ EVM_INS_SSTORE, "sstore" },
+	{ EVM_INS_JUMP, "jump" },
+	{ EVM_INS_JUMPI, "jumpi" },
+	{ EVM_INS_PC, "pc" },
+	{ EVM_INS_MSIZE, "msize" },
+	{ EVM_INS_GAS, "gas" },
+	{ EVM_INS_JUMPDEST, "jumpdest" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_PUSH1, "push1" },
+	{ EVM_INS_PUSH2, "push2" },
+	{ EVM_INS_PUSH3, "push3" },
+	{ EVM_INS_PUSH4, "push4" },
+	{ EVM_INS_PUSH5, "push5" },
+	{ EVM_INS_PUSH6, "push6" },
+	{ EVM_INS_PUSH7, "push7" },
+	{ EVM_INS_PUSH8, "push8" },
+	{ EVM_INS_PUSH9, "push9" },
+	{ EVM_INS_PUSH10, "push10" },
+	{ EVM_INS_PUSH11, "push11" },
+	{ EVM_INS_PUSH12, "push12" },
+	{ EVM_INS_PUSH13, "push13" },
+	{ EVM_INS_PUSH14, "push14" },
+	{ EVM_INS_PUSH15, "push15" },
+	{ EVM_INS_PUSH16, "push16" },
+	{ EVM_INS_PUSH17, "push17" },
+	{ EVM_INS_PUSH18, "push18" },
+	{ EVM_INS_PUSH19, "push19" },
+	{ EVM_INS_PUSH20, "push20" },
+	{ EVM_INS_PUSH21, "push21" },
+	{ EVM_INS_PUSH22, "push22" },
+	{ EVM_INS_PUSH23, "push23" },
+	{ EVM_INS_PUSH24, "push24" },
+	{ EVM_INS_PUSH25, "push25" },
+	{ EVM_INS_PUSH26, "push26" },
+	{ EVM_INS_PUSH27, "push27" },
+	{ EVM_INS_PUSH28, "push28" },
+	{ EVM_INS_PUSH29, "push29" },
+	{ EVM_INS_PUSH30, "push30" },
+	{ EVM_INS_PUSH31, "push31" },
+	{ EVM_INS_PUSH32, "push32" },
+	{ EVM_INS_DUP1, "dup1" },
+	{ EVM_INS_DUP2, "dup2" },
+	{ EVM_INS_DUP3, "dup3" },
+	{ EVM_INS_DUP4, "dup4" },
+	{ EVM_INS_DUP5, "dup5" },
+	{ EVM_INS_DUP6, "dup6" },
+	{ EVM_INS_DUP7, "dup7" },
+	{ EVM_INS_DUP8, "dup8" },
+	{ EVM_INS_DUP9, "dup9" },
+	{ EVM_INS_DUP10, "dup10" },
+	{ EVM_INS_DUP11, "dup11" },
+	{ EVM_INS_DUP12, "dup12" },
+	{ EVM_INS_DUP13, "dup13" },
+	{ EVM_INS_DUP14, "dup14" },
+	{ EVM_INS_DUP15, "dup15" },
+	{ EVM_INS_DUP16, "dup16" },
+	{ EVM_INS_SWAP1, "swap1" },
+	{ EVM_INS_SWAP2, "swap2" },
+	{ EVM_INS_SWAP3, "swap3" },
+	{ EVM_INS_SWAP4, "swap4" },
+	{ EVM_INS_SWAP5, "swap5" },
+	{ EVM_INS_SWAP6, "swap6" },
+	{ EVM_INS_SWAP7, "swap7" },
+	{ EVM_INS_SWAP8, "swap8" },
+	{ EVM_INS_SWAP9, "swap9" },
+	{ EVM_INS_SWAP10, "swap10" },
+	{ EVM_INS_SWAP11, "swap11" },
+	{ EVM_INS_SWAP12, "swap12" },
+	{ EVM_INS_SWAP13, "swap13" },
+	{ EVM_INS_SWAP14, "swap14" },
+	{ EVM_INS_SWAP15, "swap15" },
+	{ EVM_INS_SWAP16, "swap16" },
+	{ EVM_INS_LOG0, "log0" },
+	{ EVM_INS_LOG1, "log1" },
+	{ EVM_INS_LOG2, "log2" },
+	{ EVM_INS_LOG3, "log3" },
+	{ EVM_INS_LOG4, "log4" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_CREATE, "create" },
+	{ EVM_INS_CALL, "call" },
+	{ EVM_INS_CALLCODE, "callcode" },
+	{ EVM_INS_RETURN, "return" },
+	{ EVM_INS_DELEGATECALL, "delegatecall" },
+	{ EVM_INS_CALLBLACKBOX, "callblackbox" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_STATICCALL, "staticcall" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_REVERT, "revert" },
+	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_SUICIDE, "suicide" },
+};
+#endif
+
+const char *EVM_insn_name(csh handle, unsigned int id)
+{
+#ifndef CAPSTONE_DIET
+	if (id >= ARR_SIZE(insn_name_maps))
+		return NULL;
+	else
+		return insn_name_maps[id].name;
+#else
+	return NULL;
+#endif
+}
+
+#ifndef CAPSTONE_DIET
+static const name_map group_name_maps[] = {
+	// generic groups
+	{ EVM_GRP_INVALID, NULL },
+	{ EVM_GRP_JUMP,	"jump" },
+	// special groups
+	{ EVM_GRP_MATH,	"math" },
+	{ EVM_GRP_STACK_WRITE, "stack_write" },
+	{ EVM_GRP_STACK_READ, "stack_read" },
+	{ EVM_GRP_MEM_WRITE, "mem_write" },
+	{ EVM_GRP_MEM_READ, "mem_read" },
+	{ EVM_GRP_STORE_WRITE, "store_write" },
+	{ EVM_GRP_STORE_READ, "store_read" },
+	{ EVM_GRP_HALT, "halt" },
+};
+#endif
+
+const char *EVM_group_name(csh handle, unsigned int id)
+{
+#ifndef CAPSTONE_DIET
+	return id2name(group_name_maps, ARR_SIZE(group_name_maps), id);
+#else
+	return NULL;
+#endif
+}
+#endif
diff --git a/capstone/arch/EVM/EVMMapping.h b/capstone/arch/EVM/EVMMapping.h
new file mode 100644
index 000000000..576e00419
--- /dev/null
+++ b/capstone/arch/EVM/EVMMapping.h
@@ -0,0 +1,8 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#include <capstone/capstone.h>
+
+void EVM_get_insn_id(cs_struct *h, cs_insn *insn, unsigned int id);
+const char *EVM_insn_name(csh handle, unsigned int id);
+const char *EVM_group_name(csh handle, unsigned int id);
diff --git a/capstone/arch/EVM/EVMMappingInsn.inc b/capstone/arch/EVM/EVMMappingInsn.inc
new file mode 100644
index 000000000..e106ccaca
--- /dev/null
+++ b/capstone/arch/EVM/EVMMappingInsn.inc
@@ -0,0 +1,259 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+{ 0, 0, 0 }, // STOP
+{ 2, 1, 3 }, // ADD
+{ 2, 1, 5 }, // MUL
+{ 2, 1, 3 }, // SUB
+{ 2, 1, 5 }, // DIV
+{ 2, 1, 5 }, // SDIV
+{ 2, 1, 5 }, // MOD
+{ 2, 1, 5 }, // SMOD
+{ 3, 1, 8 }, // ADDMOD
+{ 3, 1, 8 }, // MULMOD
+{ 2, 1, 10 }, // EXP
+{ 2, 1, 5 }, // SIGNEXTEND
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 2, 1, 3 }, // LT
+{ 2, 1, 3 }, // GT
+{ 2, 1, 3 }, // SLT
+{ 2, 1, 3 }, // SGT
+{ 2, 1, 3 }, // EQ
+{ 1, 1, 3 }, // ISZERO
+{ 2, 1, 3 }, // AND
+{ 2, 1, 3 }, // OR
+{ 2, 1, 3 }, // XOR
+{ 1, 1, 3 }, // NOT
+{ 2, 1, 3 }, // BYTE
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 2, 1, 30 }, // SHA3
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 1, 2 }, // ADDRESS
+{ 1, 1, 20 }, // BALANCE
+{ 0, 1, 2 }, // ORIGIN
+{ 0, 1, 2 }, // CALLER
+{ 0, 1, 2 }, // CALLVALUE
+{ 1, 1, 3 }, // CALLDATALOAD
+{ 0, 1, 2 }, // CALLDATASIZE
+{ 3, 0, 3 }, // CALLDATACOPY
+{ 0, 1, 2 }, // CODESIZE
+{ 3, 0, 3 }, // CODECOPY
+{ 0, 1, 2 }, // GASPRICE
+{ 1, 1, 20 }, // EXTCODESIZE
+{ 4, 0, 20 }, // EXTCODECOPY
+{ 0, 1, 2 }, // RETURNDATASIZE
+{ 3, 0, 3 }, // RETURNDATACOPY
+{ 0, 0, 0xffffffff }, // unused
+{ 1, 1, 20 }, // BLOCKHASH
+{ 0, 1, 2 }, // COINBASE
+{ 0, 1, 2 }, // TIMESTAMP
+{ 0, 1, 2 }, // NUMBER
+{ 0, 1, 2 }, // DIFFICULTY
+{ 0, 1, 2 }, // GASLIMIT
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 1, 0, 2 }, // POP
+{ 1, 1, 3 }, // MLOAD
+{ 2, 0, 3 }, // MSTORE
+{ 2, 0, 3 }, // MSTORE8
+{ 1, 1, 50 }, // SLOAD
+{ 2, 0, 0 }, // SSTORE
+{ 1, 0, 8 }, // JUMP
+{ 2, 0, 10 }, // JUMPI
+{ 0, 1, 2 }, // GETPC
+{ 0, 1, 2 }, // MSIZE
+{ 0, 1, 2 }, // GAS
+{ 0, 0, 1 }, // JUMPDEST
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 1, 3 }, // PUSH1
+{ 0, 1, 3 }, // PUSH2
+{ 0, 1, 3 }, // PUSH3
+{ 0, 1, 3 }, // PUSH4
+{ 0, 1, 3 }, // PUSH5
+{ 0, 1, 3 }, // PUSH6
+{ 0, 1, 3 }, // PUSH7
+{ 0, 1, 3 }, // PUSH8
+{ 0, 1, 3 }, // PUSH9
+{ 0, 1, 3 }, // PUSH10
+{ 0, 1, 3 }, // PUSH11
+{ 0, 1, 3 }, // PUSH12
+{ 0, 1, 3 }, // PUSH13
+{ 0, 1, 3 }, // PUSH14
+{ 0, 1, 3 }, // PUSH15
+{ 0, 1, 3 }, // PUSH16
+{ 0, 1, 3 }, // PUSH17
+{ 0, 1, 3 }, // PUSH18
+{ 0, 1, 3 }, // PUSH19
+{ 0, 1, 3 }, // PUSH20
+{ 0, 1, 3 }, // PUSH21
+{ 0, 1, 3 }, // PUSH22
+{ 0, 1, 3 }, // PUSH23
+{ 0, 1, 3 }, // PUSH24
+{ 0, 1, 3 }, // PUSH25
+{ 0, 1, 3 }, // PUSH26
+{ 0, 1, 3 }, // PUSH27
+{ 0, 1, 3 }, // PUSH28
+{ 0, 1, 3 }, // PUSH29
+{ 0, 1, 3 }, // PUSH30
+{ 0, 1, 3 }, // PUSH31
+{ 0, 1, 3 }, // PUSH32
+{ 1, 2, 3 }, // DUP1
+{ 2, 3, 3 }, // DUP2
+{ 3, 4, 3 }, // DUP3
+{ 4, 5, 3 }, // DUP4
+{ 5, 6, 3 }, // DUP5
+{ 6, 7, 3 }, // DUP6
+{ 7, 8, 3 }, // DUP7
+{ 8, 9, 3 }, // DUP8
+{ 9, 10, 3 }, // DUP9
+{ 10, 11, 3 }, // DUP10
+{ 11, 12, 3 }, // DUP11
+{ 12, 13, 3 }, // DUP12
+{ 13, 14, 3 }, // DUP13
+{ 14, 15, 3 }, // DUP14
+{ 15, 16, 3 }, // DUP15
+{ 16, 17, 3 }, // DUP16
+{ 2, 2, 3 }, // SWAP1
+{ 3, 3, 3 }, // SWAP2
+{ 4, 4, 3 }, // SWAP3
+{ 5, 5, 3 }, // SWAP4
+{ 6, 6, 3 }, // SWAP5
+{ 7, 7, 3 }, // SWAP6
+{ 8, 8, 3 }, // SWAP7
+{ 9, 9, 3 }, // SWAP8
+{ 10, 10, 3 }, // SWAP9
+{ 11, 11, 3 }, // SWAP10
+{ 12, 12, 3 }, // SWAP11
+{ 13, 13, 3 }, // SWAP12
+{ 14, 14, 3 }, // SWAP13
+{ 15, 15, 3 }, // SWAP14
+{ 16, 16, 3 }, // SWAP15
+{ 17, 17, 3 }, // SWAP16
+{ 2, 0, 375 }, // LOG0
+{ 3, 0, 750 }, // LOG1
+{ 4, 0, 1125 }, // LOG2
+{ 5, 0, 1500 }, // LOG3
+{ 6, 0, 1875 }, // LOG4
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 3, 1, 32000 }, // CREATE
+{ 7, 1, 40 }, // CALL
+{ 7, 1, 40 }, // CALLCODE
+{ 2, 0, 0 }, // RETURN
+{ 6, 1, 40 }, // DELEGATECALL
+{ 7, 1, 40 }, // CALLBLACKBOX
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 6, 1, 40 }, // STATICCALL
+{ 0, 0, 0xffffffff }, // unused
+{ 0, 0, 0xffffffff }, // unused
+{ 2, 0, 0 }, // REVERT
+{ 0, 0, 0xffffffff }, // unused
+{ 1, 0, 0 }, // SUICIDE
diff --git a/capstone/arch/EVM/EVMModule.c b/capstone/arch/EVM/EVMModule.c
new file mode 100644
index 000000000..1ba567736
--- /dev/null
+++ b/capstone/arch/EVM/EVMModule.c
@@ -0,0 +1,33 @@
+/* Capstone Disassembly Engine */
+/* By Nguyen Anh Quynh, 2018 */
+
+#ifdef CAPSTONE_HAS_EVM
+
+#include "../../cs_priv.h"
+#include "EVMDisassembler.h"
+#include "EVMInstPrinter.h"
+#include "EVMMapping.h"
+#include "EVMModule.h"
+
+cs_err EVM_global_init(cs_struct *ud)
+{
+	// verify if requested mode is valid
+	if (ud->mode)
+		return CS_ERR_MODE;
+
+	ud->printer = EVM_printInst;
+	ud->printer_info = NULL;
+	ud->insn_id = EVM_get_insn_id;
+	ud->insn_name = EVM_insn_name;
+	ud->group_name = EVM_group_name;
+	ud->disasm = EVM_getInstruction;
+
+	return CS_ERR_OK;
+}
+
+cs_err EVM_option(cs_struct *handle, cs_opt_type type, size_t value)
+{
+	return CS_ERR_OK;
+}
+
+#endif
diff --git a/capstone/arch/EVM/EVMModule.h b/capstone/arch/EVM/EVMModule.h
new file mode 100644
index 000000000..0bc6d0a58
--- /dev/null
+++ b/capstone/arch/EVM/EVMModule.h
@@ -0,0 +1,12 @@
+/* Capstone Disassembly Engine */
+/* By Travis Finkenauer <tmfinken@gmail.com>, 2018 */
+
+#ifndef CS_EVM_MODULE_H
+#define CS_EVM_MODULE_H
+
+#include "../../utils.h"
+
+cs_err EVM_global_init(cs_struct *ud);
+cs_err EVM_option(cs_struct *handle, cs_opt_type type, size_t value);
+
+#endif