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

Rename CS_OPT_NONE to CS_OPT_INVALID

This commit is contained in:
tandasat 2016-04-08 08:05:06 -07:00
parent 1ebd44e189
commit 570834e363
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/capstone.h
View File

@ -120,7 +120,7 @@ typedef struct cs_opt_mem {
// Runtime option for the disassembled engine // Runtime option for the disassembled engine
typedef enum cs_opt_type { typedef enum cs_opt_type {
CS_OPT_NONE = 0, // No opetion specified CS_OPT_INVALID = 0, // No opetion specified
CS_OPT_SYNTAX, // Assembly output syntax CS_OPT_SYNTAX, // Assembly output syntax
CS_OPT_DETAIL, // Break down instruction structure into details CS_OPT_DETAIL, // Break down instruction structure into details
CS_OPT_MODE, // Change engine's mode at run-time CS_OPT_MODE, // Change engine's mode at run-time
@ -172,7 +172,7 @@ typedef enum cs_group_type {
@return: return number of bytes to skip, or 0 to immediately stop disassembling. @return: return number of bytes to skip, or 0 to immediately stop disassembling.
*/ */
typedef size_t (CAPSTONE_API*cs_skipdata_cb_t)(const uint8_t *code, size_t code_size, size_t offset, void *user_data); typedef size_t (*cs_skipdata_cb_t)(const uint8_t *code, size_t code_size, size_t offset, void *user_data);
// User-customized setup for SKIPDATA option // User-customized setup for SKIPDATA option
typedef struct cs_opt_skipdata { typedef struct cs_opt_skipdata {

6
tests/test_skipdata.c
View File

@ -30,7 +30,7 @@ static void print_string_hex(unsigned char *str, size_t len)
printf("\n"); printf("\n");
} }
static size_t CAPSTONE_API mycallback(const uint8_t *buffer, size_t buffer_size, size_t offset, void *p) static size_t mycallback(const uint8_t *buffer, size_t buffer_size, size_t offset, void *p)
{ {
// always skip 2 bytes when encountering data // always skip 2 bytes when encountering data
return 2; return 2;
@ -72,7 +72,7 @@ static void test()
(unsigned char*)X86_CODE32, (unsigned char*)X86_CODE32,
sizeof(X86_CODE32) - 1, sizeof(X86_CODE32) - 1,
"X86 32 (Intel syntax) - Skip data with custom mnemonic", "X86 32 (Intel syntax) - Skip data with custom mnemonic",
CS_OPT_NONE, CS_OPT_INVALID,
CS_OPT_OFF, CS_OPT_OFF,
CS_OPT_SKIPDATA_SETUP, CS_OPT_SKIPDATA_SETUP,
(size_t) &skipdata, (size_t) &skipdata,
@ -83,7 +83,7 @@ static void test()
(unsigned char*)RANDOM_CODE, (unsigned char*)RANDOM_CODE,
sizeof(RANDOM_CODE) - 1, sizeof(RANDOM_CODE) - 1,
"Arm - Skip data with callback", "Arm - Skip data with callback",
CS_OPT_NONE, CS_OPT_INVALID,
CS_OPT_OFF, CS_OPT_OFF,
CS_OPT_SKIPDATA_SETUP, CS_OPT_SKIPDATA_SETUP,
(size_t) &skipdata_callback, (size_t) &skipdata_callback,