On Tuesday 27 October 2009, Wookey wrote:
> > So if I whack together a patch turning XSVF's (c) into
> > the (b) which is supported, you could test it and maybe
> > fix any goofs?
>
> Yes, I think so (fighting chance at least).
Alrighty ...
============ CUT HERE
Preliminary implementation of XSVF support for detailed
state path transitions.
Handling of paths that go *through* reset is a trifle dodgey,
but it should be safe.
---
src/xsvf/xsvf.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 94 insertions(+), 12 deletions(-)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -211,9 +211,16 @@ static int handle_xsvf_command(struct co
int tdo_mismatch = 0;
int result;
int verbose = 1;
- char* filename;
+ char *filename;
- int runtest_requires_tck = 0; /* a flag telling
whether to clock TCK during waits, or simply sleep, controled by virt2 */
+ bool collecting_path = false;
+ tap_state_t path[XSTATE_MAX_PATH];
+ unsigned pathlen = 0;
+
+ /* a flag telling whether to clock TCK during waits,
+ * or simply sleep, controled by virt2
+ */
+ int runtest_requires_tck = 0;
/* use NULL to indicate a "plain" xsvf file which accounts for
@@ -263,9 +270,80 @@ static int handle_xsvf_command(struct co
while (read(xsvf_fd, &opcode, 1) > 0)
{
- /* record the position of the just read opcode within the file
*/
+ /* record the position of this opcode within the file */
file_offset = lseek(xsvf_fd, 0, SEEK_CUR) - 1;
+ /* maybe collect another state for a pathmove();
+ * or terminate a path.
+ */
+ if (collecting_path) {
+ tap_state_t mystate;
+ uint8_t uc;
+
+ switch (opcode) {
+ case XCOMMENT:
+ /* ignore/show comments between XSTATE ops */
+ break;
+ case XSTATE:
+ /* try to collect another transition */
+ if (pathlen == XSTATE_MAX_PATH) {
+ LOG_ERROR("XSVF: path too long");
+ do_abort = 1;
+ break;
+ }
+
+ if (read(xsvf_fd, &uc, 1) < 0)
+ {
+ do_abort = 1;
+ break;
+ }
+
+ mystate = xsvf_to_tap(uc);
+ path[pathlen++] = mystate;
+
+ LOG_DEBUG("XSTATE 0x%02X %s", uc,
+ tap_state_name(mystate));
+
+ /* If path is incomplete, collect more */
+ if (!svf_tap_state_is_stable(mystate))
+ continue;
+
+ /* Else execute the path transitions we've
+ * collected so far.
+ *
+ * REVISIT punting on the saved path is not
+ * strictly correct, but we must to do this
+ * until jtag_add_pathmove() stops rejecting
+ * paths containing RESET. This is probably
+ * harmless, since there aren't many options
+ * for going from a stable state to reset.
+ */
+ if (mystate == TAP_RESET) {
+ LOG_WARNING("XSVF: dodgy RESET");
+ path[0] = mystate;
+ }
+
+ /* FALL THROUGH */
+ default:
+ /* execute the path we collected */
+ collecting_path = false;
+
+ if (path[0] == TAP_RESET)
+ jtag_add_tlr();
+ else
+ jtag_add_pathmove(pathlen, path);
+
+ result = jtag_get_error();
+ if (result != ERROR_OK) {
+ LOG_ERROR("XSVF: pathmove error %d",
+ result);
+ do_abort = 1;
+ break;
+ }
+ continue;
+ }
+ }
+
switch (opcode)
{
case XCOMPLETE:
@@ -503,6 +581,12 @@ static int handle_xsvf_command(struct co
LOG_DEBUG("XSTATE 0x%02X %s", uc,
tap_state_name(mystate));
+ if (mystate == TAP_INVALID) {
+ LOG_ERROR("XSVF: bad XSTATE %02x", uc);
+ do_abort = 1;
+ break;
+ }
+
/* NOTE: the current state is SVF-stable! */
/* no change == NOP */
@@ -521,19 +605,17 @@ static int handle_xsvf_command(struct co
/*
* A sequence of XSTATE transitions, each TAP
- * state adjacent to the previous one.
+ * state adjacent to the previous one. Start
+ * collecting them.
*
* NOTE: OpenOCD requires something that XSVF
* doesn't: the last TAP state in the path
- * must be stable.
- *
- * FIXME Implement path collection; submit via
- * jtag_add_pathmove() after teaching it to
- * report errors.
+ * must be stable. In practice, tools creating
+ * XSVF seem to follow that rule too.
*/
- LOG_ERROR("XSVF: 'XSTATE %s' ... NYET",
- tap_state_name(mystate));
- unsupported = 1;
+ collecting_path = true;
+ pathlen = 1;
+ path[0] = mystate;
}
break;
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
