Virtualization/capstone
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/capstone.git synced 2025-09-17 02:01:15 +08:00
Code Issues Projects Releases Wiki Activity

mingw doesnt accept .errno of cs_struct. this fixes make it happy, and enable Windows cross-compile again

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2013-11-27 15:24:47 +08:00
parent ec74555220
commit 3eb9ac9bb9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cs.c
View File

@ -38,7 +38,7 @@ cs_err cs_errno(csh handle)
cs_struct *ud = (cs_struct *)(uintptr_t)handle; cs_struct *ud = (cs_struct *)(uintptr_t)handle;
return ud->errno; return ud->errnum;
} }
void cs_version(int *major, int *minor) void cs_version(int *major, int *minor)
@ -57,7 +57,7 @@ cs_err cs_open(cs_arch arch, cs_mode mode, csh *handle)
return CS_ERR_MEM; return CS_ERR_MEM;
} }
ud->errno = CS_ERR_OK; ud->errnum = CS_ERR_OK;
ud->arch = arch; ud->arch = arch;
ud->mode = mode; ud->mode = mode;
ud->big_endian = mode & CS_MODE_BIG_ENDIAN; ud->big_endian = mode & CS_MODE_BIG_ENDIAN;
@ -198,11 +198,11 @@ uint64_t cs_disasm(csh ud, char *buffer, uint64_t size, uint64_t offset, uint64_
if (!handle) { if (!handle) {
// FIXME: handle this case? // FIXME: handle this case?
// handle->errno = CS_ERR_HANDLE; // handle->errnum = CS_ERR_HANDLE;
return 0; return 0;
} }
handle->errno = CS_ERR_OK; handle->errnum = CS_ERR_OK;
while (size > 0) { while (size > 0) {
MCInst_Init(&mci); MCInst_Init(&mci);
@ -250,11 +250,11 @@ uint64_t cs_disasm_dyn(csh ud, char *buffer, uint64_t size, uint64_t offset, uin
if (!handle) { if (!handle) {
// FIXME: how to handle this case: // FIXME: how to handle this case:
// handle->errno = CS_ERR_HANDLE; // handle->errnum = CS_ERR_HANDLE;
return 0; return 0;
} }
handle->errno = CS_ERR_OK; handle->errnum = CS_ERR_OK;
while (size > 0) { while (size > 0) {
MCInst_Init(&mci); MCInst_Init(&mci);
@ -278,7 +278,7 @@ uint64_t cs_disasm_dyn(csh ud, char *buffer, uint64_t size, uint64_t offset, uin
void *tmp = realloc(total, total_size); void *tmp = realloc(total, total_size);
if (tmp == NULL) { // insufficient memory if (tmp == NULL) { // insufficient memory
free(total); free(total);
handle->errno = CS_ERR_MEM; handle->errnum = CS_ERR_MEM;
return 0; return 0;
} }
@ -304,7 +304,7 @@ uint64_t cs_disasm_dyn(csh ud, char *buffer, uint64_t size, uint64_t offset, uin
void *tmp = realloc(total, total_size + f * sizeof(insn_cache[0])); void *tmp = realloc(total, total_size + f * sizeof(insn_cache[0]));
if (tmp == NULL) { // insufficient memory if (tmp == NULL) { // insufficient memory
free(total); free(total);
handle->errno = CS_ERR_MEM; handle->errnum = CS_ERR_MEM;
return 0; return 0;
} }
@ -399,11 +399,11 @@ int cs_op_count(csh ud, cs_insn *insn, unsigned int op_type)
cs_struct *handle = (cs_struct *)(uintptr_t)ud; cs_struct *handle = (cs_struct *)(uintptr_t)ud;
unsigned int count = 0, i; unsigned int count = 0, i;
handle->errno = CS_ERR_OK; handle->errnum = CS_ERR_OK;
switch (handle->arch) { switch (handle->arch) {
default: default:
handle->errno = CS_ERR_HANDLE; handle->errnum = CS_ERR_HANDLE;
return -1; return -1;
case CS_ARCH_ARM: case CS_ARCH_ARM:
for (i = 0; i < insn->arm.op_count; i++) for (i = 0; i < insn->arm.op_count; i++)
@ -439,11 +439,11 @@ int cs_op_index(csh ud, cs_insn *insn, unsigned int op_type,
cs_struct *handle = (cs_struct *)(uintptr_t)ud; cs_struct *handle = (cs_struct *)(uintptr_t)ud;
unsigned int count = 0, i; unsigned int count = 0, i;
handle->errno = CS_ERR_OK; handle->errnum = CS_ERR_OK;
switch (handle->arch) { switch (handle->arch) {
default: default:
handle->errno = CS_ERR_HANDLE; handle->errnum = CS_ERR_HANDLE;
return -1; return -1;
case CS_ARCH_ARM: case CS_ARCH_ARM:
for (i = 0; i < insn->arm.op_count; i++) { for (i = 0; i < insn->arm.op_count; i++) {

2
cs_priv.h
View File

@ -34,7 +34,7 @@ typedef struct cs_struct {
GetID_t insn_id; GetID_t insn_id;
PostPrinter_t post_printer; PostPrinter_t post_printer;
bool micro_mips; // for Mips only bool micro_mips; // for Mips only
cs_err errno; cs_err errnum;
} cs_struct; } cs_struct;
#endif #endif