yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code style

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2016-01-26 17:37:48 +08:00
parent 0c2194078e
commit 2341f5dd1a
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
qemu/softmmu_template.h
View File

@ -190,7 +190,7 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
#if defined(SOFTMMU_CODE_ACCESS) #if defined(SOFTMMU_CODE_ACCESS)
error_code = UC_ERR_FETCH_UNMAPPED; error_code = UC_ERR_FETCH_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -198,7 +198,7 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
#else #else
error_code = UC_ERR_READ_UNMAPPED; error_code = UC_ERR_READ_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -221,7 +221,7 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) { // non-executable if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) { // non-executable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_PROT, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_PROT, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -242,7 +242,7 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
// Unicorn: callback on memory read // Unicorn: callback on memory read
if (READ_ACCESS_TYPE == MMU_DATA_LOAD) { if (READ_ACCESS_TYPE == MMU_DATA_LOAD) {
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
((uc_cb_hookmem_t)hook->callback)(env->uc, UC_MEM_READ, addr, DATA_SIZE, 0, hook->user_data); ((uc_cb_hookmem_t)hook->callback)(env->uc, UC_MEM_READ, addr, DATA_SIZE, 0, hook->user_data);
} }
@ -252,7 +252,7 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
if (READ_ACCESS_TYPE == MMU_DATA_LOAD && mr != NULL && !(mr->perms & UC_PROT_READ)) { //non-readable if (READ_ACCESS_TYPE == MMU_DATA_LOAD && mr != NULL && !(mr->perms & UC_PROT_READ)) { //non-readable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -402,7 +402,7 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
#if defined(SOFTMMU_CODE_ACCESS) #if defined(SOFTMMU_CODE_ACCESS)
error_code = UC_ERR_FETCH_UNMAPPED; error_code = UC_ERR_FETCH_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -410,7 +410,7 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
#else #else
error_code = UC_ERR_READ_UNMAPPED; error_code = UC_ERR_READ_UNMAPPED;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_UNMAPPED, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -433,7 +433,7 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) { // non-executable if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) { // non-executable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_FETCH_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_PROT, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_FETCH_PROT, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -454,7 +454,7 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
// Unicorn: callback on memory read // Unicorn: callback on memory read
if (READ_ACCESS_TYPE == MMU_DATA_LOAD) { if (READ_ACCESS_TYPE == MMU_DATA_LOAD) {
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
((uc_cb_hookmem_t)hook->callback)(env->uc, UC_MEM_READ, addr, DATA_SIZE, 0, hook->user_data); ((uc_cb_hookmem_t)hook->callback)(env->uc, UC_MEM_READ, addr, DATA_SIZE, 0, hook->user_data);
} }
@ -464,7 +464,7 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
if (READ_ACCESS_TYPE == MMU_DATA_LOAD && mr != NULL && !(mr->perms & UC_PROT_READ)) { //non-readable if (READ_ACCESS_TYPE == MMU_DATA_LOAD && mr != NULL && !(mr->perms & UC_PROT_READ)) { //non-readable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_READ_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0, hook->user_data)))
break; break;
@ -647,7 +647,7 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
// Unicorn: callback on memory write // Unicorn: callback on memory write
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
((uc_cb_hookmem_t)hook->callback)(uc, UC_MEM_WRITE, addr, DATA_SIZE, val, hook->user_data); ((uc_cb_hookmem_t)hook->callback)(uc, UC_MEM_WRITE, addr, DATA_SIZE, val, hook->user_data);
} }
@ -656,13 +656,13 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
if (mr == NULL) { if (mr == NULL) {
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_UNMAPPED, addr, DATA_SIZE, val, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_UNMAPPED, addr, DATA_SIZE, val, hook->user_data)))
break; break;
} }
if (! handled) { if (!handled) {
// save error & quit // save error & quit
env->invalid_addr = addr; env->invalid_addr = addr;
env->invalid_error = UC_ERR_WRITE_UNMAPPED; env->invalid_error = UC_ERR_WRITE_UNMAPPED;
@ -679,7 +679,7 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) { //non-writable if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) { //non-writable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, val, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, val, hook->user_data)))
break; break;
@ -805,7 +805,7 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
// Unicorn: callback on memory write // Unicorn: callback on memory write
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
((uc_cb_hookmem_t)hook->callback)(uc, UC_MEM_WRITE, addr, DATA_SIZE, val, hook->user_data); ((uc_cb_hookmem_t)hook->callback)(uc, UC_MEM_WRITE, addr, DATA_SIZE, val, hook->user_data);
} }
@ -814,7 +814,7 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
if (mr == NULL) { if (mr == NULL) {
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_UNMAPPED) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_UNMAPPED) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_UNMAPPED, addr, DATA_SIZE, val, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_UNMAPPED, addr, DATA_SIZE, val, hook->user_data)))
break; break;
@ -837,7 +837,7 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) { //non-writable if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) { //non-writable
handled = false; handled = false;
HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_PROT) { HOOK_FOREACH(uc, hook, UC_HOOK_MEM_WRITE_PROT) {
if (! HOOK_BOUND_CHECK(hook, addr)) if (!HOOK_BOUND_CHECK(hook, addr))
continue; continue;
if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, val, hook->user_data))) if ((handled = ((uc_cb_eventmem_t)hook->callback)(uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, val, hook->user_data)))
break; break;

2
qemu/target-arm/translate-a64.c
View File

@ -11112,7 +11112,7 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu,
// Unicorn: trace this block on request // Unicorn: trace this block on request
// Only hook this block if it is not broken from previous translation due to // Only hook this block if it is not broken from previous translation due to
// full translation cache // full translation cache
if (! env->uc->block_full && HOOK_EXISTS_BOUNDED(env->uc, UC_HOOK_BLOCK, pc_start)) { if (!env->uc->block_full && HOOK_EXISTS_BOUNDED(env->uc, UC_HOOK_BLOCK, pc_start)) {
// save block address to see if we need to patch block size later // save block address to see if we need to patch block size later
env->uc->block_addr = pc_start; env->uc->block_addr = pc_start;
gen_uc_tracecode(tcg_ctx, 0xf8f8f8f8, UC_HOOK_BLOCK_IDX, env->uc, pc_start); gen_uc_tracecode(tcg_ctx, 0xf8f8f8f8, UC_HOOK_BLOCK_IDX, env->uc, pc_start);

4
qemu/target-i386/seg_helper.c
View File

@ -948,7 +948,7 @@ void helper_syscall(CPUX86State *env, int next_eip_addend)
// Unicorn: call registered syscall hooks // Unicorn: call registered syscall hooks
struct hook *hook; struct hook *hook;
HOOK_FOREACH(env->uc, hook, UC_HOOK_INSN) { HOOK_FOREACH(env->uc, hook, UC_HOOK_INSN) {
if (! HOOK_BOUND_CHECK(hook, env->eip)) if (!HOOK_BOUND_CHECK(hook, env->eip))
continue; continue;
if (hook->insn == UC_X86_INS_SYSCALL) if (hook->insn == UC_X86_INS_SYSCALL)
((uc_cb_insn_syscall_t)hook->callback)(env->uc, hook->user_data); ((uc_cb_insn_syscall_t)hook->callback)(env->uc, hook->user_data);
@ -2308,7 +2308,7 @@ void helper_sysenter(CPUX86State *env, int next_eip_addend)
// Unicorn: call registered SYSENTER hooks // Unicorn: call registered SYSENTER hooks
struct hook *hook; struct hook *hook;
HOOK_FOREACH(env->uc, hook, UC_HOOK_INSN) { HOOK_FOREACH(env->uc, hook, UC_HOOK_INSN) {
if (! HOOK_BOUND_CHECK(hook, env->eip)) if (!HOOK_BOUND_CHECK(hook, env->eip))
continue; continue;
if (hook->insn == UC_X86_INS_SYSENTER) if (hook->insn == UC_X86_INS_SYSENTER)
((uc_cb_insn_syscall_t)hook->callback)(env->uc, hook->user_data); ((uc_cb_insn_syscall_t)hook->callback)(env->uc, hook->user_data);

2
qemu/target-mips/translate.c
View File

@ -19214,7 +19214,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu, TranslationBlock *tb,
// Unicorn: trace this block on request // Unicorn: trace this block on request
// Only hook this block if it is not broken from previous translation due to // Only hook this block if it is not broken from previous translation due to
// full translation cache // full translation cache
if (! env->uc->block_full && HOOK_EXISTS_BOUNDED(env->uc, UC_HOOK_BLOCK, pc_start)) { if (!env->uc->block_full && HOOK_EXISTS_BOUNDED(env->uc, UC_HOOK_BLOCK, pc_start)) {
// save block address to see if we need to patch block size later // save block address to see if we need to patch block size later
env->uc->block_addr = pc_start; env->uc->block_addr = pc_start;
gen_uc_tracecode(tcg_ctx, 0xf8f8f8f8, UC_HOOK_BLOCK_IDX, env->uc, pc_start); gen_uc_tracecode(tcg_ctx, 0xf8f8f8f8, UC_HOOK_BLOCK_IDX, env->uc, pc_start);