fix merge conflicts

2017-03-10 21:04:33 +08:00
parent f3ada41b99 f2e75422e8
commit c01dcf0a14
41 changed files with 543 additions and 109 deletions
--- a/uc.c
+++ b/uc.c
@ -380,14 +380,12 @@ uc_err uc_reg_read(uc_engine *uc, int regid, void *value)
    return uc_reg_read_batch(uc, &regid, &value, 1);
 }

-
 UNICORN_EXPORT
 uc_err uc_reg_write(uc_engine *uc, int regid, const void *value)
 {
    return uc_reg_write_batch(uc, &regid, (void *const *)&value, 1);
 }

-
 // check if a memory area is mapped
 // this is complicated because an area can overlap adjacent blocks
 static bool check_mem_area(uc_engine *uc, uint64_t address, size_t size)