mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-23 06:25:12 +00:00
target-arm: Log AArch64 exception returns
We already log exception entry; add logging of the AArch64 exception return path as well. Backports commit c9b61d9aa1ad234b0961f8add023cdc999cda3da from qemu
This commit is contained in:
parent
86670028f7
commit
554ad1f34e
|
@ -17,6 +17,7 @@
|
|||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/log.h"
|
||||
#include "cpu.h"
|
||||
#include "exec/helper-proto.h"
|
||||
#include "internals.h"
|
||||
|
@ -980,6 +981,9 @@ void HELPER(exception_return)(CPUARMState *env)
|
|||
} else {
|
||||
env->regs[15] = env->elr_el[cur_el] & ~0x3;
|
||||
}
|
||||
qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to "
|
||||
"AArch32 EL%d PC 0x%" PRIx32 "\n",
|
||||
cur_el, new_el, env->regs[15]);
|
||||
} else {
|
||||
env->aarch64 = 1;
|
||||
pstate_write(env, spsr);
|
||||
|
@ -988,6 +992,9 @@ void HELPER(exception_return)(CPUARMState *env)
|
|||
}
|
||||
aarch64_restore_sp(env, new_el);
|
||||
env->pc = env->elr_el[cur_el];
|
||||
qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to "
|
||||
"AArch64 EL%d PC 0x%" PRIx64 "\n",
|
||||
cur_el, new_el, env->pc);
|
||||
}
|
||||
|
||||
arm_call_el_change_hook(arm_env_get_cpu(env));
|
||||
|
@ -1010,6 +1017,8 @@ illegal_return:
|
|||
if (!arm_singlestep_active(env)) {
|
||||
env->pstate &= ~PSTATE_SS;
|
||||
}
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Illegal exception return at EL%d: "
|
||||
"resuming execution at 0x%" PRIx64 "\n", cur_el, env->pc);
|
||||
}
|
||||
|
||||
/* Return true if the linked breakpoint entry lbn passes its checks */
|
||||
|
|
Loading…
Reference in a new issue