From: Matthias Welwarsky Date: Fri, 17 Feb 2017 15:22:52 +0000 (+0100) Subject: armv8_dpm: fix exception handling X-Git-Tag: v0.11.0-rc1~1438 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=9981093ce076a388700b2f307a9dc79e14a6e0f1;ds=sidebyside armv8_dpm: fix exception handling after handling of an exception in debug state, immediately restore the original core state. Change-Id: Ie53b63c9f19815f717f4df4390fbc13f0a204cc2 Signed-off-by: Matthias Welwarsky Reviewed-on: http://openocd.zylin.com/3996 Tested-by: jenkins Reviewed-by: Paul Fertser --- diff --git a/src/target/armv8_dpm.c b/src/target/armv8_dpm.c index e5d10df6e7..f4e7a07996 100644 --- a/src/target/armv8_dpm.c +++ b/src/target/armv8_dpm.c @@ -1312,6 +1312,8 @@ void armv8_dpm_handle_exception(struct arm_dpm *dpm) core_state = armv8_dpm_get_core_state(dpm); armv8_select_opcodes(armv8, core_state == ARM_STATE_AARCH64); armv8_select_reg_access(armv8, core_state == ARM_STATE_AARCH64); + + armv8_dpm_modeswitch(dpm, ARM_MODE_ANY); } /*----------------------------------------------------------------------*/