Merge pull request #1886 from hamarituc/modern_c

Fix deprecated C syntax
This commit is contained in:
lazymio 2023-10-15 16:03:06 +08:00 committed by GitHub
commit ca65964e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 32 additions and 32 deletions

View File

@ -31,7 +31,7 @@ VALUE SavedContext = Qnil;
VALUE Hook = Qnil;
void Init_unicorn_engine() {
void Init_unicorn_engine(void) {
rb_require("unicorn_engine/unicorn_const");
UnicornModule = rb_define_module("UnicornEngine");
UcError = rb_define_class_under(UnicornModule, "UcError", rb_eStandardError);

View File

@ -1415,7 +1415,7 @@ load_memop(const void *haddr, MemOp op)
}
}
static uint64_t inline
static inline uint64_t
load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
uintptr_t retaddr, MemOp op, bool code_read,
FullLoadHelper *full_load)
@ -1983,7 +1983,7 @@ uint64_t cpu_ldq_data(CPUArchState *env, target_ulong ptr)
* Store Helpers
*/
static void inline
static inline void
store_memop(void *haddr, uint64_t val, MemOp op)
{
switch (op) {
@ -2014,7 +2014,7 @@ store_memop(void *haddr, uint64_t val, MemOp op)
}
}
static void inline
static inline void
store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
TCGMemOpIdx oi, uintptr_t retaddr, MemOp op)
{
@ -2343,7 +2343,7 @@ void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val,
* Store Helpers for cpu_ldst.h
*/
static void inline
static inline void
cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
int mmu_idx, uintptr_t retaddr, MemOp op) // qq
{

View File

@ -193,7 +193,7 @@ static void do_nx_demo(bool cause_fault)
uc_close(uc);
}
static void nx_test()
static void nx_test(void)
{
printf("NX demo - step 1: show that code runs to completion\n");
do_nx_demo(false);
@ -276,7 +276,7 @@ static void do_perms_demo(bool change_perms)
uc_close(uc);
}
static void perms_test()
static void perms_test(void)
{
printf("Permissions demo - step 1: show that area is writeable\n");
do_perms_demo(false);
@ -355,7 +355,7 @@ static void do_unmap_demo(bool do_unmap)
uc_close(uc);
}
static void unmap_test()
static void unmap_test(void)
{
printf("Unmap demo - step 1: show that area is writeable\n");
do_unmap_demo(false);

View File

@ -366,7 +366,7 @@ static void test_thumb_ite_internal(bool step, uint32_t *r2_out,
*r3_out = r3;
}
static void test_thumb_ite()
static void test_thumb_ite(void)
{
uint32_t r2, r3;
uint32_t step_r2, step_r3;
@ -390,7 +390,7 @@ static void test_thumb_ite()
}
}
static void test_read_sctlr()
static void test_read_sctlr(void)
{
uc_engine *uc;
uc_err err;

View File

@ -197,7 +197,7 @@ static void test_arm64eb(void)
uc_close(uc);
}
static void test_arm64_sctlr()
static void test_arm64_sctlr(void)
{
uc_engine *uc;
uc_err err;
@ -248,7 +248,7 @@ static uint32_t hook_mrs(uc_engine *uc, uc_arm64_reg reg,
return 1;
}
static void test_arm64_hook_mrs()
static void test_arm64_hook_mrs(void)
{
uc_engine *uc;
uc_err err;

View File

@ -49,7 +49,7 @@ void hook_code(uc_engine *uc, uint64_t addr, uint32_t size, void *user_data)
printf("HOOK_CODE: 0x%" PRIx64 ", 0x%x\n", addr, size);
}
int main()
int main(void)
{
int i;
uc_hook sys_hook;

View File

@ -79,7 +79,7 @@ static void trace_new_edge(uc_engine *uc, uc_tb *cur, uc_tb *prev, void *data)
prev->pc + prev->size - 1, cur->pc);
}
void test_uc_ctl_exits()
void test_uc_ctl_exits(void)
{
uc_engine *uc;
uc_err err;
@ -193,7 +193,7 @@ double time_emulation(uc_engine *uc, uint64_t start, uint64_t end)
return (t2 - t1) * 1000.0 / CLOCKS_PER_SEC;
}
static void test_uc_ctl_tb_cache()
static void test_uc_ctl_tb_cache(void)
{
uc_engine *uc;
uc_err err;

View File

@ -1240,7 +1240,7 @@ static void test_i386_invalid_mem_read_in_tb(void)
uc_close(uc);
}
static void test_i386_smc_xor()
static void test_i386_smc_xor(void)
{
uc_engine *uc;
uc_err err;
@ -1319,7 +1319,7 @@ static void mmio_write_callback(uc_engine *uc, uint64_t offset, unsigned size,
return;
}
static void test_i386_mmio()
static void test_i386_mmio(void)
{
uc_engine *uc;
int r_ecx = 0xdeadbeef;
@ -1392,7 +1392,7 @@ static bool test_i386_hook_mem_invalid_cb(uc_engine *uc, uc_mem_type type,
return true;
}
static void test_i386_hook_mem_invalid()
static void test_i386_hook_mem_invalid(void)
{
uc_engine *uc;
uc_hook hook;

View File

@ -163,7 +163,7 @@ static void hex_dump(unsigned char *ptr, unsigned int len)
}
*/
static void gdt_demo()
static void gdt_demo(void)
{
uc_engine *uc;
uc_hook hook1, hook2;

View File

@ -7,7 +7,7 @@
#define X86_CODE32 "\x00" // add byte ptr ds:[eax],al
#define ADDRESS 0x1000000
static void VM_exec()
static void VM_exec(void)
{
uc_engine *uc;
uc_err err;

View File

@ -6,7 +6,7 @@
#define ADDRESS 0x1000
#define ARM_VMOV "\xC0\xEF\x10\x00" // VMOV.I32 D16, #0 ; Vector Move
int main()
int main(void)
{
uc_engine *uc;
uc_err err;

View File

@ -24,7 +24,7 @@ void cb_hookblock(uc_engine *uc, uint64_t address, uint32_t size, void *user_dat
fprintf(stderr, "ok %d - basic block size is correct\n", count++);
}
int main() {
int main(void) {
uc_engine *uc;
fprintf(stderr, "# basic block callback test\n");

View File

@ -20,7 +20,7 @@ typedef uint64_t puint;
#define PRIX3264 PRIX64
#endif
uint32_t realEflags()
uint32_t realEflags(void)
{
puint val = 0;
@ -55,7 +55,7 @@ uint32_t realEflags()
return (uint32_t)val & 0xFFFFFFFF;
}
static void VM_exec()
static void VM_exec(void)
{
#if defined(__i386__) || defined(__x86_64__)
uc_engine *uc;

View File

@ -64,7 +64,7 @@ static bool hook_invalid_mem(uc_engine *uc, uc_mem_type type, uint64_t address,
}
}
static void VM_exec()
static void VM_exec(void)
{
uc_engine *uc;
uc_err err;

View File

@ -38,7 +38,7 @@ bool cb_hookunmapped(uc_engine *uc, uc_mem_type type, uint64_t address, uint32_t
"\x56" \
"\xFF\x15\x20\x20\x00\x10"
int main() {
int main(void) {
uc_engine *uc;
uc_err err = uc_open(UC_ARCH_X86, UC_MODE_32, &uc);

View File

@ -14,7 +14,7 @@ void hook_ins(uc_engine *uc, uint64_t address, uint32_t size, void *user_data)
printf("hook called\n");
}
static void VM_exec()
static void VM_exec(void)
{
uc_engine *uc;
uc_err err;

View File

@ -6,7 +6,7 @@
#define UC_BUG_WRITE_SIZE 13000
#define UC_BUG_WRITE_ADDR 0x1000
int main()
int main(void)
{
int size;
uint8_t *buf;

View File

@ -6,7 +6,7 @@
#define SIZE 1024*64
#define OVERFLOW 1
int main()
int main(void)
{
uc_engine *uc = NULL;
uint8_t *buf = NULL, *buf2 = NULL;

View File

@ -20,7 +20,7 @@
#define MIPS_CODE_EL "\x56\x34\x21\x34" // ori $at, $at, 0x3456;
int main()
int main(void)
{
uc_engine *uc;

View File

@ -16,7 +16,7 @@ void _interrupt(uc_engine *uc, uint32_t intno, void *user_data)
}
}
int main()
int main(void)
{
int size;
uint8_t *buf;

View File

@ -6,7 +6,7 @@
#define UC_BUG_WRITE_SIZE 128
#define UC_BUG_WRITE_ADDR 0x2000
int main()
int main(void)
{
int size;
uc_engine *uc;