Magic-Mirror/capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/capstone.git synced 2024-11-23 13:39:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/radare/capstone into test2

Browse Source
This commit is contained in:
Nguyen Anh Quynh 2015-02-28 08:29:21 +08:00
commit 96ee76fa2a
50 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCInst.h
View File

@ -21,7 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "include/capstone.h" #include "include/capstone/capstone.h"
typedef struct MCInst MCInst; typedef struct MCInst MCInst;
typedef struct cs_struct cs_struct; typedef struct cs_struct cs_struct;

2
MCInstrDesc.h
View File

@ -19,7 +19,7 @@
#define CS_LLVM_MC_MCINSTRDESC_H #define CS_LLVM_MC_MCINSTRDESC_H
#include <stdint.h> #include <stdint.h>
#include "include/platform.h" #include "capstone/platform.h"
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Machine Operand Flags and Description // Machine Operand Flags and Description

2
MCRegisterInfo.h
View File

@ -20,7 +20,7 @@
#define CS_LLVM_MC_MCREGISTERINFO_H #define CS_LLVM_MC_MCREGISTERINFO_H
#include <stdint.h> #include <stdint.h>
#include "include/platform.h" #include "capstone/platform.h"
/// An unsigned integer type large enough to represent all physical registers, /// An unsigned integer type large enough to represent all physical registers,
/// but not necessarily virtual registers. /// but not necessarily virtual registers.

6
Makefile
View File

@ -237,7 +237,7 @@ LIBOBJ += $(OBJDIR)/MCInst.o
PKGCFGDIR ?= $(LIBDATADIR)/pkgconfig PKGCFGDIR ?= $(LIBDATADIR)/pkgconfig
API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}') API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}')
VERSION_EXT = VERSION_EXT =
IS_APPLE := $(shell $(CC) -dM -E - < /dev/null | grep __apple_build_version__ | wc -l | tr -d " ") IS_APPLE := $(shell $(CC) -dM -E - < /dev/null | grep __apple_build_version__ | wc -l | tr -d " ")
@ -374,7 +374,7 @@ ifeq ($(CAPSTONE_STATIC),yes)
$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR) $(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
endif endif
mkdir -p $(INCDIR)/$(LIBNAME) mkdir -p $(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME) $(INSTALL_DATA) include/capstone/*.h $(INCDIR)/$(LIBNAME)
mkdir -p $(PKGCFGDIR) mkdir -p $(PKGCFGDIR)
$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/ $(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/
@ -454,7 +454,7 @@ define generate-pkgcfg
echo 'Description: Capstone disassembly engine' >> $(PKGCFGF) echo 'Description: Capstone disassembly engine' >> $(PKGCFGF)
echo 'Version: $(PKG_VERSION)' >> $(PKGCFGF) echo 'Version: $(PKG_VERSION)' >> $(PKGCFGF)
echo 'libdir=$(LIBDIR)' >> $(PKGCFGF) echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF) echo 'includedir=$(INCDIR)' >> $(PKGCFGF)
echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF) echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF)
echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF) echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
echo 'Cflags: -I$${includedir}' >> $(PKGCFGF) echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)

2
arch/AArch64/AArch64Disassembler.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/AArch64/AArch64Mapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_ARM64_MAP_H #ifndef CS_ARM64_MAP_H
#define CS_ARM64_MAP_H #define CS_ARM64_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *AArch64_reg_name(csh handle, unsigned int reg); const char *AArch64_reg_name(csh handle, unsigned int reg);

2
arch/ARM/ARMAddressingModes.h
View File

@ -17,7 +17,7 @@
#ifndef CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H #ifndef CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H
#define CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H #define CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H
#include "../../include/platform.h" #include "capstone/platform.h"
#include "../../MathExtras.h" #include "../../MathExtras.h"
/// ARM_AM - ARM Addressing Mode Stuff /// ARM_AM - ARM Addressing Mode Stuff

2
arch/ARM/ARMBaseInfo.h
View File

@ -20,7 +20,7 @@
#ifndef CS_ARMBASEINFO_H #ifndef CS_ARMBASEINFO_H
#define CS_ARMBASEINFO_H #define CS_ARMBASEINFO_H
#include "../../include/arm.h" #include "capstone/arm.h"
// Defines symbolic names for ARM registers. This defines a mapping from // Defines symbolic names for ARM registers. This defines a mapping from
// register name to register number. // register name to register number.

2
arch/ARM/ARMDisassembler.h
View File

@ -4,7 +4,7 @@
#ifndef CS_ARMDISASSEMBLER_H #ifndef CS_ARMDISASSEMBLER_H
#define CS_ARMDISASSEMBLER_H #define CS_ARMDISASSEMBLER_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
void ARM_init(MCRegisterInfo *MRI); void ARM_init(MCRegisterInfo *MRI);

2
arch/ARM/ARMMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_ARM_MAP_H #ifndef CS_ARM_MAP_H
#define CS_ARM_MAP_H #define CS_ARM_MAP_H
#include "../../include/capstone.h" #include "../../include/capstone/capstone.h"
#include "../../utils.h" #include "../../utils.h"
// return name of regiser in friendly string // return name of regiser in friendly string

4
arch/Mips/MipsDisassembler.h
View File

@ -4,9 +4,7 @@
#ifndef CS_MIPSDISASSEMBLER_H #ifndef CS_MIPSDISASSEMBLER_H
#define CS_MIPSDISASSEMBLER_H #define CS_MIPSDISASSEMBLER_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../include/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
void Mips_init(MCRegisterInfo *MRI); void Mips_init(MCRegisterInfo *MRI);

2
arch/Mips/MipsMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_MIPS_MAP_H #ifndef CS_MIPS_MAP_H
#define CS_MIPS_MAP_H #define CS_MIPS_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *Mips_reg_name(csh handle, unsigned int reg); const char *Mips_reg_name(csh handle, unsigned int reg);

2
arch/PowerPC/PPCDisassembler.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/PowerPC/PPCMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_PPC_MAP_H #ifndef CS_PPC_MAP_H
#define CS_PPC_MAP_H #define CS_PPC_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *PPC_reg_name(csh handle, unsigned int reg); const char *PPC_reg_name(csh handle, unsigned int reg);

2
arch/PowerPC/PPCPredicates.h
View File

@ -17,7 +17,7 @@
#ifndef CS_POWERPC_PPCPREDICATES_H #ifndef CS_POWERPC_PPCPREDICATES_H
#define CS_POWERPC_PPCPREDICATES_H #define CS_POWERPC_PPCPREDICATES_H
#include "../../include/ppc.h" #include "capstone/ppc.h"
// NOTE: duplicate of ppc_bc in ppc.h to maitain code compatibility with LLVM // NOTE: duplicate of ppc_bc in ppc.h to maitain code compatibility with LLVM
typedef enum ppc_predicate { typedef enum ppc_predicate {

2
arch/Sparc/Sparc.h
View File

@ -18,7 +18,7 @@
#ifndef CS_SPARC_TARGET_SPARC_H #ifndef CS_SPARC_TARGET_SPARC_H
#define CS_SPARC_TARGET_SPARC_H #define CS_SPARC_TARGET_SPARC_H
#include "../../include/sparc.h" #include "capstone/sparc.h"
inline static char *SPARCCondCodeToString(sparc_cc CC) inline static char *SPARCCondCodeToString(sparc_cc CC)
{ {

2
arch/Sparc/SparcDisassembler.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/Sparc/SparcMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_SPARC_MAP_H #ifndef CS_SPARC_MAP_H
#define CS_SPARC_MAP_H #define CS_SPARC_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *Sparc_reg_name(csh handle, unsigned int reg); const char *Sparc_reg_name(csh handle, unsigned int reg);

2
arch/SystemZ/SystemZDisassembler.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/SystemZ/SystemZMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_SYSZ_MAP_H #ifndef CS_SYSZ_MAP_H
#define CS_SYSZ_MAP_H #define CS_SYSZ_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *SystemZ_reg_name(csh handle, unsigned int reg); const char *SystemZ_reg_name(csh handle, unsigned int reg);

2
arch/X86/X86Disassembler.h
View File

@ -79,7 +79,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/X86/X86Mapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_X86_MAP_H #ifndef CS_X86_MAP_H
#define CS_X86_MAP_H #define CS_X86_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../cs_priv.h" #include "../../cs_priv.h"
// map sib_base to x86_reg // map sib_base to x86_reg

2
arch/XCore/XCoreDisassembler.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#include "../../MCRegisterInfo.h" #include "../../MCRegisterInfo.h"
#include "../../MCInst.h" #include "../../MCInst.h"

2
arch/XCore/XCoreMapping.h
View File

@ -4,7 +4,7 @@
#ifndef CS_XCORE_MAP_H #ifndef CS_XCORE_MAP_H
#define CS_XCORE_MAP_H #define CS_XCORE_MAP_H
#include "../../include/capstone.h" #include "capstone/capstone.h"
// return name of regiser in friendly string // return name of regiser in friendly string
const char *XCore_reg_name(csh handle, unsigned int reg); const char *XCore_reg_name(csh handle, unsigned int reg);

2
bindings/ocaml/ocaml.c
View File

@ -8,7 +8,7 @@
#include <caml/alloc.h> #include <caml/alloc.h>
#include <caml/fail.h> #include <caml/fail.h>
#include "../../include/capstone.h" #include "capstone/capstone.h"
#define ARR_SIZE(a) (sizeof(a)/sizeof(a[0])) #define ARR_SIZE(a) (sizeof(a)/sizeof(a[0]))

2
cs.c
View File

@ -7,7 +7,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <capstone.h> #include <capstone/capstone.h>
#include "utils.h" #include "utils.h"
#include "MCRegisterInfo.h" #include "MCRegisterInfo.h"

2
cs_priv.h
View File

@ -4,7 +4,7 @@
#ifndef CS_PRIV_H #ifndef CS_PRIV_H
#define CS_PRIV_H #define CS_PRIV_H
#include <capstone.h> #include <capstone/capstone.h>
#include "MCInst.h" #include "MCInst.h"
#include "SStream.h" #include "SStream.h"

0
include/arm.h → include/capstone/arm.h
View File

0
include/arm64.h → include/capstone/arm64.h
View File

0
include/capstone.h → include/capstone/capstone.h
View File

0
include/mips.h → include/capstone/mips.h
View File

0
include/platform.h → include/capstone/platform.h
View File

0
include/ppc.h → include/capstone/ppc.h
View File

0
include/sparc.h → include/capstone/sparc.h
View File

0
include/systemz.h → include/capstone/systemz.h
View File

0
include/x86.h → include/capstone/x86.h
View File

0
include/xcore.h → include/capstone/xcore.h
View File

2
tests/test.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_arm.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
static csh handle; static csh handle;

2
tests/test_arm64.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
static csh handle; static csh handle;

2
tests/test_detail.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_iter.c
View File

@ -6,7 +6,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_mips.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_ppc.c
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_skipdata.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_sparc.c
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_systemz.c
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
tests/test_x86.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
static csh handle; static csh handle;

2
tests/test_xcore.c
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "../inttypes.h" #include "../inttypes.h"
#include <capstone.h> #include <capstone/capstone.h>
struct platform { struct platform {
cs_arch arch; cs_arch arch;

2
utils.h
View File

@ -5,7 +5,7 @@
#define CS_UTILS_H #define CS_UTILS_H
#include <stddef.h> #include <stddef.h>
#include "include/capstone.h" #include "include/capstone/capstone.h"
#include "cs_priv.h" #include "cs_priv.h"
// threshold number, so above this number will be printed in hexa mode // threshold number, so above this number will be printed in hexa mode