Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix a bunch of typos.
[openocd.git] / src / svf / svf.c
diff --git a/src/svf/svf.c b/src/svf/svf.c
index a015e3c435b31738032a7371659001d19a7acfd0..0cca768d758bd76881d9893deb409c3a0cc3fb75 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -223,6 +223,7 @@ static int svf_getline (char **lineptr, size_t *n, FILE *stream);
 static uint8_t *svf_tdi_buffer = NULL, *svf_tdo_buffer = NULL, *svf_mask_buffer = NULL;
 static int svf_buffer_index = 0, svf_buffer_size = 0;
 static int svf_quiet = 0;
+static int svf_nil = 0;
 
 // Targetting particular tap
 static int svf_tap_is_specified = 0;
@@ -288,6 +289,9 @@ int svf_add_statemove(tap_state_t state_to)
 
        /* when resetting, be paranoid and ignore current state */
        if (state_to == TAP_RESET) {
+               if (svf_nil)
+                       return ERROR_OK;
+
                jtag_add_tlr();
                return ERROR_OK;
        }
@@ -297,6 +301,10 @@ int svf_add_statemove(tap_state_t state_to)
                if ((svf_statemoves[index_var].from == state_from)
                        && (svf_statemoves[index_var].to == state_to))
                {
+                       if (svf_nil)
+                       {
+                               continue;
+                       }
                        /* recorded path includes current state ... avoid extra TCKs! */
                        if (svf_statemoves[index_var].num_of_moves > 1)
                                jtag_add_pathmove(svf_statemoves[index_var].num_of_moves - 1,
@@ -315,8 +323,6 @@ COMMAND_HANDLER(handle_svf_command)
 {
 #define SVF_MIN_NUM_OF_OPTIONS                 1
 #define SVF_MAX_NUM_OF_OPTIONS                 5
-#define USAGE [-tap device.tap] <file> [quiet] [progress]
-#define PRINT_USAGE    command_print(CMD_CTX, "svf USAGE")
        int command_num = 0;
        int ret = ERROR_OK;
        long long time_measure_ms;
@@ -330,12 +336,12 @@ COMMAND_HANDLER(handle_svf_command)
 
        if ((CMD_ARGC < SVF_MIN_NUM_OF_OPTIONS) || (CMD_ARGC > SVF_MAX_NUM_OF_OPTIONS))
        {
-               PRINT_USAGE;
-               return ERROR_FAIL;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // parse command line
        svf_quiet = 0;
+       svf_nil = 0;
        for (unsigned int i = 0; i < CMD_ARGC; i++)
        {
                if (strcmp(CMD_ARGV[i], "-tap") == 0)
@@ -352,6 +358,10 @@ COMMAND_HANDLER(handle_svf_command)
                {
                        svf_quiet = 1;
                }
+               else if ((strcmp(CMD_ARGV[i], "nil") == 0) || (strcmp(CMD_ARGV[i], "-nil") == 0))
+               {
+                       svf_nil = 1;
+               }
                else if ((strcmp(CMD_ARGV[i], "progress") == 0) || (strcmp(CMD_ARGV[i], "-progress") == 0))
                {
                        svf_progress_enabled = 1;
@@ -359,10 +369,9 @@ COMMAND_HANDLER(handle_svf_command)
                else if ((svf_fd = fopen(CMD_ARGV[i], "r")) == NULL)
                {
                        int err = errno;
-                       PRINT_USAGE;
                        command_print(CMD_CTX, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
                        // no need to free anything now
-                       return ERROR_FAIL;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
                else
                {
@@ -372,8 +381,7 @@ COMMAND_HANDLER(handle_svf_command)
 
        if (svf_fd == NULL)
        {
-               PRINT_USAGE;
-               return ERROR_FAIL;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // get time
@@ -394,7 +402,7 @@ COMMAND_HANDLER(handle_svf_command)
 
        svf_buffer_index = 0;
        // double the buffer size
-       // in case current command cannot be commited, and next command is a bit scan command
+       // in case current command cannot be committed, and next command is a bit scan command
        // here is 32K bits for this big scan command, it should be enough
        // buffer will be reallocated if buffer size is not enough
        svf_tdi_buffer = (uint8_t *)malloc(2 * SVF_MAX_BUFFER_SIZE_TO_COMMIT);
@@ -422,8 +430,11 @@ COMMAND_HANDLER(handle_svf_command)
 
        memcpy(&svf_para, &svf_para_init, sizeof(svf_para));
 
-       // TAP_RESET
-       jtag_add_tlr();
+       if (!svf_nil)
+       {
+               // TAP_RESET
+               jtag_add_tlr();
+       }
 
        if (tap)
        {
@@ -524,7 +535,8 @@ COMMAND_HANDLER(handle_svf_command)
                }
                command_num++;
        }
-       if (ERROR_OK != jtag_execute_queue())
+
+       if ((!svf_nil) && (ERROR_OK != jtag_execute_queue()))
        {
                ret = ERROR_FAIL;
        }
@@ -961,7 +973,7 @@ static int svf_add_check_para(uint8_t enabled, int buffer_offset, int bit_len)
 
 static int svf_execute_tap(void)
 {
-       if (ERROR_OK != jtag_execute_queue())
+       if ((!svf_nil) && (ERROR_OK != jtag_execute_queue()))
        {
                return ERROR_FAIL;
        }
@@ -1289,8 +1301,11 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        field.num_bits = i;
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       /* NOTE:  doesn't use SVF-specified state paths */
-                       jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value, svf_para.dr_end_state);
+                       if (!svf_nil)
+                       {
+                               /* NOTE:  doesn't use SVF-specified state paths */
+                               jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value, svf_para.dr_end_state);
+                       }
 
                        svf_buffer_index += (i + 7) >> 3;
                }
@@ -1384,9 +1399,12 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        field.num_bits = i;
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       /* NOTE:  doesn't use SVF-specified state paths */
-                       jtag_add_plain_ir_scan(field.num_bits, field.out_value, field.in_value,
-                                       svf_para.ir_end_state);
+                       if (!svf_nil)
+                       {
+                               /* NOTE:  doesn't use SVF-specified state paths */
+                               jtag_add_plain_ir_scan(field.num_bits, field.out_value, field.in_value,
+                                               svf_para.ir_end_state);
+                       }
 
                        svf_buffer_index += (i + 7) >> 3;
                }
@@ -1483,47 +1501,48 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        }
                        i += 2;
                }
-               // calculate run_count
-               if ((0 == run_count) && (min_time > 0))
-               {
-                       run_count = min_time * svf_para.frequency;
-               }
+
                // all parameter should be parsed
                if (i == num_of_argu)
                {
-                       if (run_count > 0)
-                       {
-                               // run_state and end_state is checked to be stable state
-                               // TODO: do runtest
 #if 1
-                               /* FIXME handle statemove failures */
-                               int retval;
+                       /* FIXME handle statemove failures */
+                       int retval;
+                       uint32_t min_usec = 1000000 * min_time;
 
-                               // enter into run_state if necessary
-                               if (cmd_queue_cur_state != svf_para.runtest_run_state)
-                               {
-                                       retval = svf_add_statemove(svf_para.runtest_run_state);
-                               }
+                       // enter into run_state if necessary
+                       if (cmd_queue_cur_state != svf_para.runtest_run_state)
+                       {
+                               retval = svf_add_statemove(svf_para.runtest_run_state);
+                       }
 
-                               // call jtag_add_clocks
-                               jtag_add_clocks(run_count);
+                       // add clocks and/or min wait
+                       if (run_count > 0) {
+                               if (!svf_nil)
+                                       jtag_add_clocks(run_count);
+                       }
 
-                               // move to end_state if necessary
-                               if (svf_para.runtest_end_state != svf_para.runtest_run_state)
-                               {
-                                       retval = svf_add_statemove(svf_para.runtest_end_state);
-                               }
+                       if (min_usec > 0) {
+                               if (!svf_nil)
+                                       jtag_add_sleep(min_usec);
+                       }
+
+                       // move to end_state if necessary
+                       if (svf_para.runtest_end_state != svf_para.runtest_run_state)
+                       {
+                               retval = svf_add_statemove(svf_para.runtest_end_state);
+                       }
 #else
-                               if (svf_para.runtest_run_state != TAP_IDLE)
-                               {
-                                       LOG_ERROR("cannot runtest in %s state",
-                                               tap_state_name(svf_para.runtest_run_state));
-                                       return ERROR_FAIL;
-                               }
+                       if (svf_para.runtest_run_state != TAP_IDLE)
+                       {
+                               LOG_ERROR("cannot runtest in %s state",
+                                       tap_state_name(svf_para.runtest_run_state));
+                               return ERROR_FAIL;
+                       }
 
+                       if (!svf_nil)
                                jtag_add_runtest(run_count, svf_para.runtest_end_state);
 #endif
-                       }
                }
                else
                {
@@ -1565,9 +1584,11 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                                        /* FIXME last state MUST be stable! */
                                        if (i > 0)
                                        {
-                                               jtag_add_pathmove(i, path);
+                                               if (!svf_nil)
+                                                       jtag_add_pathmove(i, path);
                                        }
-                                       jtag_add_tlr();
+                                       if (!svf_nil)
+                                               jtag_add_tlr();
                                        num_of_argu -= i + 1;
                                        i = -1;
                                }
@@ -1578,7 +1599,8 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                                if (svf_tap_state_is_stable(path[num_of_argu - 1]))
                                {
                                        // last state MUST be stable state
-                                       jtag_add_pathmove(num_of_argu, path);
+                                       if (!svf_nil)
+                                               jtag_add_pathmove(num_of_argu, path);
                                        LOG_DEBUG("\tmove to %s by path_move",
                                                tap_state_name(path[num_of_argu - 1]));
                                }
@@ -1633,11 +1655,13 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        switch (i_tmp)
                        {
                        case TRST_ON:
-                               jtag_add_reset(1, 0);
+                               if (!svf_nil)
+                                       jtag_add_reset(1, 0);
                                break;
                        case TRST_Z:
                        case TRST_OFF:
-                               jtag_add_reset(0, 0);
+                               if (!svf_nil)
+                                       jtag_add_reset(0, 0);
                                break;
                        case TRST_ABSENT:
                                break;
@@ -1712,7 +1736,7 @@ static const struct command_registration svf_command_handlers[] = {
                .handler = handle_svf_command,
                .mode = COMMAND_EXEC,
                .help = "Runs a SVF file.",
-               .usage = "USAGE",
+               .usage = "svf [-tap device.tap] <file> [quiet] [nil] [progress]",
        },
        COMMAND_REGISTRATION_DONE
 };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)