MCInst_Init() is arch-independent

ydyyes · Jun 16, 2014 · 495295e · 495295e
1 parent 370b7d7
commit 495295e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/MCInst.c b/MCInst.c
@@ -10,16 +10,12 @@
 
 #define MCINST_CACHE (ARR_SIZE(mcInst->Operands) - 1)
 
-void MCInst_Init(cs_struct *handle, MCInst *inst)
-{
-	switch(handle->arch) {
-		default:
-			memset(inst, 0, sizeof(*inst));
-			break;
-		case CS_ARCH_X86:
-			inst->size = 0;
-			break;
-	}
+void MCInst_Init(MCInst *inst)
+{
+	inst->OpcodePub = 0;
+	inst->size = 0;
+
+	return;
 }
 
 void MCInst_clear(MCInst *inst)

diff --git a/MCInst.h b/MCInst.h
@@ -92,9 +92,9 @@ MCOperand *MCOperand_CreateImm1(MCInst *inst, int64_t Val);
 struct MCInst {
 	unsigned Opcode;
 	MCOperand Operands[34];
+	unsigned OpcodePub;
 	unsigned size;	// number of operands
 	cs_insn *flat_insn;	// insn to be exposed to public
-	unsigned OpcodePub;
 	uint64_t address;	// address of this insn
 	cs_struct *csh;	// save the main csh
 	uint8_t x86_imm_size;	// save immediate size to print immediate properly
@@ -105,7 +105,7 @@ struct MCInst {
 	uint8_t x86_prefix[4];
 };
 
-void MCInst_Init(cs_struct *handle, MCInst *inst);
+void MCInst_Init(MCInst *inst);
 
 void MCInst_clear(MCInst *inst);
 

diff --git a/arch/ARM/ARMInstPrinter.c b/arch/ARM/ARMInstPrinter.c
@@ -538,7 +538,7 @@ void ARM_printInst(MCInst *MI, SStream *O, void *Info)
 				    if (MCRegisterClass_contains(MRC, Reg)) {
 						MCInst NewMI;
 
-						MCInst_Init(MI->csh, &NewMI);
+						MCInst_Init(&NewMI);
 						MCInst_setOpcode(&NewMI, Opcode);
 
 						if (isStore)

diff --git a/cs.c b/cs.c
@@ -449,7 +449,7 @@ size_t cs_disasm_ex(csh ud, const uint8_t *buffer, size_t size, uint64_t offset,
 	insn_cache = total;
 
 	while (size > 0) {
-		MCInst_Init(handle, &mci);
+		MCInst_Init(&mci);
 		mci.csh = handle;
 
 		// relative branches need to know the address & size of current insn