x86: add new instructions: FSETPM, SALC, GETSEC & INT1. bug reported …

…by Pancake
capstone-engine · Jan 19, 2014 · 9dfdae6 · 9dfdae6
1 parent 38c1322
commit 9dfdae6
Show file tree

Hide file tree

Showing 10 changed files with 29,793 additions and 29,715 deletions.
diff --git a/Makefile b/Makefile
@@ -47,6 +47,14 @@ LIBNAME = capstone
 LIBOBJ =
 LIBOBJ += cs.o utils.o SStream.o MCInstrDesc.o MCRegisterInfo.o
 
+ifneq (,$(findstring x86,$(CAPSTONE_ARCHS)))
+	CFLAGS += -DCAPSTONE_HAS_X86
+	LIBOBJ += arch/X86/X86DisassemblerDecoder.o
+	LIBOBJ += arch/X86/X86Disassembler.o
+	LIBOBJ += arch/X86/X86IntelInstPrinter.o
+	LIBOBJ += arch/X86/X86ATTInstPrinter.o
+	LIBOBJ += arch/X86/mapping.o arch/X86/module.o
+endif
 ifneq (,$(findstring arm,$(CAPSTONE_ARCHS)))
 	CFLAGS += -DCAPSTONE_HAS_ARM
 	LIBOBJ += arch/ARM/ARMDisassembler.o
@@ -68,14 +76,6 @@ ifneq (,$(findstring powerpc,$(CAPSTONE_ARCHS)))
 	LIBOBJ += arch/PowerPC/mapping.o
 	LIBOBJ += arch/PowerPC/module.o
 endif
-ifneq (,$(findstring x86,$(CAPSTONE_ARCHS)))
-	CFLAGS += -DCAPSTONE_HAS_X86
-	LIBOBJ += arch/X86/X86DisassemblerDecoder.o
-	LIBOBJ += arch/X86/X86Disassembler.o
-	LIBOBJ += arch/X86/X86IntelInstPrinter.o
-	LIBOBJ += arch/X86/X86ATTInstPrinter.o
-	LIBOBJ += arch/X86/mapping.o arch/X86/module.o
-endif
 ifneq (,$(findstring aarch64,$(CAPSTONE_ARCHS)))
 	CFLAGS += -DCAPSTONE_HAS_ARM64
 	LIBOBJ += arch/AArch64/AArch64BaseInfo.o

diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
@@ -446,7 +446,7 @@ void X86_ATT_printInst(MCInst *MI, SStream *OS, void *info)
 	//  OS << "\tlock\n";
 
 	// Try to print any aliases first.
-	if (printAliasInstr(MI, OS)) {
+	if (printAliasInstr(MI, OS, NULL)) {
 		char *mnem = cs_strdup(OS->buffer);
 		char *tab = strchr(mnem, '\t');
 		if (tab)