interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SVF: better spec conformance for STATE switch 

Don't add extra TCK in current state; exit from RESET had four extras.
Only IDLE --> IDLE needs such an extra clock.  (At least one TCK must
be issued.)

Allow entry to RESET; SVF allows it, so must we (despite those entries
being commented out of the statemove table).

When entering RESET, always use TLR ... we might end up with extra clocks
in reset that way, which is harmless, but we'll never end up in any other
state than RESET, which is useful paranoia.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-10-19 23:33:08 -07:00
parent c70073ef67
commit 6907ef9d50
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/svf/svf.c
View File

@ -316,30 +316,28 @@ static int svf_add_statemove(tap_state_t state_to)
tap_state_t state_from = cmd_queue_cur_state; tap_state_t state_from = cmd_queue_cur_state;
uint8_t index; uint8_t index;
/* when resetting, be paranoid and ignore current state */
if (state_to == TAP_RESET) {
jtag_add_tlr();
return ERROR_OK;
}
for (index = 0; index < dimof(svf_statemoves); index++) for (index = 0; index < dimof(svf_statemoves); index++)
{ {
if ((svf_statemoves[index].from == state_from) if ((svf_statemoves[index].from == state_from)
&& (svf_statemoves[index].to == state_to)) && (svf_statemoves[index].to == state_to))
{ {
if (TAP_RESET == state_from) /* recorded path includes current state ... avoid extra TCKs! */
{ if (svf_statemoves[index].num_of_moves > 1)
jtag_add_tlr(); jtag_add_pathmove(svf_statemoves[index].num_of_moves - 1,
if (svf_statemoves[index].num_of_moves > 1) svf_statemoves[index].paths + 1);
{
jtag_add_pathmove(svf_statemoves[index].num_of_moves - 1, svf_statemoves[index].paths + 1);
}
}
else else
{ jtag_add_pathmove(svf_statemoves[index].num_of_moves,
if (svf_statemoves[index].num_of_moves > 0) svf_statemoves[index].paths);
{
jtag_add_pathmove(svf_statemoves[index].num_of_moves, svf_statemoves[index].paths);
}
}
return ERROR_OK; return ERROR_OK;
} }
} }
LOG_ERROR("can not move to %s", tap_state_svf_name(state_to)); LOG_ERROR("SVF: can not move to %s", tap_state_svf_name(state_to));
return ERROR_FAIL; return ERROR_FAIL;
} }