X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fxsvf%2Fxsvf.c;h=7aaab3ad5e7e84fc1ac9996605c69fe174f12b6c;hp=24a14de72f03dfea3b51e06ccd80f930deb504e4;hb=040e6cef41d77f6692f2f5e9c5849e6d8fbeeefd;hpb=cd0512befd0a1da2e8d67a86e5797d4c7b52aceb diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index 24a14de72f..7aaab3ad5e 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -42,21 +42,7 @@ #endif #include "xsvf.h" - #include "jtag.h" -#include "command.h" -#include "log.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include /* XSVF commands, from appendix B of xapp503.pdf */ @@ -174,91 +160,6 @@ static tap_state_t xsvf_to_tap( int xsvf_state ) } -/** - * Function xsvf_add_statemove - * moves from the current state to the goal \a state. This needs - * to be handled according to the xsvf spec, see the XSTATE command - * description. - */ -static int xsvf_add_statemove(tap_state_t goal_state) -{ - int retval = ERROR_OK; - - tap_state_t moves[8]; - tap_state_t cur_state = cmd_queue_cur_state; - int i; - int tms_bits; - int tms_count; - - LOG_DEBUG( "cur_state=%s goal_state=%s", - tap_state_name(cur_state), - tap_state_name(goal_state) ); - - - /* From the XSVF spec, pertaining to XSTATE: - - For special states known as stable states (Test-Logic-Reset, - Run-Test/Idle, Pause-DR, Pause- IR), an XSVF interpreter follows - predefined TAP state paths when the starting state is a stable state and - when the XSTATE specifies a new stable state (see the STATE command in - the [Ref 5] for the TAP state paths between stable states). For - non-stable states, XSTATE should specify a state that is only one TAP - state transition distance from the current TAP state to avoid undefined - TAP state paths. A sequence of multiple XSTATE commands can be issued to - transition the TAP through a specific state path. - */ - - if (goal_state==cur_state ) - ; /* nothing to do */ - - else if( goal_state==TAP_RESET ) - { - jtag_add_tlr(); - } - - else if( tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) ) - { - /* note: unless tms_bits holds a path that agrees with [Ref 5] in above - spec, then this code is not fully conformant to the xsvf spec. This - puts a burden on tap_get_tms_path() function from the xsvf spec. - If in doubt, you should confirm that that burden is being met. - */ - - tms_bits = tap_get_tms_path(cur_state, goal_state); - tms_count = tap_get_tms_path_len(cur_state, goal_state); - - assert( (unsigned) tms_count < DIM(moves) ); - - for (i=0; i>=1) - { - bool bit = tms_bits & 1; - - cur_state = tap_state_transition(cur_state, bit); - moves[i] = cur_state; - } - - jtag_add_pathmove(tms_count, moves); - } - - /* else state must be immediately reachable in one clock cycle, and does not - need to be a stable state. - */ - else if( tap_state_transition(cur_state, true) == goal_state - || tap_state_transition(cur_state, false) == goal_state ) - { - /* move a single state */ - moves[0] = goal_state; - jtag_add_pathmove( 1, moves ); - } - - else - { - retval = ERROR_FAIL; - } - - return retval; -} - int xsvf_register_commands(struct command_context_s *cmd_ctx) { @@ -501,15 +402,17 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha field.tap = tap; field.num_bits = xsdrsize; field.out_value = dr_out_buf; - - field.in_value = NULL; - - jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL); + field.in_value = calloc(CEIL(field.num_bits, 8), 1); if (tap == NULL) - jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); else - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); + + jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); + + free(field.in_value); + /* LOG_DEBUG("FLUSHING QUEUE"); */ result = jtag_execute_queue(); @@ -530,7 +433,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha /* See page 19 of XSVF spec regarding opcode "XSDR" */ if (xruntest) { - xsvf_add_statemove(TAP_IDLE); + jtag_add_statemove(TAP_IDLE); if (runtest_requires_tck) jtag_add_clocks(xruntest); @@ -538,7 +441,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha jtag_add_sleep(xruntest); } else if (xendir != TAP_DRPAUSE) /* we are already in TAP_DRPAUSE */ - xsvf_add_statemove(xenddr); + jtag_add_statemove(xenddr); } break; @@ -602,7 +505,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha the XSTATE. */ - if( xsvf_add_statemove( mystate ) != ERROR_OK ) + if( jtag_add_statemove( mystate ) != ERROR_OK ) { /* For special states known as stable states (Test-Logic-Reset, Run-Test/Idle, Pause-DR, Pause- IR), @@ -713,11 +616,11 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha field.tap = tap; field.num_bits = bitcount; field.out_value = ir_buf; - + field.in_value = NULL; + + - - field.in_handler = NULL; if (tap == NULL) jtag_add_plain_ir_scan(1, &field, my_end_state); @@ -806,9 +709,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha } else { - xsvf_add_statemove( wait_state ); + jtag_add_statemove( wait_state ); jtag_add_sleep(delay); - xsvf_add_statemove( end_state ); + jtag_add_statemove( end_state ); } } break; @@ -859,13 +762,13 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha unsupported = 1; } - xsvf_add_statemove( wait_state ); + jtag_add_statemove( wait_state ); jtag_add_clocks( clock_count ); jtag_add_sleep( usecs ); - xsvf_add_statemove( end_state ); + jtag_add_statemove( end_state ); } break; @@ -937,24 +840,27 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha { scan_field_t field; - xsvf_add_statemove( loop_state ); + jtag_add_statemove( loop_state ); jtag_add_clocks(loop_clocks); jtag_add_sleep(loop_usecs); field.tap = tap; field.num_bits = xsdrsize; field.out_value = dr_out_buf; - - field.in_value = NULL; + field.in_value = calloc(CEIL(field.num_bits, 8), 1); if (attempt > 0 && verbose) LOG_USER("LSDR retry %d", attempt); - jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL); if (tap == NULL) - jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); else - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE)); + + jtag_check_value_mask(&field, dr_in_buf, dr_in_mask); + + free(field.in_value); + /* LOG_DEBUG("FLUSHING QUEUE"); */ result = jtag_execute_queue(); @@ -1012,7 +918,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha LOG_DEBUG("xsvf failed, setting taps to reasonable state"); /* upon error, return the TAPs to a reasonable state */ - xsvf_add_statemove( TAP_IDLE ); + jtag_add_statemove( TAP_IDLE ); jtag_execute_queue(); break; } @@ -1029,9 +935,10 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha if (unsupported) { + off_t offset = lseek(xsvf_fd, 0, SEEK_CUR) - 1; command_print(cmd_ctx, - "unsupported xsvf command: 0x%02X in xsvf file at offset %ld, aborting", - uc, lseek(xsvf_fd, 0, SEEK_CUR)-1 ); + "unsupported xsvf command (0x%02X) at offset %jd, aborting", + uc, (intmax_t)offset); return ERROR_FAIL; }