Magic-Mirror/capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/capstone.git synced 2024-12-15 01:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'newapi' into next

Browse Source
This commit is contained in:
Nguyen Anh Quynh 2014-10-12 15:31:24 +08:00
commit 1a83cea5f5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cs.c
View File

@ -651,7 +651,7 @@ bool cs_disasm_iter(csh ud, const uint8_t **code, size_t *size,
handle = (struct cs_struct *)(uintptr_t)ud;
if (!handle) {
return NULL;
return false;
}
handle->errnum = CS_ERR_OK;
@ -714,8 +714,8 @@ bool cs_disasm_iter(csh ud, const uint8_t **code, size_t *size,
// NOTE: if detail mode is OFF, content of detail pointer is irrelevant
// to be sure, zero out content of detail pointer
if (insn->detail)
memset(insn->detail, 0, sizeof(cs_detail));
//if (insn->detail)
// memset(insn->detail, 0, sizeof(cs_detail));
*code += skipdata_bytes;
*size -= skipdata_bytes;

13
include/capstone.h
View File

@ -127,7 +127,9 @@ typedef enum cs_opt_value {
} cs_opt_value;
/*
User-defined callback function for SKIPDATA option
User-defined callback function for SKIPDATA option.
See tests/test_skipdata.c for sample code demonstrating this API.
@code: the input buffer containing code to be disassembled.
This is the same buffer passed to cs_disasm().
@code_size: size (in bytes) of the above @code buffer.
@ -208,6 +210,7 @@ typedef struct cs_insn {
// Find the instruction id from header file of corresponding architecture,
// such as arm.h for ARM, x86.h for X86, etc...
// This information is available even when CS_OPT_DETAIL = CS_OPT_OFF
// NOTE: in Skipdata mode, "data" instruction has 0 for this id field.
unsigned int id;
// Address (EIP) of this instruction
@ -230,10 +233,11 @@ typedef struct cs_insn {
char op_str[160];
// Pointer to cs_detail.
// NOTE: detail pointer is only valid (not NULL) when both requirements below are met:
// NOTE: detail pointer is only valid when both requirements below are met:
// (1) CS_OP_DETAIL = CS_OPT_ON
// (2) If engine is in Skipdata mode (CS_OP_SKIPDATA option set to CS_OPT_ON), then
// the current instruction is not the "data" instruction (which clearly has no detail).
// (2) Engine is not in Skipdata mode (CS_OP_SKIPDATA option set to CS_OPT_ON)
// Note: when in Skipdata mode, even if this pointer is not NULL,
// its content is irrelevant.
cs_detail *detail;
} cs_insn;
@ -439,6 +443,7 @@ cs_insn *cs_malloc(csh handle);
Fast API to disassemble binary code, given the code buffer, size, address
and number of instructions to be decoded.
This API put the resulted instruction into a given cache in @insn.
See tests/test_iter.c for sample code demonstrating this API.
NOTE 1: this API will update @code, @size & @address to point to the next
instruction in the input buffer. Therefore, it is covenient to use