Add offset when indexing cpu model, makes tests work on older python

Author: OBarronCS

include/unicorn/mips.h

@@ -43,9 +43,7 @@ typedef enum uc_cpu_mips32 {
 
 //> MIPS64 CPUS
 typedef enum uc_cpu_mips64 {
-    // This is used as an index into the array defined in "qemu/target/mips/translate_init.inc.c".
-    // 64-bit CPU models are defined in the array directly after 32-bit models
-    UC_CPU_MIPS64_R4000 = UC_CPU_MIPS32_ENDING,
+    UC_CPU_MIPS64_R4000 = 0,
     UC_CPU_MIPS64_VR5432,
     UC_CPU_MIPS64_5KC,
     UC_CPU_MIPS64_5KF,

qemu/target/mips/cpu.c

@@ -194,7 +194,12 @@ MIPSCPU *cpu_mips_init(struct uc_struct *uc)
     mips_cpu_initfn(uc, cs);
 
     env = &cpu->env;
-    env->cpu_model = &(mips_defs[uc->cpu_model]);
+    if(uc->mode & UC_MODE_MIPS64){
+        // 64-bit CPU models are defined in the array directly after 32-bit models
+        env->cpu_model = &(mips_defs[uc->cpu_model + UC_CPU_MIPS32_ENDING])
+    } else {
+        env->cpu_model = &(mips_defs[uc->cpu_model]);
+    }
 
     if (env->cpu_model == NULL) {
         free(cpu);

tests/regress/mips64.py

@@ -14,7 +14,7 @@ def run():
     # See https://github.com/unicorn-engine/unicorn/pull/2111 for more details
     uc.ctl_set_tlb_mode(UC_TLB_VIRTUAL)
 
-    ADDRESS = 0x01_2000_3000
+    ADDRESS = 0x0120003000
 
     uc.reg_write(UC_MIPS_REG_PC, ADDRESS)
     uc.reg_write(UC_MIPS_REG_GP, 0x123)