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

openrisc: restore current JTAG module while polling the CPU 

Change-Id: I93827afaa164d23a93bdddbfa864624b18473f45
Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
Reviewed-on: http://openocd.zylin.com/2163
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
__archive__
Franck Jullien 2014-06-09 21:31:47 +02:00 committed by Andreas Fritiofson
parent 667bf9c80f
commit fd9f27bfac
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/target/openrisc/or1k_du_adv.c
View File

@ -50,6 +50,7 @@
#define DBG_MODULE_SELECT_REG_SIZE 2 #define DBG_MODULE_SELECT_REG_SIZE 2
#define DBG_MAX_MODULES 4 #define DBG_MAX_MODULES 4
#define DC_NONE -1
#define DC_WISHBONE 0 #define DC_WISHBONE 0
#define DC_CPU0 1 #define DC_CPU0 1
#define DC_CPU1 2 #define DC_CPU1 2
@ -173,7 +174,7 @@ static int or1k_adv_jtag_init(struct or1k_jtag *jtag_info)
jtag_info->or1k_jtag_inited = 1; jtag_info->or1k_jtag_inited = 1;
/* TAP reset - not sure what state debug module chain is in now */ /* TAP reset - not sure what state debug module chain is in now */
jtag_info->or1k_jtag_module_selected = -1; jtag_info->or1k_jtag_module_selected = DC_NONE;
jtag_info->current_reg_idx = malloc(DBG_MAX_MODULES * sizeof(uint8_t)); jtag_info->current_reg_idx = malloc(DBG_MAX_MODULES * sizeof(uint8_t));
memset(jtag_info->current_reg_idx, 0, DBG_MAX_MODULES * sizeof(uint8_t)); memset(jtag_info->current_reg_idx, 0, DBG_MAX_MODULES * sizeof(uint8_t));
@ -781,6 +782,8 @@ static int or1k_adv_is_cpu_running(struct or1k_jtag *jtag_info, int *running)
return retval; return retval;
} }
int current = jtag_info->or1k_jtag_module_selected;
retval = adbg_select_module(jtag_info, DC_CPU0); retval = adbg_select_module(jtag_info, DC_CPU0);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -795,6 +798,12 @@ static int or1k_adv_is_cpu_running(struct or1k_jtag *jtag_info, int *running)
else else
*running = 1; *running = 1;
if (current != DC_NONE) {
retval = adbg_select_module(jtag_info, current);
if (retval != ERROR_OK)
return retval;
}
return ERROR_OK; return ERROR_OK;
} }