haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

Browse source 
* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Decode SETEND correctly in Thumb
  target-arm: Clear IT bits when taking exceptions in v7M
  target-arm: Fix typo in ARM946 cp15 c5 handling
This commit is contained in:
Blue Swirl 2012-03-17 12:59:41 +00:00
parent 6b41fecf2e d9e028c1d9
commit 6344d922a1
2 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target-arm/helper.c
View file

@ -877,7 +877,8 @@ static void do_interrupt_v7m(CPUARMState *env)
v7m_push(env, env->regs[1]); v7m_push(env, env->regs[1]);
v7m_push(env, env->regs[0]); v7m_push(env, env->regs[0]);
switch_v7m_sp(env, 0); switch_v7m_sp(env, 0);
env->uncached_cpsr &= ~CPSR_IT; /* Clear IT bits */
env->condexec_bits = 0;
env->regs[14] = lr; env->regs[14] = lr;
addr = ldl_phys(env->v7m.vecbase + env->v7m.exception * 4); addr = ldl_phys(env->v7m.vecbase + env->v7m.exception * 4);
env->regs[15] = addr & 0xfffffffe; env->regs[15] = addr & 0xfffffffe;
@ -2025,7 +2026,7 @@ uint32_t HELPER(get_cp15)(CPUARMState *env, uint32_t insn)
return env->cp15.c5_data; return env->cp15.c5_data;
case 1: case 1:
if (arm_feature(env, ARM_FEATURE_MPU)) if (arm_feature(env, ARM_FEATURE_MPU))
return simple_mpu_ap_bits(env->cp15.c5_data); return simple_mpu_ap_bits(env->cp15.c5_insn);
return env->cp15.c5_insn; return env->cp15.c5_insn;
case 2: case 2:
if (!arm_feature(env, ARM_FEATURE_MPU)) if (!arm_feature(env, ARM_FEATURE_MPU))

63
target-arm/translate.c
View file

@ -9704,32 +9704,49 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)
store_reg(s, rd, tmp); store_reg(s, rd, tmp);
break; break;
case 6: /* cps */ case 6:
ARCH(6); switch ((insn >> 5) & 7) {
if (IS_USER(s)) case 2:
/* setend */
ARCH(6);
if (insn & (1 << 3)) {
/* BE8 mode not implemented. */
goto illegal_op;
}
break; break;
if (IS_M(env)) { case 3:
tmp = tcg_const_i32((insn & (1 << 4)) != 0); /* cps */
/* FAULTMASK */ ARCH(6);
if (insn & 1) { if (IS_USER(s)) {
addr = tcg_const_i32(19); break;
gen_helper_v7m_msr(cpu_env, addr, tmp);
tcg_temp_free_i32(addr);
} }
/* PRIMASK */ if (IS_M(env)) {
if (insn & 2) { tmp = tcg_const_i32((insn & (1 << 4)) != 0);
addr = tcg_const_i32(16); /* FAULTMASK */
gen_helper_v7m_msr(cpu_env, addr, tmp); if (insn & 1) {
tcg_temp_free_i32(addr); addr = tcg_const_i32(19);
gen_helper_v7m_msr(cpu_env, addr, tmp);
tcg_temp_free_i32(addr);
}
/* PRIMASK */
if (insn & 2) {
addr = tcg_const_i32(16);
gen_helper_v7m_msr(cpu_env, addr, tmp);
tcg_temp_free_i32(addr);
}
tcg_temp_free_i32(tmp);
gen_lookup_tb(s);
} else {
if (insn & (1 << 4)) {
shift = CPSR_A | CPSR_I | CPSR_F;
} else {
shift = 0;
}
gen_set_psr_im(s, ((insn & 7) << 6), 0, shift);
} }
tcg_temp_free_i32(tmp); break;
gen_lookup_tb(s); default:
} else { goto undef;
if (insn & (1 << 4))
shift = CPSR_A | CPSR_I | CPSR_F;
else
shift = 0;
gen_set_psr_im(s, ((insn & 7) << 6), 0, shift);
} }
break; break;