X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcommands.c;h=3352e035acc9fd78739ea4e9dc5273864aa38e79;hp=d236fe997a2f24a55c6e5e9323ba7a9cf7e5841f;hb=8b9560349fb78887d8e353e20b303966d9ac2d1b;hpb=787a5067fbe0eaf05ad2f41a64c3eac776905724 diff --git a/src/jtag/commands.c b/src/jtag/commands.c index d236fe997a..3352e035ac 100644 --- a/src/jtag/commands.c +++ b/src/jtag/commands.c @@ -23,10 +23,9 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -35,20 +34,21 @@ #include "commands.h" struct cmd_queue_page { + struct cmd_queue_page *next; void *address; size_t used; - struct cmd_queue_page *next; }; #define CMD_QUEUE_PAGE_SIZE (1024 * 1024) -static struct cmd_queue_page *cmd_queue_pages = NULL; +static struct cmd_queue_page *cmd_queue_pages; +static struct cmd_queue_page *cmd_queue_pages_tail; -struct jtag_command *jtag_command_queue = NULL; +struct jtag_command *jtag_command_queue; static struct jtag_command **next_command_pointer = &jtag_command_queue; -void jtag_queue_command(struct jtag_command * cmd) +void jtag_queue_command(struct jtag_command *cmd) { - // this command goes on the end, so ensure the queue terminates + /* this command goes on the end, so ensure the queue terminates */ cmd->next = NULL; struct jtag_command **last_cmd = next_command_pointer; @@ -56,11 +56,11 @@ void jtag_queue_command(struct jtag_command * cmd) assert(NULL == *last_cmd); *last_cmd = cmd; - // store location where the next command pointer will be stored + /* store location where the next command pointer will be stored */ next_command_pointer = &cmd->next; } -void* cmd_queue_alloc(size_t size) +void *cmd_queue_alloc(size_t size) { struct cmd_queue_page **p_page = &cmd_queue_pages; int offset; @@ -95,29 +95,29 @@ void* cmd_queue_alloc(size_t size) #define ALIGN_SIZE (sizeof(union worse_case_align)) /* The alignment process. */ - size = (size + ALIGN_SIZE -1) & (~(ALIGN_SIZE-1)); + size = (size + ALIGN_SIZE - 1) & (~(ALIGN_SIZE - 1)); /* Done... */ - if (*p_page) - { - while ((*p_page)->next) - p_page = &((*p_page)->next); + if (*p_page) { + p_page = &cmd_queue_pages_tail; if (CMD_QUEUE_PAGE_SIZE - (*p_page)->used < size) p_page = &((*p_page)->next); } - if (!*p_page) - { + if (!*p_page) { *p_page = malloc(sizeof(struct cmd_queue_page)); (*p_page)->used = 0; - (*p_page)->address = malloc(CMD_QUEUE_PAGE_SIZE); + size_t alloc_size = (size < CMD_QUEUE_PAGE_SIZE) ? + CMD_QUEUE_PAGE_SIZE : size; + (*p_page)->address = malloc(alloc_size); (*p_page)->next = NULL; + cmd_queue_pages_tail = *p_page; } offset = (*p_page)->used; (*p_page)->used += size; - t = (uint8_t *)((*p_page)->address); + t = (*p_page)->address; return t + offset; } @@ -125,8 +125,7 @@ static void cmd_queue_free(void) { struct cmd_queue_page *page = cmd_queue_pages; - while (page) - { + while (page) { struct cmd_queue_page *last = page; free(page->address); page = page->next; @@ -134,6 +133,7 @@ static void cmd_queue_free(void) } cmd_queue_pages = NULL; + cmd_queue_pages_tail = NULL; } void jtag_command_queue_reset(void) @@ -144,13 +144,24 @@ void jtag_command_queue_reset(void) next_command_pointer = &jtag_command_queue; } +/** + * Copy a struct scan_field for insertion into the queue. + * + * This allocates a new copy of out_value using cmd_queue_alloc. + */ +void jtag_scan_field_clone(struct scan_field *dst, const struct scan_field *src) +{ + dst->num_bits = src->num_bits; + dst->out_value = buf_cpy(src->out_value, cmd_queue_alloc(DIV_ROUND_UP(src->num_bits, 8)), src->num_bits); + dst->in_value = src->in_value; +} + enum scan_type jtag_scan_type(const struct scan_command *cmd) { int i; int type = 0; - for (i = 0; i < cmd->num_fields; i++) - { + for (i = 0; i < cmd->num_fields; i++) { if (cmd->fields[i].in_value) type |= SCAN_IN; if (cmd->fields[i].out_value) @@ -167,9 +178,7 @@ int jtag_scan_size(const struct scan_command *cmd) /* count bits in scan command */ for (i = 0; i < cmd->num_fields; i++) - { bit_count += cmd->fields[i].num_bits; - } return bit_count; } @@ -180,41 +189,37 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) int i; bit_count = jtag_scan_size(cmd); - *buffer = calloc(1,DIV_ROUND_UP(bit_count, 8)); + *buffer = calloc(1, DIV_ROUND_UP(bit_count, 8)); bit_count = 0; - DEBUG_JTAG_IO("%s num_fields: %i", + LOG_DEBUG_IO("%s num_fields: %i", cmd->ir_scan ? "IRSCAN" : "DRSCAN", cmd->num_fields); - for (i = 0; i < cmd->num_fields; i++) - { - if (cmd->fields[i].out_value) - { -#ifdef _DEBUG_JTAG_IO_ - char *char_buf = buf_to_str(cmd->fields[i].out_value, - (cmd->fields[i].num_bits > DEBUG_JTAG_IOZ) - ? DEBUG_JTAG_IOZ - : cmd->fields[i].num_bits, 16); - - LOG_DEBUG("fields[%i].out_value[%i]: 0x%s", i, - cmd->fields[i].num_bits, char_buf); - free(char_buf); -#endif + for (i = 0; i < cmd->num_fields; i++) { + if (cmd->fields[i].out_value) { + if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + char *char_buf = buf_to_str(cmd->fields[i].out_value, + (cmd->fields[i].num_bits > DEBUG_JTAG_IOZ) + ? DEBUG_JTAG_IOZ + : cmd->fields[i].num_bits, 16); + + LOG_DEBUG("fields[%i].out_value[%i]: 0x%s", i, + cmd->fields[i].num_bits, char_buf); + free(char_buf); + } buf_set_buf(cmd->fields[i].out_value, 0, *buffer, bit_count, cmd->fields[i].num_bits); - } - else - { - DEBUG_JTAG_IO("fields[%i].out_value[%i]: NULL", + } else { + LOG_DEBUG_IO("fields[%i].out_value[%i]: NULL", i, cmd->fields[i].num_bits); } bit_count += cmd->fields[i].num_bits; } - //DEBUG_JTAG_IO("bit_count totalling: %i", bit_count); + /*LOG_DEBUG_IO("bit_count totalling: %i", bit_count); */ return bit_count; } @@ -228,31 +233,28 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) /* we return ERROR_OK, unless a check fails, or a handler reports a problem */ retval = ERROR_OK; - for (i = 0; i < cmd->num_fields; i++) - { + for (i = 0; i < cmd->num_fields; i++) { /* if neither in_value nor in_handler * are specified we don't have to examine this field */ - if (cmd->fields[i].in_value) - { + if (cmd->fields[i].in_value) { int num_bits = cmd->fields[i].num_bits; - uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits); + uint8_t *captured = buf_set_buf(buffer, bit_count, + malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits); -#ifdef _DEBUG_JTAG_IO_ - char *char_buf = buf_to_str(captured, - (num_bits > DEBUG_JTAG_IOZ) + if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + char *char_buf = buf_to_str(captured, + (num_bits > DEBUG_JTAG_IOZ) ? DEBUG_JTAG_IOZ - : num_bits, 16); + : num_bits, 16); - LOG_DEBUG("fields[%i].in_value[%i]: 0x%s", - i, num_bits, char_buf); - free(char_buf); -#endif + LOG_DEBUG("fields[%i].in_value[%i]: 0x%s", + i, num_bits, char_buf); + free(char_buf); + } if (cmd->fields[i].in_value) - { buf_cpy(captured, cmd->fields[i].in_value, num_bits); - } free(captured); } @@ -261,5 +263,3 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) return retval; } - -