yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 10:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Don't calculate lr in arm_v7m_cpu_do_interrupt() until needed

Browse source 
Move the code in arm_v7m_cpu_do_interrupt() that calculates the
magic LR value down to when we're actually going to use it.
Having the calculation and use so far apart makes the code
a little harder to understand than it needs to be.

Backports commit bd70b29ba92e4446f9e4eb8b9acc19ef6ff4a4d5 from qemu
This commit is contained in:
Peter Maydell 2018-03-04 12:59:36 -05:00 committed by Lioncash
parent 75f8224d13
commit 4ae080e27f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/target/arm/helper.c
View file

@ -5573,13 +5573,6 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
arm_log_exception(cs->exception_index); arm_log_exception(cs->exception_index);
lr = 0xfffffff1;
if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) {
lr |= 4;
}
if (env->v7m.exception == 0)
lr |= 8;
/* For exceptions we just mark as pending on the NVIC, and let that /* For exceptions we just mark as pending on the NVIC, and let that
handle it. */ handle it. */
switch (cs->exception_index) { switch (cs->exception_index) {
@ -5674,6 +5667,14 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
return; /* Never happens. Keep compiler happy. */ return; /* Never happens. Keep compiler happy. */
} }
lr = 0xfffffff1;
if (env->v7m.control & R_V7M_CONTROL_SPSEL_MASK) {
lr |= 4;
}
if (env->v7m.exception == 0) {
lr |= 8;
}
v7m_push_stack(cpu); v7m_push_stack(cpu);
v7m_exception_taken(cpu, lr); v7m_exception_taken(cpu, lr);
qemu_log_mask(CPU_LOG_INT, "... as %d\n", env->v7m.exception); qemu_log_mask(CPU_LOG_INT, "... as %d\n", env->v7m.exception);