Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
SimonQian <simonqian@SimonQian.com>:
[openocd.git] / src / svf / svf.c
diff --git a/src/svf/svf.c b/src/svf/svf.c
index 6c92c1e15b7e119b0a38e8b8b6ab7240ce13348d..0552c122ccbabf64163a2a00f2137c9d5744c6ac 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -33,22 +33,9 @@
 #endif
 
 #include "svf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 // SVF command
 typedef enum
@@ -343,7 +330,7 @@ static int handle_svf_command(struct command_context_s *cmd_ctx, char *cmd, char
        }
 
        // print time
-       command_print(cmd_ctx, "%d ms used", timeval_ms() - time_ago);
+       command_print(cmd_ctx, "%lld ms used", timeval_ms() - time_ago);
 
 free_all:
 
@@ -641,26 +628,35 @@ static int svf_copy_hexstring_to_binary(char *str, u8 **bin, int orig_bit_len, i
 
 static int svf_check_tdo(void)
 {
-       int i, j, byte_len, index;
+       int i, len, index;
 
        for (i = 0; i < svf_check_tdo_para_index; i++)
        {
-               if (svf_check_tdo_para[i].enabled)
+               index = svf_check_tdo_para[i].buffer_offset;
+               len = svf_check_tdo_para[i].bit_len;
+               if ((svf_check_tdo_para[i].enabled) 
+                       && buf_cmp_mask(&svf_tdi_buffer[index], &svf_tdo_buffer[index], &svf_mask_buffer[index], len))
                {
-                       byte_len = (svf_check_tdo_para[i].bit_len + 7) >> 3;
-                       index = svf_check_tdo_para[i].buffer_offset;
-                       for (j = 0; j < byte_len; j++)
+                       unsigned bitmask;
+                       unsigned received, expected, tapmask;
+                       if (svf_check_tdo_para[i].bit_len >= 32)
                        {
-                               if ((svf_tdi_buffer[index + j] & svf_mask_buffer[index + j]) != svf_tdo_buffer[index + j])
-                               {
-                                       LOG_ERROR("tdo check error at line %d, read = 0x%X, want = 0x%X, mask = 0x%X",
-                                                               svf_check_tdo_para[i].line_num,
-                                                               (*(int*)(svf_tdi_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-                                                               (*(int*)(svf_tdo_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-                                                               (*(int*)(svf_mask_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1));
-                                       return ERROR_FAIL;
-                               }
+                               bitmask = 0xFFFFFFFF;
                        }
+                       else
+                       {
+                               bitmask = (1 << svf_check_tdo_para[i].bit_len) - 1;
+                       }
+                       memcpy(&received, svf_tdi_buffer + index, sizeof(unsigned));
+                       memcpy(&expected, svf_tdo_buffer + index, sizeof(unsigned));
+                       memcpy(&tapmask, svf_mask_buffer + index, sizeof(unsigned));
+                       LOG_ERROR("tdo check error at line %d", 
+                                         svf_check_tdo_para[i].line_num);
+                       LOG_ERROR("read = 0x%X, want = 0x%X, mask = 0x%X", 
+                                         received & bitmask, 
+                                         expected & bitmask, 
+                                         tapmask & bitmask);
+                       return ERROR_FAIL;
                }
        }
        svf_check_tdo_para_index = 0;
@@ -702,9 +698,8 @@ static int svf_execute_tap(void)
 }
 
 // not good to use this
-extern jtag_command_t** jtag_get_last_command_p(void);
 extern void* cmd_queue_alloc(size_t size);
-extern jtag_command_t **last_comand_pointer;
+extern void jtag_queue_command(jtag_command_t * cmd);
 
 static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
 {
@@ -714,9 +709,6 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
        // tmp variable
        int i_tmp;
 
-       // not good to use this
-       jtag_command_t **last_cmd;
-
        // for RUNTEST
        int run_count;
        float min_time, max_time;
@@ -977,10 +969,10 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
                        
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
+                       
+                       
+                       
+                       
                        jtag_add_plain_dr_scan(1, &field, svf_para.dr_end_state);
 
                        svf_buffer_index += (i + 7) >> 3;
@@ -1078,10 +1070,10 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.out_value = &svf_tdi_buffer[svf_buffer_index];
                        
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
-                       field.in_check_value = NULL;
-                       field.in_check_mask = NULL;
-                       field.in_handler = NULL;
-                       field.in_handler_priv = NULL;
+                       
+                       
+                       
+                       
                        jtag_add_plain_ir_scan(1, &field, svf_para.ir_end_state);
 
                        svf_buffer_index += (i + 7) >> 3;
@@ -1187,15 +1179,15 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                                // enter into run_state if necessary
                                if (last_state != svf_para.runtest_run_state)
                                {
-                                       last_cmd = jtag_get_last_command_p();
-                                       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                                       last_comand_pointer = &((*last_cmd)->next);
-                                       (*last_cmd)->next = NULL;
-                                       (*last_cmd)->type = JTAG_STATEMOVE;
-                                       (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                                       (*last_cmd)->cmd.statemove->end_state = svf_para.runtest_run_state;
-
-                                       cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                                       jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                                       jtag_queue_command(cmd);
+                               
+                                       cmd->type = JTAG_STATEMOVE;
+                                       cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                                       cmd->cmd.statemove->end_state = svf_para.runtest_run_state;
+
+                                       cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                }
 
                                // call jtag_add_clocks
@@ -1204,15 +1196,14 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                                if (svf_para.runtest_end_state != svf_para.runtest_run_state)
                                {
                                        // move to end_state
-                                       last_cmd = jtag_get_last_command_p();
-                                       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                                       last_comand_pointer = &((*last_cmd)->next);
-                                       (*last_cmd)->next = NULL;
-                                       (*last_cmd)->type = JTAG_STATEMOVE;
-                                       (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                                       (*last_cmd)->cmd.statemove->end_state = svf_para.runtest_end_state;
-
-                                       cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                                       jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                                       jtag_queue_command(cmd);
+                                       cmd->type = JTAG_STATEMOVE;
+                                       cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                                       cmd->cmd.statemove->end_state = svf_para.runtest_end_state;
+
+                                       cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                }
                                last_state = svf_para.runtest_end_state;
 #else
@@ -1301,15 +1292,15 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        if (svf_tap_state_is_stable(state))
                        {
                                // TODO: move to state
-                               last_cmd = jtag_get_last_command_p();
-                               *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                               last_comand_pointer = &((*last_cmd)->next);
-                               (*last_cmd)->next = NULL;
-                               (*last_cmd)->type = JTAG_STATEMOVE;
-                               (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                               (*last_cmd)->cmd.statemove->end_state = state;
-
-                               cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                               jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                               jtag_queue_command(cmd);
+                               
+                               cmd->type = JTAG_STATEMOVE;
+                               cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                               cmd->cmd.statemove->end_state = state;
+
+                               cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                last_state = state;
 
                                LOG_DEBUG("\tmove to %s by state_move", svf_tap_state_name[state]);
@@ -1381,8 +1372,11 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        // output debug info
                        if ((SIR == command) || (SDR == command))
                        {
+                               int read_value;
+                               memcpy(&read_value, svf_tdi_buffer, sizeof(int));
                                // in debug mode, data is from index 0
-                               LOG_DEBUG("\tTDO read = 0x%X", (*(int*)svf_tdi_buffer) & ((1 << (svf_check_tdo_para[0].bit_len)) - 1));
+                               int read_mask = (1 << (svf_check_tdo_para[0].bit_len)) - 1;
+                               LOG_DEBUG("\tTDO read = 0x%X", read_value & read_mask);
                        }
                }
        }
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)