yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ns and s in cp reg encoding

Browse Source
This commit is contained in:
lazymio
2022-02-12 14:29:42 +01:00
parent 380e72bc12
commit c2bb5c8838
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/target/arm/unicorn_arm.c
View File

@ -150,8 +150,9 @@ static void v7m_msr_xpsr(CPUARMState *env, uint32_t mask, uint32_t reg,
static uc_err read_cp_reg(CPUARMState *env, uc_arm_cp_reg *cp) static uc_err read_cp_reg(CPUARMState *env, uc_arm_cp_reg *cp)
{ {
ARMCPU *cpu = ARM_CPU(env->uc->cpu); ARMCPU *cpu = ARM_CPU(env->uc->cpu);
int ns = cp->sec ? 0 : 1;
const ARMCPRegInfo *ri = get_arm_cp_reginfo( const ARMCPRegInfo *ri = get_arm_cp_reginfo(
cpu->cp_regs, ENCODE_CP_REG(cp->cp, cp->is64, cp->sec, cp->crn, cp->crm, cpu->cp_regs, ENCODE_CP_REG(cp->cp, cp->is64, ns, cp->crn, cp->crm,
cp->opc1, cp->opc2)); cp->opc1, cp->opc2));
if (!ri) { if (!ri) {
@ -170,8 +171,9 @@ static uc_err read_cp_reg(CPUARMState *env, uc_arm_cp_reg *cp)
static uc_err write_cp_reg(CPUARMState *env, uc_arm_cp_reg *cp) static uc_err write_cp_reg(CPUARMState *env, uc_arm_cp_reg *cp)
{ {
ARMCPU *cpu = ARM_CPU(env->uc->cpu); ARMCPU *cpu = ARM_CPU(env->uc->cpu);
int ns = cp->sec ? 0 : 1;
const ARMCPRegInfo *ri = get_arm_cp_reginfo( const ARMCPRegInfo *ri = get_arm_cp_reginfo(
cpu->cp_regs, ENCODE_CP_REG(cp->cp, cp->is64, cp->sec, cp->crn, cp->crm, cpu->cp_regs, ENCODE_CP_REG(cp->cp, cp->is64, ns, cp->crn, cp->crm,
cp->opc1, cp->opc2)); cp->opc1, cp->opc2));
if (!ri) { if (!ri) {