Support changing cpu model for ARM

include/uc_priv.h

@@ -267,7 +267,8 @@ struct uc_struct {
     unsigned int alloc_hint;
     /* qemu/exec-vary.c */
     TargetPageBits *init_target_page;
-    int target_bits;                    // User defined page bits by uc_ctl
+    int target_bits; // User defined page bits by uc_ctl
+    int cpu_model;
     BounceBuffer bounce;                // qemu/cpu-exec.c
     volatile sig_atomic_t exit_request; // qemu/cpu-exec.c
     /* qemu/accel/tcg/cpu-exec-common.c */

include/unicorn/arm.h

@@ -30,9 +30,9 @@ typedef enum uc_cpu_arm {
     UC_CPU_ARM_CORTEX_M33,
     UC_CPU_ARM_CORTEX_R5,
     UC_CPU_ARM_CORTEX_R5F,
+    UC_CPU_ARM_CORTEX_A7,
     UC_CPU_ARM_CORTEX_A8,
     UC_CPU_ARM_CORTEX_A9,
-    UC_CPU_ARM_CORTEX_A7,
     UC_CPU_ARM_CORTEX_A15,
     UC_CPU_ARM_TI925T,
     UC_CPU_ARM_SA1100,

include/unicorn/unicorn.h

@@ -513,7 +513,7 @@ typedef enum uc_control_type {
     // Note this option can only be set before any Unicorn
     // API is called except for uc_open.
     // Write: @args = (int)
-    // Read:  @args = (int)
+    // Read:  @args = (int*)
     UC_CTL_CPU_MODEL,
     // Request a tb cache at a specific address
     // Read: @args = (uint64_t, uc_tb*)