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

do not use constructor to enable archs, so code is more portable. suggested by Alex Ionescu

This commit is contained in:
Nguyen Anh Quynh 2014-01-19 12:03:22 +08:00
parent a580d92e05
commit c272e9d000
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/AArch64/module.c
View File

@ -35,7 +35,7 @@ static void destroy(cs_struct *handle)
{
}
static void __attribute__ ((constructor)) __init_arm64__()
void AArch64_enable(void)
{
arch_init[CS_ARCH_ARM64] = init;
arch_option[CS_ARCH_ARM64] = option;

4
arch/ARM/module.c
View File

@ -7,8 +7,6 @@
#include "ARMInstPrinter.h"
#include "mapping.h"
void enable_arm() {};
static cs_err init(cs_struct *ud)
{
MCRegisterInfo *mri = cs_mem_malloc(sizeof(*mri));
@ -48,7 +46,7 @@ static void destroy(cs_struct *handle)
{
}
static void __attribute__ ((constructor)) __init_arm__()
void ARM_enable(void)
{
arch_init[CS_ARCH_ARM] = init;
arch_option[CS_ARCH_ARM] = option;

2
arch/Mips/module.c
View File

@ -46,7 +46,7 @@ static void destroy(cs_struct *handle)
{
}
static void __attribute__ ((constructor)) __init_mips__()
void Mips_enable(void)
{
arch_init[CS_ARCH_MIPS] = init;
arch_option[CS_ARCH_MIPS] = option;

2
arch/PowerPC/module.c
View File

@ -39,7 +39,7 @@ static void destroy(cs_struct *handle)
{
}
static void __attribute__ ((constructor)) __init_mips__()
void PPC_enable(void)
{
arch_init[CS_ARCH_PPC] = init;
arch_option[CS_ARCH_PPC] = option;

2
arch/X86/module.c
View File

@ -50,7 +50,7 @@ static void destroy(cs_struct *handle)
{
}
static void __attribute__ ((constructor)) __init_x86__()
void X86_enable(void)
{
arch_init[CS_ARCH_X86] = init;
arch_option[CS_ARCH_X86] = option;

32
cs.c
View File

@ -14,30 +14,36 @@ cs_err (*arch_init[MAX_ARCH])(cs_struct *) = { NULL };
cs_err (*arch_option[MAX_ARCH]) (cs_struct *, cs_opt_type, size_t value) = { NULL };
void (*arch_destroy[MAX_ARCH]) (cs_struct *) = { NULL };
// we need this trick to enable module constructors in static lib
extern void enable_arm();
extern void enable_arm64();
extern void enable_mips();
extern void enable_x86();
extern void enable_powerpc();
extern void ARM_enable(void);
extern void AArch64_enable(void);
extern void Mips_enable(void);
extern void X86_enable(void);
extern void PPC_enable(void);
void enable_construct()
static void archs_enable(void)
{
static bool initialized = false;
if (initialized)
return;
#ifdef CAPSTONE_HAS_ARM
enable_arm();
ARM_enable();
#endif
#ifdef CAPSTONE_HAS_ARM64
enable_arm64();
AArch64_enable();
#endif
#ifdef CAPSTONE_HAS_MIPS
enable_mips();
Mips_enable();
#endif
#ifdef CAPSTONE_HAS_X86
enable_x86();
X86_enable();
#endif
#ifdef CAPSTONE_HAS_POWERPC
enable_powerpc();
PPC_enable();
#endif
initialized = true;
}
unsigned int all_arch = 0;
@ -119,6 +125,8 @@ cs_err cs_open(cs_arch arch, cs_mode mode, csh *handle)
// with cs_option(CS_OPT_MEM)
return CS_ERR_MEMSETUP;
archs_enable();
if (arch < CS_ARCH_MAX && arch_init[arch]) {
cs_struct *ud;