coding style cleanup

This commit is contained in:
Nguyen Anh Quynh
2020-05-07 14:30:22 +08:00
parent 881e08da01
commit ef92e5ed71

13
uc.c
View File

@ -536,19 +536,20 @@ static void clear_deleted_hooks(uc_engine *uc)
struct hook * hook; struct hook * hook;
int i; int i;
for (cur = uc->hooks_to_del.head; cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next) for (cur = uc->hooks_to_del.head; cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next) {
{
assert(hook->to_delete); assert(hook->to_delete);
for (i = 0; i < UC_HOOK_MAX; i++) { for (i = 0; i < UC_HOOK_MAX; i++) {
if (list_remove(&uc->hook[i], (void *)hook)) { if (list_remove(&uc->hook[i], (void *)hook)) {
if (--hook->refs == 0) { if (--hook->refs == 0) {
free(hook); free(hook);
} }
// a hook cannot be twice in the same list // a hook cannot be twice in the same list
break; break;
} }
} }
} }
list_clear(&uc->hooks_to_del); list_clear(&uc->hooks_to_del);
} }
@ -653,12 +654,9 @@ uc_err uc_emu_start(uc_engine* uc, uint64_t begin, uint64_t until, uint64_t time
// emulation is done // emulation is done
uc->emulation_done = true; uc->emulation_done = true;
// remove hooks to delete // remove hooks to delete
clear_deleted_hooks(uc); clear_deleted_hooks(uc);
if (timeout) { if (timeout) {
// wait for the timer to finish // wait for the timer to finish
qemu_thread_join(&uc->timer); qemu_thread_join(&uc->timer);
@ -1193,8 +1191,7 @@ uc_err uc_hook_del(uc_engine *uc, uc_hook hh)
// an optimization would be to align the hook pointer // an optimization would be to align the hook pointer
// and store the type mask in the hook pointer. // and store the type mask in the hook pointer.
for (i = 0; i < UC_HOOK_MAX; i++) { for (i = 0; i < UC_HOOK_MAX; i++) {
if (list_exists(&uc->hook[i], (void *) hook)) if (list_exists(&uc->hook[i], (void *) hook)) {
{
hook->to_delete = true; hook->to_delete = true;
list_append(&uc->hooks_to_del, hook); list_append(&uc->hooks_to_del, hook);
} }
@ -1216,7 +1213,7 @@ void helper_uc_tracecode(int32_t size, uc_hook_type type, void *handle, int64_t
uc->set_pc(uc, address); uc->set_pc(uc, address);
} }
for (cur = uc->hook[type].head; cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next){ for (cur = uc->hook[type].head; cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next) {
if (hook->to_delete) if (hook->to_delete)
continue; continue;
if (HOOK_BOUND_CHECK(hook, (uint64_t)address)) { if (HOOK_BOUND_CHECK(hook, (uint64_t)address)) {