interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

JTAG: jtag_tap_init() bugfixes 

Stop allocating three bytes per IR bit, and cope somewhat better
with IR lengths over 32 bits.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-10-25 13:07:57 -07:00
parent 2a8aa3b7ef
commit e98817c463
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/jtag/core.c
View File

@ -1204,20 +1204,29 @@ done:
void jtag_tap_init(jtag_tap_t *tap) void jtag_tap_init(jtag_tap_t *tap)
{ {
unsigned ir_len_bits;
unsigned ir_len_bytes;
assert(0 != tap->ir_length); assert(0 != tap->ir_length);
/// @todo fix, this allocates one byte per bit for all three fields! ir_len_bits = tap->ir_length;
tap->expected = malloc(tap->ir_length); ir_len_bytes = CEIL(ir_len_bits, 8);
tap->expected_mask = malloc(tap->ir_length);
tap->cur_instr = malloc(tap->ir_length);
/// @todo cope sanely with ir_length bigger than 32 bits tap->expected = calloc(1, ir_len_bytes);
buf_set_u32(tap->expected, 0, tap->ir_length, tap->ir_capture_value); tap->expected_mask = calloc(1, ir_len_bytes);
buf_set_u32(tap->expected_mask, 0, tap->ir_length, tap->ir_capture_mask); tap->cur_instr = malloc(ir_len_bytes);
/// @todo cope better with ir_length bigger than 32 bits
if (ir_len_bits > 32)
ir_len_bits = 32;
buf_set_u32(tap->expected, 0, ir_len_bits, tap->ir_capture_value);
buf_set_u32(tap->expected_mask, 0, ir_len_bits, tap->ir_capture_mask);
// TAP will be in bypass mode after jtag_validate_ircapture()
tap->bypass = 1;
buf_set_ones(tap->cur_instr, tap->ir_length); buf_set_ones(tap->cur_instr, tap->ir_length);
// place TAP in bypass mode
tap->bypass = 1;
// register the reset callback for the TAP // register the reset callback for the TAP
jtag_register_event_callback(&jtag_reset_callback, tap); jtag_register_event_callback(&jtag_reset_callback, tap);