zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target: fix display halt message logic 

If a target is run from gdb and then stopped from OpenOCD telnet interface,
halt does not show message with status and PC registers.

While on it rename 'display' to 'verbose_halt_msg' and use bool type
instead of int.

Change-Id: Ibe6589015b302e0be97258b06938c297745436a5
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4475
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
riscv-compliance-dev
Tomas Vanek 2018-03-22 11:53:40 +01:00 committed by Matthias Welwarsky
parent f035b0851b
commit 37deb37593
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openocd.c
View File

@ -87,13 +87,13 @@ static int log_target_callback_event_handler(struct target *target,
{
switch (event) {
case TARGET_EVENT_GDB_START:
target->display = 0;
target->verbose_halt_msg = false;
break;
case TARGET_EVENT_GDB_END:
target->display = 1;
target->verbose_halt_msg = true;
break;
case TARGET_EVENT_HALTED:
if (target->display) {
if (target->verbose_halt_msg) {
/* do not display information when debugger caused the halt */
target_arch_state(target);
}

5
src/target/target.c
View File

@ -2959,6 +2959,9 @@ COMMAND_HANDLER(handle_halt_command)
LOG_DEBUG("-");
struct target *target = get_current_target(CMD_CTX);
target->verbose_halt_msg = true;
int retval = target_halt(target);
if (ERROR_OK != retval)
return retval;
@ -5579,7 +5582,7 @@ static int target_create(Jim_GetOptInfo *goi)
target->next = NULL;
target->arch_info = NULL;
target->display = 1;
target->verbose_halt_msg = true;
target->halt_issued = false;

2
src/target/target.h
View File

@ -176,7 +176,7 @@ struct target {
void *private_config; /* pointer to target specific config data (for jim_configure hook) */
struct target *next; /* next target in list */
int display; /* display async info in telnet session. Do not display
bool verbose_halt_msg; /* display async info in telnet session. Do not display
* lots of halted/resumed info when stepping in debugger. */
bool halt_issued; /* did we transition to halted state? */
int64_t halt_issued_time; /* Note time when halt was issued */