From 86cf8d9fb0e9ef29d69b97d30aa5670814e00a24 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Mon, 4 Nov 2019 20:11:06 +0000 Subject: [PATCH] target/armv8: Add ARM target name on halt status The CPU target name is added to the HALT status message so the user can see which target halted at the designated program counter. Tested on an Ampere eMAG8180 and Quicksilver silicon Change-Id: I51e6f21296c85a822df28c5b7c4068e8ff66f29e Signed-off-by: Kevin Burke Signed-off-by: Daniel Goehring Reviewed-on: http://openocd.zylin.com/5571 Tested-by: jenkins Reviewed-by: Tarek BOCHKATI Reviewed-by: Antonio Borneo --- src/target/armv8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/target/armv8.c b/src/target/armv8.c index 88b932073b..61f11f24a1 100644 --- a/src/target/armv8.c +++ b/src/target/armv8.c @@ -1131,8 +1131,9 @@ int armv8_aarch64_state(struct target *target) return ERROR_FAIL; } - LOG_USER("target halted in %s state due to %s, current mode: %s\n" + LOG_USER("%s halted in %s state due to %s, current mode: %s\n" "cpsr: 0x%8.8" PRIx32 " pc: 0x%" PRIx64 "%s", + target_name(target), armv8_state_strings[arm->core_state], debug_reason_name(target), armv8_mode_name(arm->core_mode), -- 2.30.2