Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/aquynh/capstone

This commit is contained in:
Nguyen Anh Quynh 2017-05-07 14:32:52 +08:00
parent 36fb9a2fff 1e28d29bb9
commit 31a2855012
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -397,7 +397,7 @@ uninstall:
clean:
rm -f $(LIBOBJ)
rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).*
rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).pc
rm -f $(PKGCFGF)
$(MAKE) -C cstool clean

5
arch/ARM/ARMInstPrinter.c
View File

@ -588,6 +588,11 @@ void ARM_printInst(MCInst *MI, SStream *O, void *Info)
MI->flat_insn->detail->arm.operands[MI->flat_insn->detail->arm.op_count].type = ARM_OP_REG;
MI->flat_insn->detail->arm.operands[MI->flat_insn->detail->arm.op_count].reg = MCOperand_getReg(MCInst_getOperand(MI, 0));
MI->flat_insn->detail->arm.op_count++;
// this instruction implicitly read/write SP register
MI->flat_insn->detail->regs_read[MI->flat_insn->detail->regs_read_count] = ARM_REG_SP;
MI->flat_insn->detail->regs_read_count++;
MI->flat_insn->detail->regs_write[MI->flat_insn->detail->regs_write_count] = ARM_REG_SP;
MI->flat_insn->detail->regs_write_count++;
}
SStream_concat0(O, "}");
return;

11
arch/X86/X86ATTInstPrinter.c
View File

@ -676,7 +676,7 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O)
MCOperand *DispSpec = MCInst_getOperand(MI, Op + X86_AddrDisp);
MCOperand *SegReg = MCInst_getOperand(MI, Op + X86_AddrSegmentReg);
uint64_t ScaleVal;
int reg;
int segreg;
if (MI->csh->detail) {
MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].type = X86_OP_MEM;
@ -689,11 +689,11 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O)
}
// If this has a segment register, print it.
reg = MCOperand_getReg(SegReg);
if (reg) {
segreg = MCOperand_getReg(SegReg);
if (segreg) {
_printOperand(MI, Op + X86_AddrSegmentReg, O);
if (MI->csh->detail) {
MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.segment = reg;
MI->flat_insn->detail->x86.operands[MI->flat_insn->detail->x86.op_count].mem.segment = segreg;
}
SStream_concat0(O, ":");
@ -728,7 +728,8 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O)
}
}
} else {
//SStream_concat0(O, "0");
if (segreg)
SStream_concat0(O, "0");
}
}

6
arch/X86/X86Disassembler.c
View File

@ -835,6 +835,12 @@ bool X86_getInstruction(csh ud, const uint8_t *code, size_t code_len,
result = (!translateInstruction(instr, &insn)) ? true : false;
if (result) {
// quick fix for #904. TODO: fix this properly in the next update
if (handle->mode & CS_MODE_64 &&
(instr->Opcode == X86_LES16rm || instr->Opcode == X86_LES32rm))
// LES is invalid in x64
return false;
instr->imm_size = insn.immSize;
if (handle->detail) {
update_pub_insn(instr->flat_insn, &insn, instr->x86_prefix);

3
arch/X86/X86DisassemblerDecoder.c
View File

@ -2133,6 +2133,9 @@ static bool checkPrefix(struct InternalInstruction *insn)
// invalid LOCK
return true;
// nop dword [rax]
case X86_NOOPL:
// DEC
case X86_DEC16m:
case X86_DEC32m: