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

Merge branch 'master' into next

This commit is contained in:
Nguyen Anh Quynh 2018-12-20 02:58:23 +08:00
parent 96ebb79ef1 87258d06af
commit 44b2c29ab7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -429,7 +429,7 @@ endif
uninstall: uninstall:
rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME) rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).* rm -f $(LIBDIR)/lib$(LIBNAME).*
rm -f $(PKGCFGDIR)/$(LIBNAME).pc rm -f $(PKGCFGDIR)/$(LIBNAME).pc
rm -f $(BINDIR)/cstool rm -f $(BINDIR)/cstool

7
arch/X86/X86Disassembler.c
View File

@ -996,13 +996,14 @@ bool X86_getInstruction(csh ud, const uint8_t *code, size_t code_len,
} }
return false; return false;
case 4: { case 4: {
if (handle->mode != CS_MODE_16) {
unsigned char b1 = 0, b2 = 0, b3 = 0, b4 = 0; unsigned char b1 = 0, b2 = 0, b3 = 0, b4 = 0;
reader(&info, &b1, address); reader(&info, &b1, address);
reader(&info, &b2, address + 1); reader(&info, &b2, address + 1);
reader(&info, &b3, address + 2); reader(&info, &b3, address + 2);
reader(&info, &b4, address + 3); reader(&info, &b4, address + 3);
if (handle->mode & CS_MODE_64) {
if (b1 == 0xf3 && b2 == 0x0f && b3 == 0x1e && b4 == 0xfa) { if (b1 == 0xf3 && b2 == 0x0f && b3 == 0x1e && b4 == 0xfa) {
instr->Opcode = X86_ENDBR64; instr->Opcode = X86_ENDBR64;
instr->OpcodePub = X86_INS_ENDBR64; instr->OpcodePub = X86_INS_ENDBR64;
@ -1014,9 +1015,7 @@ bool X86_getInstruction(csh ud, const uint8_t *code, size_t code_len,
instr->flat_insn->detail->x86.opcode[3] = b4; instr->flat_insn->detail->x86.opcode[3] = b4;
} }
return true; return true;
} } else if (b1 == 0xf3 && b2 == 0x0f && b3 == 0x1e && b4 == 0xfb) {
} else if (handle->mode & CS_MODE_32) {
if (b1 == 0xf3 && b2 == 0x0f && b3 == 0x1e && b4 == 0xfb) {
instr->Opcode = X86_ENDBR32; instr->Opcode = X86_ENDBR32;
instr->OpcodePub = X86_INS_ENDBR32; instr->OpcodePub = X86_INS_ENDBR32;
strncpy(instr->assembly, "endbr32", 8); strncpy(instr->assembly, "endbr32", 8);