commit c1dbc8a42ec7fe66407d5c1b7d260519fa999be7
author Travis Finkenauer <tmfink@users.noreply.github.com> Sun Oct 08 20:44:01 2017 -0400
committer Nguyen Anh Quynh <aquynh@gmail.com> Mon Oct 09 08:52:53 2017 +0800
tree 3d42464ef04969ae520b4dd3e873ada0d78cc339
parent 63913ef3f688abad0f70da3a35d906ba9d891b44

Mips: Fix selection of disasm handler (#1022)

arch/Mips/MipsModule.c

diff --git a/arch/Mips/MipsModule.c b/arch/Mips/MipsModule.c
index 6fbeffb..e5a1b9c 100644
--- a/arch/Mips/MipsModule.c
+++ b/arch/Mips/MipsModule.c
@@ -9,6 +9,16 @@
 #include "MipsInstPrinter.h"
 #include "MipsMapping.h"
 
+// Returns mode value with implied bits set
+static inline cs_mode updated_mode(cs_mode mode)
+{
+	if (mode & CS_MODE_MIPS32R6) {
+		mode |= CS_MODE_32;
+	}
+
+	return mode;
+}
+
 static cs_err init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
@@ -29,7 +39,12 @@
 	ud->insn_id = Mips_get_insn_id;
 	ud->insn_name = Mips_insn_name;
 	ud->group_name = Mips_group_name;
-	ud->disasm = Mips_getInstruction;
+
+	ud->mode = updated_mode(ud->mode);
+	if (ud->mode & CS_MODE_32)
+		ud->disasm = Mips_getInstruction;
+	else
+		ud->disasm = Mips64_getInstruction;
 
 	return CS_ERR_OK;
 }
@@ -37,6 +52,12 @@
 static cs_err option(cs_struct *handle, cs_opt_type type, size_t value)
 {
 	if (type == CS_OPT_MODE) {
+		value = updated_mode(value);
+		if (value & CS_MODE_32)
+			handle->disasm = Mips_getInstruction;
+		else
+			handle->disasm = Mips64_getInstruction;
+
 		handle->mode = (cs_mode)value;
 		handle->big_endian = ((handle->mode & CS_MODE_BIG_ENDIAN) != 0);
 		return CS_ERR_OK;