interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

error checking - no reported errors, but catched a couple of exit()'s and converted them to errors. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1175 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-11-19 07:32:30 +00:00
parent 6c15861bd8
commit cb434c21af
5 changed files with 186 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/flash/ecos.c
View File

@ -143,13 +143,13 @@ flash_errmsg(int err)
int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
{ {
ecosflash_flash_bank_t *info; ecosflash_flash_bank_t *info;
if (argc < 7) if (argc < 7)
{ {
LOG_WARNING("incomplete flash_bank ecosflash configuration"); LOG_WARNING("incomplete flash_bank ecosflash configuration");
return ERROR_FLASH_BANK_INVALID; return ERROR_FLASH_BANK_INVALID;
} }
info = malloc(sizeof(ecosflash_flash_bank_t)); info = malloc(sizeof(ecosflash_flash_bank_t));
if(info == NULL) if(info == NULL)
{ {
@ -159,7 +159,7 @@ int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
bank->driver_priv = info; bank->driver_priv = info;
info->driverPath=strdup(args[6]); info->driverPath=strdup(args[6]);
/* eCos flash sector sizes are not exposed to OpenOCD, use 0x10000 as /* eCos flash sector sizes are not exposed to OpenOCD, use 0x10000 as
* a way to improve impeadance matach between OpenOCD and eCos flash * a way to improve impeadance matach between OpenOCD and eCos flash
* driver. * driver.
*/ */
@ -175,12 +175,12 @@ int ecosflash_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
bank->sectors[i].is_erased = -1; bank->sectors[i].is_erased = -1;
bank->sectors[i].is_protected = 0; bank->sectors[i].is_protected = 0;
} }
info->target = get_target_by_num(strtoul(args[5], NULL, 0)); info->target = get_target_by_num(strtoul(args[5], NULL, 0));
if (info->target == NULL) if (info->target == NULL)
{ {
LOG_ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0)); LOG_ERROR("no target '%i' configured", (int)strtoul(args[5], NULL, 0));
exit(-1); return ERROR_FAIL;
} }
return ERROR_OK; return ERROR_OK;
} }
@ -190,20 +190,20 @@ int loadDriver(ecosflash_flash_bank_t *info)
{ {
u32 buf_cnt; u32 buf_cnt;
u32 image_size; u32 image_size;
image_t image; image_t image;
image.base_address_set = 0; image.base_address_set = 0;
image.start_address_set = 0; image.start_address_set = 0;
target_t *target=info->target; target_t *target=info->target;
int retval; int retval;
if ((retval=image_open(&image, info->driverPath, NULL)) != ERROR_OK) if ((retval=image_open(&image, info->driverPath, NULL)) != ERROR_OK)
{ {
return retval; return retval;
} }
info->start_address=image.start_address; info->start_address=image.start_address;
image_size = 0x0; image_size = 0x0;
int i; int i;
for (i = 0; i < image.num_sections; i++) for (i = 0; i < image.num_sections; i++)
@ -219,7 +219,7 @@ int loadDriver(ecosflash_flash_bank_t *info)
target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer); target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer);
image_size += buf_cnt; image_size += buf_cnt;
LOG_DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address); LOG_DEBUG("%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address);
free(buffer); free(buffer);
} }
@ -237,8 +237,8 @@ static int const OFFSET_GET_WORKAREA=0x18;
static int const OFFSET_GET_WORKAREA_SIZE=0x4; static int const OFFSET_GET_WORKAREA_SIZE=0x4;
int runCode(ecosflash_flash_bank_t *info, int runCode(ecosflash_flash_bank_t *info,
u32 codeStart, u32 codeStop, u32 r0, u32 r1, u32 r2, u32 codeStart, u32 codeStop, u32 r0, u32 r1, u32 r2,
u32 *result, u32 *result,
/* timeout in ms */ /* timeout in ms */
int timeout) int timeout)
@ -250,45 +250,45 @@ int runCode(ecosflash_flash_bank_t *info,
armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
armv4_5_info.core_mode = ARMV4_5_MODE_SVC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
armv4_5_info.core_state = ARMV4_5_STATE_ARM; armv4_5_info.core_state = ARMV4_5_STATE_ARM;
init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT); init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT); init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT); init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
buf_set_u32(reg_params[0].value, 0, 32, r0); buf_set_u32(reg_params[0].value, 0, 32, r0);
buf_set_u32(reg_params[1].value, 0, 32, r1); buf_set_u32(reg_params[1].value, 0, 32, r1);
buf_set_u32(reg_params[2].value, 0, 32, r2); buf_set_u32(reg_params[2].value, 0, 32, r2);
int retval; int retval;
if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
codeStart, codeStart,
codeStop, timeout, codeStop, timeout,
&armv4_5_info)) != ERROR_OK) &armv4_5_info)) != ERROR_OK)
{ {
LOG_ERROR("error executing eCos flash algorithm"); LOG_ERROR("error executing eCos flash algorithm");
return retval; return retval;
} }
*result=buf_get_u32(reg_params[0].value, 0, 32); *result=buf_get_u32(reg_params[0].value, 0, 32);
destroy_reg_param(&reg_params[0]); destroy_reg_param(&reg_params[0]);
destroy_reg_param(&reg_params[1]); destroy_reg_param(&reg_params[1]);
destroy_reg_param(&reg_params[2]); destroy_reg_param(&reg_params[2]);
return ERROR_OK; return ERROR_OK;
} }
int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len) int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len)
{ {
int retval; int retval;
int timeout = (len / 20480 + 1) * 1000; /*asume 20 KB/s*/ int timeout = (len / 20480 + 1) * 1000; /*asume 20 KB/s*/
retval=loadDriver(info); retval=loadDriver(info);
if (retval!=ERROR_OK) if (retval!=ERROR_OK)
return retval; return retval;
u32 flashErr; u32 flashErr;
retval=runCode(info, retval=runCode(info,
info->start_address+OFFSET_ERASE, info->start_address+OFFSET_ERASE,
info->start_address+OFFSET_ERASE+OFFSET_ERASE_SIZE, info->start_address+OFFSET_ERASE+OFFSET_ERASE_SIZE,
address, address,
@ -299,7 +299,7 @@ int eCosBoard_erase(ecosflash_flash_bank_t *info, u32 address, u32 len)
); );
if (retval!=ERROR_OK) if (retval!=ERROR_OK)
return retval; return retval;
if (flashErr != 0x0) if (flashErr != 0x0)
{ {
LOG_ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr)); LOG_ERROR("Flash erase failed with %d (%s)\n", flashErr, flash_errmsg(flashErr));
@ -315,13 +315,13 @@ int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 l
const int chunk=8192; const int chunk=8192;
int retval=ERROR_OK; int retval=ERROR_OK;
int timeout = (chunk / 20480 + 1) * 1000; /*asume 20 KB/s + 1 second*/ int timeout = (chunk / 20480 + 1) * 1000; /*asume 20 KB/s + 1 second*/
retval=loadDriver(info); retval=loadDriver(info);
if (retval!=ERROR_OK) if (retval!=ERROR_OK)
return retval; return retval;
u32 buffer; u32 buffer;
retval=runCode(info, retval=runCode(info,
info->start_address+OFFSET_GET_WORKAREA, info->start_address+OFFSET_GET_WORKAREA,
info->start_address+OFFSET_GET_WORKAREA+OFFSET_GET_WORKAREA_SIZE, info->start_address+OFFSET_GET_WORKAREA+OFFSET_GET_WORKAREA_SIZE,
0, 0,
@ -331,8 +331,8 @@ int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 l
1000); 1000);
if (retval!=ERROR_OK) if (retval!=ERROR_OK)
return retval; return retval;
int i; int i;
for (i=0; i<len; i+=chunk) for (i=0; i<len; i+=chunk)
{ {
@ -341,14 +341,14 @@ int eCosBoard_flash(ecosflash_flash_bank_t *info, void *data, u32 address, u32 l
{ {
t=chunk; t=chunk;
} }
int retval; int retval;
retval=target_write_buffer(target, buffer, t, ((u8 *)data)+i); retval=target_write_buffer(target, buffer, t, ((u8 *)data)+i);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
u32 flashErr; u32 flashErr;
retval=runCode(info, retval=runCode(info,
info->start_address+OFFSET_FLASH, info->start_address+OFFSET_FLASH,
info->start_address+OFFSET_FLASH+OFFSET_FLASH_SIZE, info->start_address+OFFSET_FLASH+OFFSET_FLASH_SIZE,
buffer, buffer,
@ -378,7 +378,7 @@ int ecosflash_probe(struct flash_bank_s *bank)
int ecosflash_register_commands(struct command_context_s *cmd_ctx) int ecosflash_register_commands(struct command_context_s *cmd_ctx)
{ {
register_command(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL); register_command(cmd_ctx, NULL, "ecosflash", NULL, COMMAND_ANY, NULL);
return ERROR_OK; return ERROR_OK;
} }
@ -387,7 +387,7 @@ static void command(flash_bank_t *bank, u8 cmd, u8 *cmd_buf)
{ {
ecosflash_flash_bank_t *info = bank->driver_priv; ecosflash_flash_bank_t *info = bank->driver_priv;
int i; int i;
if (info->target->endianness == TARGET_LITTLE_ENDIAN) if (info->target->endianness == TARGET_LITTLE_ENDIAN)
{ {
for (i = bank->bus_width; i > 0; i--) for (i = bank->bus_width; i > 0; i--)
@ -417,16 +417,16 @@ u32 ecosflash_address(struct flash_bank_s *bank, u32 address)
case 1: case 1:
retval = address; retval = address;
} }
return retval + bank->base; return retval + bank->base;
} }
int ecosflash_erase(struct flash_bank_s *bank, int first, int last) int ecosflash_erase(struct flash_bank_s *bank, int first, int last)
{ {
struct flash_bank_s *c=bank; struct flash_bank_s *c=bank;
ecosflash_flash_bank_t *info = bank->driver_priv; ecosflash_flash_bank_t *info = bank->driver_priv;
return eCosBoard_erase(info, c->base+first*sectorSize, sectorSize*(last-first+1)); return eCosBoard_erase(info, c->base+first*sectorSize, sectorSize*(last-first+1));
} }
int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last) int ecosflash_protect(struct flash_bank_s *bank, int set, int first, int last)
@ -463,7 +463,7 @@ u32 ecosflash_get_flash_status(flash_bank_t *bank)
void ecosflash_set_flash_mode(flash_bank_t *bank,int mode) void ecosflash_set_flash_mode(flash_bank_t *bank,int mode)
{ {
} }
u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout) u32 ecosflash_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)

188
src/target/etb.c
View File

@ -63,11 +63,11 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char
int etb_set_instr(etb_t *etb, u32 new_instr) int etb_set_instr(etb_t *etb, u32 new_instr)
{ {
jtag_device_t *device = jtag_get_device(etb->chain_pos); jtag_device_t *device = jtag_get_device(etb->chain_pos);
if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
{ {
scan_field_t field; scan_field_t field;
field.device = etb->chain_pos; field.device = etb->chain_pos;
field.num_bits = device->ir_length; field.num_bits = device->ir_length;
field.out_value = calloc(CEIL(field.num_bits, 8), 1); field.out_value = calloc(CEIL(field.num_bits, 8), 1);
@ -78,12 +78,12 @@ int etb_set_instr(etb_t *etb, u32 new_instr)
field.in_check_mask = NULL; field.in_check_mask = NULL;
field.in_handler = NULL; field.in_handler = NULL;
field.in_handler_priv = NULL; field.in_handler_priv = NULL;
jtag_add_ir_scan(1, &field, -1); jtag_add_ir_scan(1, &field, -1);
free(field.out_value); free(field.out_value);
} }
return ERROR_OK; return ERROR_OK;
} }
@ -92,7 +92,7 @@ int etb_scann(etb_t *etb, u32 new_scan_chain)
if(etb->cur_scan_chain != new_scan_chain) if(etb->cur_scan_chain != new_scan_chain)
{ {
scan_field_t field; scan_field_t field;
field.device = etb->chain_pos; field.device = etb->chain_pos;
field.num_bits = 5; field.num_bits = 5;
field.out_value = calloc(CEIL(field.num_bits, 8), 1); field.out_value = calloc(CEIL(field.num_bits, 8), 1);
@ -103,13 +103,13 @@ int etb_scann(etb_t *etb, u32 new_scan_chain)
field.in_check_mask = NULL; field.in_check_mask = NULL;
field.in_handler = NULL; field.in_handler = NULL;
field.in_handler_priv = NULL; field.in_handler_priv = NULL;
/* select INTEST instruction */ /* select INTEST instruction */
etb_set_instr(etb, 0x2); etb_set_instr(etb, 0x2);
jtag_add_dr_scan(1, &field, -1); jtag_add_dr_scan(1, &field, -1);
etb->cur_scan_chain = new_scan_chain; etb->cur_scan_chain = new_scan_chain;
free(field.out_value); free(field.out_value);
} }
@ -123,21 +123,21 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb)
etb_reg_t *arch_info = NULL; etb_reg_t *arch_info = NULL;
int num_regs = 9; int num_regs = 9;
int i; int i;
/* register a register arch-type for etm registers only once */ /* register a register arch-type for etm registers only once */
if (etb_reg_arch_type == -1) if (etb_reg_arch_type == -1)
etb_reg_arch_type = register_reg_arch_type(etb_get_reg, etb_set_reg_w_exec); etb_reg_arch_type = register_reg_arch_type(etb_get_reg, etb_set_reg_w_exec);
/* the actual registers are kept in two arrays */ /* the actual registers are kept in two arrays */
reg_list = calloc(num_regs, sizeof(reg_t)); reg_list = calloc(num_regs, sizeof(reg_t));
arch_info = calloc(num_regs, sizeof(etb_reg_t)); arch_info = calloc(num_regs, sizeof(etb_reg_t));
/* fill in values for the reg cache */ /* fill in values for the reg cache */
reg_cache->name = "etb registers"; reg_cache->name = "etb registers";
reg_cache->next = NULL; reg_cache->next = NULL;
reg_cache->reg_list = reg_list; reg_cache->reg_list = reg_list;
reg_cache->num_regs = num_regs; reg_cache->num_regs = num_regs;
/* set up registers */ /* set up registers */
for (i = 0; i < num_regs; i++) for (i = 0; i < num_regs; i++)
{ {
@ -154,7 +154,7 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb)
arch_info[i].addr = i; arch_info[i].addr = i;
arch_info[i].etb = etb; arch_info[i].etb = etb;
} }
return reg_cache; return reg_cache;
} }
@ -166,13 +166,13 @@ int etb_get_reg(reg_t *reg)
LOG_ERROR("BUG: error scheduling etm register read"); LOG_ERROR("BUG: error scheduling etm register read");
return retval; return retval;
} }
if ((retval = jtag_execute_queue()) != ERROR_OK) if ((retval = jtag_execute_queue()) != ERROR_OK)
{ {
LOG_ERROR("register read failed"); LOG_ERROR("register read failed");
return retval; return retval;
} }
return ERROR_OK; return ERROR_OK;
} }
@ -180,11 +180,11 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
{ {
scan_field_t fields[3]; scan_field_t fields[3];
int i; int i;
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
etb_scann(etb, 0x0); etb_scann(etb, 0x0);
etb_set_instr(etb, 0xc); etb_set_instr(etb, 0xc);
fields[0].device = etb->chain_pos; fields[0].device = etb->chain_pos;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = NULL; fields[0].out_value = NULL;
@ -194,7 +194,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
fields[0].in_check_mask = NULL; fields[0].in_check_mask = NULL;
fields[0].in_handler = NULL; fields[0].in_handler = NULL;
fields[0].in_handler_priv = NULL; fields[0].in_handler_priv = NULL;
fields[1].device = etb->chain_pos; fields[1].device = etb->chain_pos;
fields[1].num_bits = 7; fields[1].num_bits = 7;
fields[1].out_value = malloc(1); fields[1].out_value = malloc(1);
@ -216,31 +216,31 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
fields[2].in_check_mask = NULL; fields[2].in_check_mask = NULL;
fields[2].in_handler = NULL; fields[2].in_handler = NULL;
fields[2].in_handler_priv = NULL; fields[2].in_handler_priv = NULL;
jtag_add_dr_scan(3, fields, -1); jtag_add_dr_scan(3, fields, -1);
fields[0].in_handler = buf_to_u32_handler; fields[0].in_handler = buf_to_u32_handler;
for (i = 0; i < num_frames; i++) for (i = 0; i < num_frames; i++)
{ {
/* ensure nR/W reamins set to read */ /* ensure nR/W reamins set to read */
buf_set_u32(fields[2].out_value, 0, 1, 0); buf_set_u32(fields[2].out_value, 0, 1, 0);
/* address remains set to 0x4 (RAM data) until we read the last frame */ /* address remains set to 0x4 (RAM data) until we read the last frame */
if (i < num_frames - 1) if (i < num_frames - 1)
buf_set_u32(fields[1].out_value, 0, 7, 4); buf_set_u32(fields[1].out_value, 0, 7, 4);
else else
buf_set_u32(fields[1].out_value, 0, 7, 0); buf_set_u32(fields[1].out_value, 0, 7, 0);
fields[0].in_handler_priv = &data[i]; fields[0].in_handler_priv = &data[i];
jtag_add_dr_scan(3, fields, -1); jtag_add_dr_scan(3, fields, -1);
} }
jtag_execute_queue(); jtag_execute_queue();
free(fields[1].out_value); free(fields[1].out_value);
free(fields[2].out_value); free(fields[2].out_value);
return ERROR_OK; return ERROR_OK;
} }
@ -249,13 +249,13 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
etb_reg_t *etb_reg = reg->arch_info; etb_reg_t *etb_reg = reg->arch_info;
u8 reg_addr = etb_reg->addr & 0x7f; u8 reg_addr = etb_reg->addr & 0x7f;
scan_field_t fields[3]; scan_field_t fields[3];
LOG_DEBUG("%i", etb_reg->addr); LOG_DEBUG("%i", etb_reg->addr);
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
etb_scann(etb_reg->etb, 0x0); etb_scann(etb_reg->etb, 0x0);
etb_set_instr(etb_reg->etb, 0xc); etb_set_instr(etb_reg->etb, 0xc);
fields[0].device = etb_reg->etb->chain_pos; fields[0].device = etb_reg->etb->chain_pos;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = reg->value; fields[0].out_value = reg->value;
@ -265,7 +265,7 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
fields[0].in_check_mask = NULL; fields[0].in_check_mask = NULL;
fields[0].in_handler = NULL; fields[0].in_handler = NULL;
fields[0].in_handler_priv = NULL; fields[0].in_handler_priv = NULL;
fields[1].device = etb_reg->etb->chain_pos; fields[1].device = etb_reg->etb->chain_pos;
fields[1].num_bits = 7; fields[1].num_bits = 7;
fields[1].out_value = malloc(1); fields[1].out_value = malloc(1);
@ -287,28 +287,28 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
fields[2].in_check_mask = NULL; fields[2].in_check_mask = NULL;
fields[2].in_handler = NULL; fields[2].in_handler = NULL;
fields[2].in_handler_priv = NULL; fields[2].in_handler_priv = NULL;
jtag_add_dr_scan(3, fields, -1); jtag_add_dr_scan(3, fields, -1);
/* read the identification register in the second run, to make sure we /* read the identification register in the second run, to make sure we
* don't read the ETB data register twice, skipping every second entry * don't read the ETB data register twice, skipping every second entry
*/ */
buf_set_u32(fields[1].out_value, 0, 7, 0x0); buf_set_u32(fields[1].out_value, 0, 7, 0x0);
fields[0].in_value = reg->value; fields[0].in_value = reg->value;
jtag_set_check_value(fields+0, check_value, check_mask, NULL); jtag_set_check_value(fields+0, check_value, check_mask, NULL);
jtag_add_dr_scan(3, fields, -1); jtag_add_dr_scan(3, fields, -1);
free(fields[1].out_value); free(fields[1].out_value);
free(fields[2].out_value); free(fields[2].out_value);
return ERROR_OK; return ERROR_OK;
} }
int etb_read_reg(reg_t *reg) int etb_read_reg(reg_t *reg)
{ {
return etb_read_reg_w_check(reg, NULL, NULL); return etb_read_reg_w_check(reg, NULL, NULL);
} }
int etb_set_reg(reg_t *reg, u32 value) int etb_set_reg(reg_t *reg, u32 value)
@ -319,11 +319,11 @@ int etb_set_reg(reg_t *reg, u32 value)
LOG_ERROR("BUG: error scheduling etm register write"); LOG_ERROR("BUG: error scheduling etm register write");
return retval; return retval;
} }
buf_set_u32(reg->value, 0, reg->size, value); buf_set_u32(reg->value, 0, reg->size, value);
reg->valid = 1; reg->valid = 1;
reg->dirty = 0; reg->dirty = 0;
return ERROR_OK; return ERROR_OK;
} }
@ -331,7 +331,7 @@ int etb_set_reg_w_exec(reg_t *reg, u8 *buf)
{ {
int retval; int retval;
etb_set_reg(reg, buf_get_u32(buf, 0, reg->size)); etb_set_reg(reg, buf_get_u32(buf, 0, reg->size));
if ((retval = jtag_execute_queue()) != ERROR_OK) if ((retval = jtag_execute_queue()) != ERROR_OK)
{ {
LOG_ERROR("register write failed"); LOG_ERROR("register write failed");
@ -345,13 +345,13 @@ int etb_write_reg(reg_t *reg, u32 value)
etb_reg_t *etb_reg = reg->arch_info; etb_reg_t *etb_reg = reg->arch_info;
u8 reg_addr = etb_reg->addr & 0x7f; u8 reg_addr = etb_reg->addr & 0x7f;
scan_field_t fields[3]; scan_field_t fields[3];
LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value); LOG_DEBUG("%i: 0x%8.8x", etb_reg->addr, value);
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
etb_scann(etb_reg->etb, 0x0); etb_scann(etb_reg->etb, 0x0);
etb_set_instr(etb_reg->etb, 0xc); etb_set_instr(etb_reg->etb, 0xc);
fields[0].device = etb_reg->etb->chain_pos; fields[0].device = etb_reg->etb->chain_pos;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = malloc(4); fields[0].out_value = malloc(4);
@ -362,7 +362,7 @@ int etb_write_reg(reg_t *reg, u32 value)
fields[0].in_check_mask = NULL; fields[0].in_check_mask = NULL;
fields[0].in_handler = NULL; fields[0].in_handler = NULL;
fields[0].in_handler_priv = NULL; fields[0].in_handler_priv = NULL;
fields[1].device = etb_reg->etb->chain_pos; fields[1].device = etb_reg->etb->chain_pos;
fields[1].num_bits = 7; fields[1].num_bits = 7;
fields[1].out_value = malloc(1); fields[1].out_value = malloc(1);
@ -384,13 +384,13 @@ int etb_write_reg(reg_t *reg, u32 value)
fields[2].in_check_mask = NULL; fields[2].in_check_mask = NULL;
fields[2].in_handler = NULL; fields[2].in_handler = NULL;
fields[2].in_handler_priv = NULL; fields[2].in_handler_priv = NULL;
jtag_add_dr_scan(3, fields, -1); jtag_add_dr_scan(3, fields, -1);
free(fields[0].out_value); free(fields[0].out_value);
free(fields[1].out_value); free(fields[1].out_value);
free(fields[2].out_value); free(fields[2].out_value);
return ERROR_OK; return ERROR_OK;
} }
@ -402,9 +402,9 @@ int etb_store_reg(reg_t *reg)
int etb_register_commands(struct command_context_s *cmd_ctx) int etb_register_commands(struct command_context_s *cmd_ctx)
{ {
command_t *etb_cmd; command_t *etb_cmd;
etb_cmd = register_command(cmd_ctx, NULL, "etb", NULL, COMMAND_ANY, "Embedded Trace Buffer"); etb_cmd = register_command(cmd_ctx, NULL, "etb", NULL, COMMAND_ANY, "Embedded Trace Buffer");
register_command(cmd_ctx, etb_cmd, "config", handle_etb_config_command, COMMAND_CONFIG, NULL); register_command(cmd_ctx, etb_cmd, "config", handle_etb_config_command, COMMAND_CONFIG, NULL);
return ERROR_OK; return ERROR_OK;
@ -416,41 +416,40 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char
jtag_device_t *jtag_device; jtag_device_t *jtag_device;
armv4_5_common_t *armv4_5; armv4_5_common_t *armv4_5;
arm7_9_common_t *arm7_9; arm7_9_common_t *arm7_9;
if (argc != 2) if (argc != 2)
{ {
LOG_ERROR("incomplete 'etb config <target> <chain_pos>' command"); return ERROR_COMMAND_SYNTAX_ERROR;
exit(-1);
} }
target = get_target_by_num(strtoul(args[0], NULL, 0)); target = get_target_by_num(strtoul(args[0], NULL, 0));
if (!target) if (!target)
{ {
LOG_ERROR("target number '%s' not defined", args[0]); LOG_ERROR("target number '%s' not defined", args[0]);
exit(-1); return ERROR_FAIL;
} }
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
return ERROR_OK; return ERROR_FAIL;
} }
jtag_device = jtag_get_device(strtoul(args[1], NULL, 0)); jtag_device = jtag_get_device(strtoul(args[1], NULL, 0));
if (!jtag_device) if (!jtag_device)
{ {
LOG_ERROR("jtag device number '%s' not defined", args[1]); LOG_ERROR("jtag device number '%s' not defined", args[1]);
exit(-1); return ERROR_FAIL;
} }
if (arm7_9->etm_ctx) if (arm7_9->etm_ctx)
{ {
etb_t *etb = malloc(sizeof(etb_t)); etb_t *etb = malloc(sizeof(etb_t));
arm7_9->etm_ctx->capture_driver_priv = etb; arm7_9->etm_ctx->capture_driver_priv = etb;
etb->chain_pos = strtoul(args[1], NULL, 0); etb->chain_pos = strtoul(args[1], NULL, 0);
etb->cur_scan_chain = -1; etb->cur_scan_chain = -1;
etb->reg_cache = NULL; etb->reg_cache = NULL;
@ -460,6 +459,7 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char
else else
{ {
LOG_ERROR("target has no ETM defined, ETB left unconfigured"); LOG_ERROR("target has no ETM defined, ETB left unconfigured");
return ERROR_FAIL;
} }
return ERROR_OK; return ERROR_OK;
@ -468,9 +468,9 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char
int etb_init(etm_context_t *etm_ctx) int etb_init(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; etb_t *etb = etm_ctx->capture_driver_priv;
etb->etm_ctx = etm_ctx; etb->etm_ctx = etm_ctx;
/* identify ETB RAM depth and width */ /* identify ETB RAM depth and width */
etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_DEPTH]); etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_DEPTH]);
etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_WIDTH]); etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_WIDTH]);
@ -478,16 +478,16 @@ int etb_init(etm_context_t *etm_ctx)
etb->ram_depth = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_DEPTH].value, 0, 32); etb->ram_depth = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_DEPTH].value, 0, 32);
etb->ram_width = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WIDTH].value, 0, 32); etb->ram_width = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WIDTH].value, 0, 32);
return ERROR_OK; return ERROR_OK;
} }
trace_status_t etb_status(etm_context_t *etm_ctx) trace_status_t etb_status(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; etb_t *etb = etm_ctx->capture_driver_priv;
etb->etm_ctx = etm_ctx; etb->etm_ctx = etm_ctx;
/* if tracing is currently idle, return this information */ /* if tracing is currently idle, return this information */
if (etm_ctx->capture_status == TRACE_IDLE) if (etm_ctx->capture_status == TRACE_IDLE)
{ {
@ -497,10 +497,10 @@ trace_status_t etb_status(etm_context_t *etm_ctx)
{ {
reg_t *etb_status_reg = &etb->reg_cache->reg_list[ETB_STATUS]; reg_t *etb_status_reg = &etb->reg_cache->reg_list[ETB_STATUS];
int etb_timeout = 100; int etb_timeout = 100;
/* trace is running, check the ETB status flags */ /* trace is running, check the ETB status flags */
etb_get_reg(etb_status_reg); etb_get_reg(etb_status_reg);
/* check Full bit to identify an overflow */ /* check Full bit to identify an overflow */
if (buf_get_u32(etb_status_reg->value, 0, 1) == 1) if (buf_get_u32(etb_status_reg->value, 0, 1) == 1)
etm_ctx->capture_status |= TRACE_OVERFLOWED; etm_ctx->capture_status |= TRACE_OVERFLOWED;
@ -517,23 +517,23 @@ trace_status_t etb_status(etm_context_t *etm_ctx)
/* wait for data formatter idle */ /* wait for data formatter idle */
etb_get_reg(etb_status_reg); etb_get_reg(etb_status_reg);
} }
if (etb_timeout == 0) if (etb_timeout == 0)
{ {
LOG_ERROR("AcqComp set but DFEmpty won't go high, ETB status: 0x%x", LOG_ERROR("AcqComp set but DFEmpty won't go high, ETB status: 0x%x",
buf_get_u32(etb_status_reg->value, 0, etb_status_reg->size)); buf_get_u32(etb_status_reg->value, 0, etb_status_reg->size));
} }
if (!(etm_ctx->capture_status && TRACE_TRIGGERED)) if (!(etm_ctx->capture_status && TRACE_TRIGGERED))
{ {
LOG_ERROR("trace completed, but no trigger condition detected"); LOG_ERROR("trace completed, but no trigger condition detected");
} }
etm_ctx->capture_status &= ~TRACE_RUNNING; etm_ctx->capture_status &= ~TRACE_RUNNING;
etm_ctx->capture_status |= TRACE_COMPLETED; etm_ctx->capture_status |= TRACE_COMPLETED;
} }
} }
return etm_ctx->capture_status; return etm_ctx->capture_status;
} }
@ -544,11 +544,11 @@ int etb_read_trace(etm_context_t *etm_ctx)
int num_frames = etb->ram_depth; int num_frames = etb->ram_depth;
u32 *trace_data = NULL; u32 *trace_data = NULL;
int i, j; int i, j;
etb_read_reg(&etb->reg_cache->reg_list[ETB_STATUS]); etb_read_reg(&etb->reg_cache->reg_list[ETB_STATUS]);
etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER]); etb_read_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER]);
jtag_execute_queue(); jtag_execute_queue();
/* check if we overflowed, and adjust first frame of the trace accordingly /* check if we overflowed, and adjust first frame of the trace accordingly
* if we didn't overflow, read only up to the frame that would be written next, * if we didn't overflow, read only up to the frame that would be written next,
* i.e. don't read invalid entries * i.e. don't read invalid entries
@ -561,10 +561,10 @@ int etb_read_trace(etm_context_t *etm_ctx)
{ {
num_frames = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER].value, 0, 32); num_frames = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER].value, 0, 32);
} }
etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_READ_POINTER], first_frame); etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_READ_POINTER], first_frame);
/* read data into temporary array for unpacking */ /* read data into temporary array for unpacking */
trace_data = malloc(sizeof(u32) * num_frames); trace_data = malloc(sizeof(u32) * num_frames);
etb_read_ram(etb, trace_data, num_frames); etb_read_ram(etb, trace_data, num_frames);
@ -572,7 +572,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
{ {
free(etm_ctx->trace_data); free(etm_ctx->trace_data);
} }
if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT)
etm_ctx->trace_depth = num_frames * 3; etm_ctx->trace_depth = num_frames * 3;
else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT)
@ -581,7 +581,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_depth = num_frames; etm_ctx->trace_depth = num_frames;
etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth); etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
for (i = 0, j = 0; i < num_frames; i++) for (i = 0, j = 0; i < num_frames; i++)
{ {
if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT)
@ -599,7 +599,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_data[j].pipestat = etm_ctx->trace_data[j].packet & 0x7; etm_ctx->trace_data[j].pipestat = etm_ctx->trace_data[j].packet & 0x7;
etm_ctx->trace_data[j].flags |= ETMV1_TRIGGER_CYCLE; etm_ctx->trace_data[j].flags |= ETMV1_TRIGGER_CYCLE;
} }
/* trace word j+1 */ /* trace word j+1 */
etm_ctx->trace_data[j+1].pipestat = (trace_data[i] & 0x100) >> 8; etm_ctx->trace_data[j+1].pipestat = (trace_data[i] & 0x100) >> 8;
etm_ctx->trace_data[j+1].packet = (trace_data[i] & 0x7800) >> 11; etm_ctx->trace_data[j+1].packet = (trace_data[i] & 0x7800) >> 11;
@ -613,7 +613,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_data[j+1].pipestat = etm_ctx->trace_data[j+1].packet & 0x7; etm_ctx->trace_data[j+1].pipestat = etm_ctx->trace_data[j+1].packet & 0x7;
etm_ctx->trace_data[j+1].flags |= ETMV1_TRIGGER_CYCLE; etm_ctx->trace_data[j+1].flags |= ETMV1_TRIGGER_CYCLE;
} }
/* trace word j+2 */ /* trace word j+2 */
etm_ctx->trace_data[j+2].pipestat = (trace_data[i] & 0x10000) >> 16; etm_ctx->trace_data[j+2].pipestat = (trace_data[i] & 0x10000) >> 16;
etm_ctx->trace_data[j+2].packet = (trace_data[i] & 0x780000) >> 19; etm_ctx->trace_data[j+2].packet = (trace_data[i] & 0x780000) >> 19;
@ -627,7 +627,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_data[j+2].pipestat = etm_ctx->trace_data[j+2].packet & 0x7; etm_ctx->trace_data[j+2].pipestat = etm_ctx->trace_data[j+2].packet & 0x7;
etm_ctx->trace_data[j+2].flags |= ETMV1_TRIGGER_CYCLE; etm_ctx->trace_data[j+2].flags |= ETMV1_TRIGGER_CYCLE;
} }
j += 3; j += 3;
} }
else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT)
@ -659,7 +659,7 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_data[j+1].pipestat = etm_ctx->trace_data[j+1].packet & 0x7; etm_ctx->trace_data[j+1].pipestat = etm_ctx->trace_data[j+1].packet & 0x7;
etm_ctx->trace_data[j+1].flags |= ETMV1_TRIGGER_CYCLE; etm_ctx->trace_data[j+1].flags |= ETMV1_TRIGGER_CYCLE;
} }
j += 2; j += 2;
} }
else else
@ -677,13 +677,13 @@ int etb_read_trace(etm_context_t *etm_ctx)
etm_ctx->trace_data[j].pipestat = etm_ctx->trace_data[j].packet & 0x7; etm_ctx->trace_data[j].pipestat = etm_ctx->trace_data[j].packet & 0x7;
etm_ctx->trace_data[j].flags |= ETMV1_TRIGGER_CYCLE; etm_ctx->trace_data[j].flags |= ETMV1_TRIGGER_CYCLE;
} }
j += 1; j += 1;
} }
} }
free(trace_data); free(trace_data);
return ERROR_OK; return ERROR_OK;
} }
@ -702,21 +702,21 @@ int etb_start_capture(etm_context_t *etm_ctx)
} }
etb_ctrl_value |= 0x2; etb_ctrl_value |= 0x2;
} }
if ((etm_ctx->portmode & ETM_PORT_MODE_MASK) == ETM_PORT_MUXED) if ((etm_ctx->portmode & ETM_PORT_MODE_MASK) == ETM_PORT_MUXED)
return ERROR_ETM_PORTMODE_NOT_SUPPORTED; return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
trigger_count = (etb->ram_depth * etm_ctx->trigger_percent) / 100; trigger_count = (etb->ram_depth * etm_ctx->trigger_percent) / 100;
etb_write_reg(&etb->reg_cache->reg_list[ETB_TRIGGER_COUNTER], trigger_count); etb_write_reg(&etb->reg_cache->reg_list[ETB_TRIGGER_COUNTER], trigger_count);
etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER], 0x0); etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER], 0x0);
etb_write_reg(&etb->reg_cache->reg_list[ETB_CTRL], etb_ctrl_value); etb_write_reg(&etb->reg_cache->reg_list[ETB_CTRL], etb_ctrl_value);
jtag_execute_queue(); jtag_execute_queue();
/* we're starting a new trace, initialize capture status */ /* we're starting a new trace, initialize capture status */
etm_ctx->capture_status = TRACE_RUNNING; etm_ctx->capture_status = TRACE_RUNNING;
return ERROR_OK; return ERROR_OK;
} }
int etb_stop_capture(etm_context_t *etm_ctx) int etb_stop_capture(etm_context_t *etm_ctx)
@ -726,10 +726,10 @@ int etb_stop_capture(etm_context_t *etm_ctx)
etb_write_reg(etb_ctrl_reg, 0x0); etb_write_reg(etb_ctrl_reg, 0x0);
jtag_execute_queue(); jtag_execute_queue();
/* trace stopped, just clear running flag, but preserve others */ /* trace stopped, just clear running flag, but preserve others */
etm_ctx->capture_status &= ~TRACE_RUNNING; etm_ctx->capture_status &= ~TRACE_RUNNING;
return ERROR_OK; return ERROR_OK;
} }

17
src/target/etm_dummy.c
View File

@ -41,21 +41,21 @@ int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd
target_t *target; target_t *target;
armv4_5_common_t *armv4_5; armv4_5_common_t *armv4_5;
arm7_9_common_t *arm7_9; arm7_9_common_t *arm7_9;
target = get_target_by_num(strtoul(args[0], NULL, 0)); target = get_target_by_num(strtoul(args[0], NULL, 0));
if (!target) if (!target)
{ {
LOG_ERROR("target number '%s' not defined", args[0]); LOG_ERROR("target number '%s' not defined", args[0]);
exit(-1); return ERROR_FAIL;
} }
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
return ERROR_OK; return ERROR_FAIL;
} }
if (arm7_9->etm_ctx) if (arm7_9->etm_ctx)
{ {
arm7_9->etm_ctx->capture_driver_priv = NULL; arm7_9->etm_ctx->capture_driver_priv = NULL;
@ -63,6 +63,7 @@ int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd
else else
{ {
LOG_ERROR("target has no ETM defined, ETM dummy left unconfigured"); LOG_ERROR("target has no ETM defined, ETM dummy left unconfigured");
return ERROR_FAIL;
} }
return ERROR_OK; return ERROR_OK;
@ -71,9 +72,9 @@ int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd
int etm_dummy_register_commands(struct command_context_s *cmd_ctx) int etm_dummy_register_commands(struct command_context_s *cmd_ctx)
{ {
command_t *etm_dummy_cmd; command_t *etm_dummy_cmd;
etm_dummy_cmd = register_command(cmd_ctx, NULL, "etm_dummy", NULL, COMMAND_ANY, "Dummy ETM capture driver"); etm_dummy_cmd = register_command(cmd_ctx, NULL, "etm_dummy", NULL, COMMAND_ANY, "Dummy ETM capture driver");
register_command(cmd_ctx, etm_dummy_cmd, "config", handle_etm_dummy_config_command, COMMAND_CONFIG, NULL); register_command(cmd_ctx, etm_dummy_cmd, "config", handle_etm_dummy_config_command, COMMAND_CONFIG, NULL);
return ERROR_OK; return ERROR_OK;

9
src/target/image.c
View File

@ -718,6 +718,13 @@ int image_open(image_t *image, char *url, char *type_string)
} }
else if (image->type == IMAGE_MEMORY) else if (image->type == IMAGE_MEMORY)
{ {
target_t *target = get_target_by_num(strtoul(url, NULL, 0));
if (target==NULL)
{
LOG_ERROR("Target '%s' does not exist", url);
return ERROR_FAIL;
}
image_memory_t *image_memory; image_memory_t *image_memory;
image->num_sections = 1; image->num_sections = 1;
@ -728,7 +735,7 @@ int image_open(image_t *image, char *url, char *type_string)
image_memory = image->type_private = malloc(sizeof(image_memory_t)); image_memory = image->type_private = malloc(sizeof(image_memory_t));
image_memory->target = get_target_by_num(strtoul(url, NULL, 0));; image_memory->target = target;
image_memory->cache = NULL; image_memory->cache = NULL;
image_memory->cache_address = 0x0; image_memory->cache_address = 0x0;
} }

74
src/target/xscale.c
View File

@ -115,7 +115,7 @@ target_type_t xscale_target =
.bulk_write_memory = xscale_bulk_write_memory, .bulk_write_memory = xscale_bulk_write_memory,
.checksum_memory = arm7_9_checksum_memory, .checksum_memory = arm7_9_checksum_memory,
.blank_check_memory = arm7_9_blank_check_memory, .blank_check_memory = arm7_9_blank_check_memory,
.run_algorithm = armv4_5_run_algorithm, .run_algorithm = armv4_5_run_algorithm,
.add_breakpoint = xscale_add_breakpoint, .add_breakpoint = xscale_add_breakpoint,
@ -127,7 +127,7 @@ target_type_t xscale_target =
.target_create = xscale_target_create, .target_create = xscale_target_create,
.init_target = xscale_init_target, .init_target = xscale_init_target,
.quit = xscale_quit, .quit = xscale_quit,
.virt2phys = xscale_virt2phys, .virt2phys = xscale_virt2phys,
.mmu = xscale_mmu .mmu = xscale_mmu
}; };
@ -312,7 +312,7 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
{ {
if (num_words==0) if (num_words==0)
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
int retval=ERROR_OK; int retval=ERROR_OK;
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
xscale_common_t *xscale = armv4_5->arch_info; xscale_common_t *xscale = armv4_5->arch_info;
@ -412,7 +412,7 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
break; break;
} }
} }
words_done += words_scheduled; words_done += words_scheduled;
} }
@ -455,7 +455,7 @@ int xscale_read_tx(target_t *target, int consume)
noconsume_path[3] = TAP_PD; noconsume_path[3] = TAP_PD;
noconsume_path[4] = TAP_E2D; noconsume_path[4] = TAP_E2D;
noconsume_path[5] = TAP_SD; noconsume_path[5] = TAP_SD;
fields[0].device = xscale->jtag_info.chain_pos; fields[0].device = xscale->jtag_info.chain_pos;
fields[0].num_bits = 3; fields[0].num_bits = 3;
fields[0].out_value = NULL; fields[0].out_value = NULL;
@ -524,7 +524,7 @@ int xscale_read_tx(target_t *target, int consume)
{ {
keep_alive(); keep_alive();
} }
} }
done: done:
if (!(field0_in & 1)) if (!(field0_in & 1))
@ -613,7 +613,7 @@ int xscale_write_rx(target_t *target)
} }
} }
done: done:
/* set rx_valid */ /* set rx_valid */
field2 = 0x1; field2 = 0x1;
jtag_add_dr_scan(3, fields, TAP_RTI); jtag_add_dr_scan(3, fields, TAP_RTI);
@ -638,7 +638,7 @@ int xscale_send(target_t *target, u8 *buffer, int count, int size)
int retval; int retval;
int done_count = 0; int done_count = 0;
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
xscale_jtag_set_instr(xscale->jtag_info.chain_pos, xscale->jtag_info.dbgrx); xscale_jtag_set_instr(xscale->jtag_info.chain_pos, xscale->jtag_info.dbgrx);
@ -678,7 +678,7 @@ int xscale_send(target_t *target, u8 *buffer, int count, int size)
LOG_ERROR("BUG: size neither 4, 2 nor 1"); LOG_ERROR("BUG: size neither 4, 2 nor 1");
exit(-1); exit(-1);
} }
jtag_add_dr_out(xscale->jtag_info.chain_pos, jtag_add_dr_out(xscale->jtag_info.chain_pos,
3, 3,
bits, bits,
t, t,
@ -1021,7 +1021,7 @@ int xscale_poll(target_t *target)
/* here we "lie" so GDB won't get stuck and a reset can be perfomed */ /* here we "lie" so GDB won't get stuck and a reset can be perfomed */
target->state = TARGET_HALTED; target->state = TARGET_HALTED;
} }
/* debug_entry could have overwritten target state (i.e. immediate resume) /* debug_entry could have overwritten target state (i.e. immediate resume)
* don't signal event handlers in that case * don't signal event handlers in that case
*/ */
@ -1054,7 +1054,7 @@ int xscale_debug_entry(target_t *target)
xscale->external_debug_break = 0; xscale->external_debug_break = 0;
if ((retval=xscale_read_dcsr(target))!=ERROR_OK) if ((retval=xscale_read_dcsr(target))!=ERROR_OK)
return retval; return retval;
/* get r0, pc, r1 to r7 and cpsr */ /* get r0, pc, r1 to r7 and cpsr */
if ((retval=xscale_receive(target, buffer, 10))!=ERROR_OK) if ((retval=xscale_receive(target, buffer, 10))!=ERROR_OK)
return retval; return retval;
@ -1099,10 +1099,10 @@ int xscale_debug_entry(target_t *target)
else else
armv4_5->core_state = ARMV4_5_STATE_ARM; armv4_5->core_state = ARMV4_5_STATE_ARM;
if (armv4_5_mode_to_number(armv4_5->core_mode)==-1) if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
return ERROR_FAIL; return ERROR_FAIL;
/* get banked registers, r8 to r14, and spsr if not in USR/SYS mode */ /* get banked registers, r8 to r14, and spsr if not in USR/SYS mode */
if ((armv4_5->core_mode != ARMV4_5_MODE_USR) && (armv4_5->core_mode != ARMV4_5_MODE_SYS)) if ((armv4_5->core_mode != ARMV4_5_MODE_USR) && (armv4_5->core_mode != ARMV4_5_MODE_SYS))
{ {
@ -1225,7 +1225,7 @@ int xscale_halt(target_t *target)
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
xscale_common_t *xscale = armv4_5->arch_info; xscale_common_t *xscale = armv4_5->arch_info;
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name); Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
if (target->state == TARGET_HALTED) if (target->state == TARGET_HALTED)
@ -1590,7 +1590,7 @@ int xscale_assert_reset(target_t *target)
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
xscale_common_t *xscale = armv4_5->arch_info; xscale_common_t *xscale = armv4_5->arch_info;
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name); Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
/* select DCSR instruction (set endstate to R-T-I to ensure we don't /* select DCSR instruction (set endstate to R-T-I to ensure we don't
@ -1706,7 +1706,7 @@ int xscale_deassert_reset(target_t *target)
if ((retval = fileio_read(&debug_handler, 32, buffer, &buf_cnt)) != ERROR_OK) if ((retval = fileio_read(&debug_handler, 32, buffer, &buf_cnt)) != ERROR_OK)
{ {
} }
for (i = 0; i < buf_cnt; i += 4) for (i = 0; i < buf_cnt; i += 4)
@ -3147,7 +3147,7 @@ int xscale_init_arch_info(target_t *target, xscale_common_t *xscale, int chain_p
xscale->armv4_5_mmu.enable_mmu_caches = xscale_enable_mmu_caches; xscale->armv4_5_mmu.enable_mmu_caches = xscale_enable_mmu_caches;
xscale->armv4_5_mmu.has_tiny_pages = 1; xscale->armv4_5_mmu.has_tiny_pages = 1;
xscale->armv4_5_mmu.mmu_enabled = 0; xscale->armv4_5_mmu.mmu_enabled = 0;
return ERROR_OK; return ERROR_OK;
} }
@ -3179,12 +3179,12 @@ int xscale_handle_debug_handler_command(struct command_context_s *cmd_ctx, char
if ((target = get_target_by_num(strtoul(args[0], NULL, 0))) == NULL) if ((target = get_target_by_num(strtoul(args[0], NULL, 0))) == NULL)
{ {
LOG_ERROR("no target '%s' configured", args[0]); LOG_ERROR("no target '%s' configured", args[0]);
return ERROR_OK; return ERROR_FAIL;
} }
if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK) if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
{ {
return ERROR_OK; return ERROR_FAIL;
} }
handler_address = strtoul(args[1], NULL, 0); handler_address = strtoul(args[1], NULL, 0);
@ -3197,6 +3197,7 @@ int xscale_handle_debug_handler_command(struct command_context_s *cmd_ctx, char
else else
{ {
LOG_ERROR("xscale debug_handler <address> must be between 0x800 and 0x1fef800 or between 0xfe000800 and 0xfffff800"); LOG_ERROR("xscale debug_handler <address> must be between 0x800 and 0x1fef800 or between 0xfe000800 and 0xfffff800");
return ERROR_FAIL;
} }
return ERROR_OK; return ERROR_OK;
@ -3212,19 +3213,18 @@ int xscale_handle_cache_clean_address_command(struct command_context_s *cmd_ctx,
if (argc < 2) if (argc < 2)
{ {
LOG_ERROR("'xscale cache_clean_address <target#> <address>' command takes two required operands"); return ERROR_COMMAND_SYNTAX_ERROR;
return ERROR_OK;
} }
if ((target = get_target_by_num(strtoul(args[0], NULL, 0))) == NULL) if ((target = get_target_by_num(strtoul(args[0], NULL, 0))) == NULL)
{ {
LOG_ERROR("no target '%s' configured", args[0]); LOG_ERROR("no target '%s' configured", args[0]);
return ERROR_OK; return ERROR_FAIL;
} }
if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK) if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
{ {
return ERROR_OK; return ERROR_FAIL;
} }
cache_clean_address = strtoul(args[1], NULL, 0); cache_clean_address = strtoul(args[1], NULL, 0);
@ -3264,8 +3264,8 @@ static int xscale_virt2phys(struct target_s *target, u32 virtual, u32 *physical)
u32 cb; u32 cb;
int domain; int domain;
u32 ap; u32 ap;
if ((retval = xscale_get_arch_pointers(target, &armv4_5, &xscale)) != ERROR_OK) if ((retval = xscale_get_arch_pointers(target, &armv4_5, &xscale)) != ERROR_OK)
{ {
return retval; return retval;
@ -3283,7 +3283,7 @@ static int xscale_mmu(struct target_s *target, int *enabled)
{ {
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
xscale_common_t *xscale = armv4_5->arch_info; xscale_common_t *xscale = armv4_5->arch_info;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
LOG_ERROR("Target not halted"); LOG_ERROR("Target not halted");
@ -3648,7 +3648,7 @@ int xscale_handle_cp15(command_context_t *cmd_ctx, char *cmd, char **args, int a
break; break;
case 2: case 2:
reg_no = XSCALE_TTB; reg_no = XSCALE_TTB;
break; break;
case 3: case 3:
reg_no = XSCALE_DAC; reg_no = XSCALE_DAC;
break; break;
@ -3669,39 +3669,39 @@ int xscale_handle_cp15(command_context_t *cmd_ctx, char *cmd, char **args, int a
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
} }
reg = &xscale->reg_cache->reg_list[reg_no]; reg = &xscale->reg_cache->reg_list[reg_no];
} }
if(argc == 1) if(argc == 1)
{ {
u32 value; u32 value;
/* read cp15 control register */ /* read cp15 control register */
xscale_get_reg(reg); xscale_get_reg(reg);
value = buf_get_u32(reg->value, 0, 32); value = buf_get_u32(reg->value, 0, 32);
command_print(cmd_ctx, "%s (/%i): 0x%x", reg->name, reg->size, value); command_print(cmd_ctx, "%s (/%i): 0x%x", reg->name, reg->size, value);
} }
else if(argc == 2) else if(argc == 2)
{ {
u32 value = strtoul(args[1], NULL, 0); u32 value = strtoul(args[1], NULL, 0);
/* send CP write request (command 0x41) */ /* send CP write request (command 0x41) */
xscale_send_u32(target, 0x41); xscale_send_u32(target, 0x41);
/* send CP register number */ /* send CP register number */
xscale_send_u32(target, reg_no); xscale_send_u32(target, reg_no);
/* send CP register value */ /* send CP register value */
xscale_send_u32(target, value); xscale_send_u32(target, value);
/* execute cpwait to ensure outstanding operations complete */ /* execute cpwait to ensure outstanding operations complete */
xscale_send_u32(target, 0x53); xscale_send_u32(target, 0x53);
} }
else else
{ {
command_print(cmd_ctx, "usage: cp15 [register]<, [value]>"); command_print(cmd_ctx, "usage: cp15 [register]<, [value]>");
} }
return ERROR_OK; return ERROR_OK;
} }
@ -3729,7 +3729,7 @@ int xscale_register_commands(struct command_context_s *cmd_ctx)
COMMAND_EXEC, "load image from <file> [base address]"); COMMAND_EXEC, "load image from <file> [base address]");
register_command(cmd_ctx, xscale_cmd, "cp15", xscale_handle_cp15, COMMAND_EXEC, "access coproc 15 <register> [value]"); register_command(cmd_ctx, xscale_cmd, "cp15", xscale_handle_cp15, COMMAND_EXEC, "access coproc 15 <register> [value]");
armv4_5_register_commands(cmd_ctx); armv4_5_register_commands(cmd_ctx);
return ERROR_OK; return ERROR_OK;