fix conflicts

This commit is contained in:
Nguyen Anh Quynh
2017-03-30 12:23:24 +08:00
28 changed files with 3392 additions and 17 deletions

View File

@@ -15,11 +15,13 @@ void arm64_reg_reset(struct uc_struct *uc);
DEFAULT_VISIBILITY
void arm_uc_init(struct uc_struct* uc);
void armeb_uc_init(struct uc_struct* uc);
DEFAULT_VISIBILITY
void arm64_uc_init(struct uc_struct* uc);
extern const int ARM_REGS_STORAGE_SIZE;
extern const int ARM_REGS_STORAGE_SIZE_arm;
extern const int ARM_REGS_STORAGE_SIZE_armeb;
extern const int ARM64_REGS_STORAGE_SIZE;
#endif