yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-09 22:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix register widths for MIPS64 reg_read/write (#775)

Browse source 
* fix register widths for MIPS64 reg_read/write

* fix preprocessor typedef error for qemu/target-mips
This commit is contained in:
Matt Thomas 2017-03-07 19:40:30 -05:00 committed by Nguyen Anh Quynh
parent b3a5eae81c
commit 2749b8412e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/target-mips/unicorn.c
View file

@ -18,6 +18,12 @@ const int MIPS_REGS_STORAGE_SIZE = offsetof(CPUMIPSState, tlb_table);
#endif #endif
#endif #endif
#ifdef TARGET_MIPS64
typedef uint64_t mipsreg_t;
#else
typedef uint32_t mipsreg_t;
#endif
static uint64_t mips_mem_redirect(uint64_t address) static uint64_t mips_mem_redirect(uint64_t address)
{ {
// kseg0 range masks off high address bit // kseg0 range masks off high address bit
@ -89,7 +95,7 @@ int mips_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int cou
switch(regid) { switch(regid) {
default: break; default: break;
case UC_MIPS_REG_PC: case UC_MIPS_REG_PC:
*(int32_t *)value = MIPS_CPU(uc, mycpu)->env.active_tc.PC; *(mipsreg_t *)value = MIPS_CPU(uc, mycpu)->env.active_tc.PC;
break; break;
} }
} }
@ -107,12 +113,12 @@ int mips_reg_write(struct uc_struct *uc, unsigned int *regs, void *const *vals,
unsigned int regid = regs[i]; unsigned int regid = regs[i];
const void *value = vals[i]; const void *value = vals[i];
if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31) if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31)
MIPS_CPU(uc, mycpu)->env.active_tc.gpr[regid - UC_MIPS_REG_0] = *(uint32_t *)value; MIPS_CPU(uc, mycpu)->env.active_tc.gpr[regid - UC_MIPS_REG_0] = *(mipsreg_t *)value;
else { else {
switch(regid) { switch(regid) {
default: break; default: break;
case UC_MIPS_REG_PC: case UC_MIPS_REG_PC:
MIPS_CPU(uc, mycpu)->env.active_tc.PC = *(uint32_t *)value; MIPS_CPU(uc, mycpu)->env.active_tc.PC = *(mipsreg_t *)value;
// force to quit execution and flush TB // force to quit execution and flush TB
uc->quit_request = true; uc->quit_request = true;
uc_emu_stop(uc); uc_emu_stop(uc);