lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2017-03-30 12:23:24 +08:00
parent c01dcf0a14 b9712f0a5d
commit 094ca80092
28 changed files with 3392 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qemu/target-arm/unicorn_arm.c
View File

@@ -9,7 +9,6 @@
#include "unicorn_common.h"
#include "uc_priv.h"
const int ARM_REGS_STORAGE_SIZE = offsetof(CPUARMState, tlb_table);
static void arm_set_pc(struct uc_struct *uc, uint64_t address)
@@ -183,7 +182,11 @@ static uc_err arm_query(struct uc_struct *uc, uc_query_type type, size_t *result
}
}
#ifdef TARGET_WORDS_BIGENDIAN
void armeb_uc_init(struct uc_struct* uc)
#else
void arm_uc_init(struct uc_struct* uc)
#endif
{
register_accel_types(uc);
arm_cpu_register_types(uc);