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

- image.c and fileio.c now uses logging to propagate error strings. 

More precise, less code.
- removed unused code in fileio.c
- Windows should now find debug_handler.bin

git-svn-id: svn://svn.berlios.de/openocd/trunk@390 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-02-29 11:42:37 +00:00
parent 3a3fc30014
commit 219b7f30b9
10 changed files with 206 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/flash/ecos.c
View File

@ -196,7 +196,6 @@ int loadDriver(ecosflash_flash_bank_t *info)
if (image_open(&image, info->driverPath, NULL) != ERROR_OK) if (image_open(&image, info->driverPath, NULL) != ERROR_OK)
{ {
ERROR("load_image error: %s", image.error_str);
return ERROR_FLASH_BANK_INVALID; return ERROR_FLASH_BANK_INVALID;
} }

3
src/flash/flash.c
View File

@ -605,7 +605,6 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL); retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
command_print(cmd_ctx, "image_open error: %s", image.error_str);
return retval; return retval;
} }
@ -662,14 +661,12 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
return ERROR_OK; return ERROR_OK;
} }
buffer = malloc(fileio.size); buffer = malloc(fileio.size);
if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK) if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
{ {
command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str);
return ERROR_OK; return ERROR_OK;
} }

2
src/flash/nand.c
View File

@ -1271,7 +1271,6 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "file open error: %s", fileio.error_str);
return ERROR_OK; return ERROR_OK;
} }
@ -1411,7 +1410,6 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char
if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "dump_image error: %s", fileio.error_str);
return ERROR_OK; return ERROR_OK;
} }

171
src/helper/fileio.c
View File

@ -24,6 +24,7 @@
#include "types.h" #include "types.h"
#include "replacements.h" #include "replacements.h"
#include "log.h" #include "log.h"
#include "configuration.h"
#include "fileio.h" #include "fileio.h"
@ -41,7 +42,6 @@ int fileio_dispatch_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
int fileio_open_local(fileio_t *fileio) int fileio_open_local(fileio_t *fileio)
{ {
fileio_local_t *fileio_local = malloc(sizeof(fileio_local_t));
char access[4]; char access[4];
switch (fileio->access) switch (fileio->access)
@ -62,7 +62,6 @@ int fileio_open_local(fileio_t *fileio)
strcpy(access, "a+"); strcpy(access, "a+");
break; break;
default: default:
free(fileio_local);
ERROR("BUG: access neither read, write nor readwrite"); ERROR("BUG: access neither read, write nor readwrite");
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
} }
@ -75,10 +74,9 @@ int fileio_open_local(fileio_t *fileio)
strcat(access, "b"); strcat(access, "b");
} }
if (!(fileio_local->file = fopen(fileio->url, access))) if (!(fileio->file = open_file_from_path (fileio->url, access)))
{ {
free(fileio_local); ERROR("couldn't open %s", fileio->url);
snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't open %s", fileio->url);
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
} }
@ -89,13 +87,13 @@ int fileio_open_local(fileio_t *fileio)
* that refers to e.g. a tftp client */ * that refers to e.g. a tftp client */
int result, result2; int result, result2;
result = fseek(fileio_local->file, 0, SEEK_END); result = fseek(fileio->file, 0, SEEK_END);
fileio->size = ftell(fileio_local->file); fileio->size = ftell(fileio->file);
result2 = fseek(fileio_local->file, 0, SEEK_SET); result2 = fseek(fileio->file, 0, SEEK_SET);
if ((fileio->size < 0) || (result < 0) || (result2 < 0)) if ((fileio->size<0)||(result<0)||(result2<0))
{ {
fileio_close(fileio); fileio_close(fileio);
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
@ -106,78 +104,39 @@ int fileio_open_local(fileio_t *fileio)
fileio->size = 0x0; fileio->size = 0x0;
} }
fileio->location_private = fileio_local;
return ERROR_OK; return ERROR_OK;
} }
int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type) int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
char *resource_identifier = NULL;
/* try to identify file location. We only hijack the file paths we understand, the rest is
* passed on to the OS which might implement e.g. tftp via a mounted tftp device.
*/
if ((resource_identifier = strstr(url, "bootp://")) && (resource_identifier == url))
{
ERROR("bootp resource location isn't supported yet");
return ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN;
}
else
{
/* default to local files */
fileio->location = FILEIO_LOCAL;
}
fileio->type = type; fileio->type = type;
fileio->access = access; fileio->access = access;
fileio->url = strdup(url); fileio->url = strdup(url);
switch (fileio->location) retval = fileio_open_local(fileio);
{
case FILEIO_LOCAL:
retval = fileio_open_local(fileio);
break;
default:
ERROR("BUG: should never get here");
exit(-1);
}
if (retval != ERROR_OK) return retval;
return retval;
return ERROR_OK;
} }
int fileio_close_local(fileio_t *fileio) int fileio_close_local(fileio_t *fileio)
{ {
int retval; int retval;
fileio_local_t *fileio_local = fileio->location_private; if ((retval = fclose(fileio->file)) != 0)
if (fileio->location_private == NULL)
{
snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: ", fileio->url);
return ERROR_FILEIO_OPERATION_FAILED;
}
if ((retval = fclose(fileio_local->file)) != 0)
{ {
if (retval == EBADF) if (retval == EBADF)
{ {
snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "BUG: fileio_local->file not a valid file descriptor"); ERROR("BUG: fileio_local->file not a valid file descriptor");
} }
else else
{ {
snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't close %s: %s", fileio->url, strerror(errno)); ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
} }
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
} }
free(fileio->location_private);
fileio->location_private = NULL;
return ERROR_OK; return ERROR_OK;
} }
@ -185,48 +144,21 @@ int fileio_close(fileio_t *fileio)
{ {
int retval; int retval;
switch (fileio->location) retval = fileio_close_local(fileio);
{
case FILEIO_LOCAL:
retval = fileio_close_local(fileio);
break;
default:
ERROR("BUG: should never get here");
retval = ERROR_FILEIO_OPERATION_FAILED;
}
if (retval != ERROR_OK)
return retval;
free(fileio->url); free(fileio->url);
fileio->url = NULL; fileio->url = NULL;
return ERROR_OK; return retval;
}
int fileio_seek_local(fileio_t *fileio, u32 position)
{
int retval;
fileio_local_t *fileio_local = fileio->location_private;
if ((retval = fseek(fileio_local->file, position, SEEK_SET)) != 0)
{
snprintf(fileio->error_str, FILEIO_MAX_ERROR_STRING, "couldn't seek file %s: %s", fileio->url, strerror(errno));
return ERROR_FILEIO_OPERATION_FAILED;
}
return ERROR_OK;
} }
int fileio_seek(fileio_t *fileio, u32 position) int fileio_seek(fileio_t *fileio, u32 position)
{ {
switch (fileio->location) int retval;
if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
{ {
case FILEIO_LOCAL: ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
return fileio_seek_local(fileio, position); return ERROR_FILEIO_OPERATION_FAILED;
break;
default:
ERROR("BUG: should never get here");
} }
return ERROR_OK; return ERROR_OK;
@ -234,24 +166,14 @@ int fileio_seek(fileio_t *fileio, u32 position)
int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read) int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
{ {
fileio_local_t *fileio_local = fileio->location_private; *size_read = fread(buffer, 1, size, fileio->file);
*size_read = fread(buffer, 1, size, fileio_local->file);
return ERROR_OK; return ERROR_OK;
} }
int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read) int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
{ {
switch (fileio->location) return fileio_local_read(fileio, size, buffer, size_read);
{
case FILEIO_LOCAL:
return fileio_local_read(fileio, size, buffer, size_read);
break;
default:
ERROR("BUG: should never get here");
exit(-1);
}
} }
int fileio_read_u32(fileio_t *fileio, u32 *data) int fileio_read_u32(fileio_t *fileio, u32 *data)
@ -260,26 +182,16 @@ int fileio_read_u32(fileio_t *fileio, u32 *data)
u32 size_read; u32 size_read;
int retval; int retval;
switch (fileio->location) if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
{ return retval;
case FILEIO_LOCAL: *data = be_to_h_u32(buf);
if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
return retval;
*data = be_to_h_u32(buf);
break;
default:
ERROR("BUG: should never get here");
exit(-1);
}
return ERROR_OK; return ERROR_OK;
} }
int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer) int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
{ {
fileio_local_t *fileio_local = fileio->location_private; if( fgets(buffer, size, fileio->file) == NULL)
if( fgets(buffer, size, fileio_local->file) == NULL)
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
return ERROR_OK; return ERROR_OK;
@ -287,22 +199,12 @@ int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer) int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer)
{ {
switch (fileio->location) return fileio_local_fgets(fileio, size, buffer);
{
case FILEIO_LOCAL:
return fileio_local_fgets(fileio, size, buffer);
break;
default:
ERROR("BUG: should never get here");
exit(-1);
}
} }
int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written) int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
{ {
fileio_local_t *fileio_local = fileio->location_private; *size_written = fwrite(buffer, 1, size, fileio->file);
*size_written = fwrite(buffer, 1, size, fileio_local->file);
return ERROR_OK; return ERROR_OK;
} }
@ -311,15 +213,7 @@ int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
{ {
int retval; int retval;
switch (fileio->location) retval = fileio_local_write(fileio, size, buffer, size_written);
{
case FILEIO_LOCAL:
retval = fileio_local_write(fileio, size, buffer, size_written);
break;
default:
ERROR("BUG: should never get here");
exit(-1);
}
if (retval == ERROR_OK) if (retval == ERROR_OK)
fileio->size += *size_written; fileio->size += *size_written;
@ -335,15 +229,8 @@ int fileio_write_u32(fileio_t *fileio, u32 data)
h_u32_to_be(buf, data); h_u32_to_be(buf, data);
switch (fileio->location) if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
{ return retval;
case FILEIO_LOCAL:
if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
return retval;
break;
default:
ERROR("BUG: should never get here");
}
return ERROR_OK; return ERROR_OK;
} }

21
src/helper/fileio.h
View File

@ -38,18 +38,6 @@ enum fileio_type
FILEIO_BINARY, FILEIO_BINARY,
}; };
enum fileio_location
{
FILEIO_LOCAL,
/*
* Possible future enhancements:
* FILEIO_NFS,
* FILEIO_BOOTP,
* FILEIO_[XYZ]MODEM,
* FILEIO_HTTP,
* FILEIO_FTP,
*/
};
enum fileio_access enum fileio_access
{ {
@ -63,18 +51,11 @@ enum fileio_access
typedef struct fileio_s typedef struct fileio_s
{ {
char *url; char *url;
char error_str[FILEIO_MAX_ERROR_STRING];
long long size; long long size;
enum fileio_type type; enum fileio_type type;
enum fileio_location location;
enum fileio_access access; enum fileio_access access;
void *location_private;
} fileio_t;
typedef struct fileio_local_s
{
FILE *file; FILE *file;
} fileio_local_t; } fileio_t;
extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written); extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written);
extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read); extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);

2
src/target/arm7_9_common.c
View File

@ -764,7 +764,6 @@ int arm7_9_assert_reset(target_t *target)
{ {
if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST) if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST)
{ {
WARNING("srst resets test logic, too");
retval = jtag_add_reset(1, 1); retval = jtag_add_reset(1, 1);
} }
} }
@ -775,7 +774,6 @@ int arm7_9_assert_reset(target_t *target)
{ {
if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST) if (retval == ERROR_JTAG_RESET_WOULD_ASSERT_TRST)
{ {
WARNING("srst resets test logic, too");
retval = jtag_add_reset(1, 1); retval = jtag_add_reset(1, 1);
} }

6
src/target/etm.c
View File

@ -1387,6 +1387,9 @@ int handle_etm_info_command(struct command_context_s *cmd_ctx, char *cmd, char *
case 2: case 2:
max_port_size = 16; max_port_size = 16;
break; break;
default:
ERROR("Illegal max_port_size");
exit(-1);
} }
command_print(cmd_ctx, "max. port size: %i", max_port_size); command_print(cmd_ctx, "max. port size: %i", max_port_size);
@ -1505,7 +1508,6 @@ int handle_etm_image_command(struct command_context_s *cmd_ctx, char *cmd, char
if (image_open(etm_ctx->image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK) if (image_open(etm_ctx->image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
{ {
command_print(cmd_ctx, "image opening error: %s", etm_ctx->image->error_str);
free(etm_ctx->image); free(etm_ctx->image);
etm_ctx->image = NULL; etm_ctx->image = NULL;
return ERROR_OK; return ERROR_OK;
@ -1562,7 +1564,6 @@ int handle_etm_dump_command(struct command_context_s *cmd_ctx, char *cmd, char *
if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "file open error: %s", file.error_str);
return ERROR_OK; return ERROR_OK;
} }
@ -1620,7 +1621,6 @@ int handle_etm_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
if (fileio_open(&file, args[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&file, args[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "file open error: %s", file.error_str);
return ERROR_OK; return ERROR_OK;
} }

103
src/target/image.c
View File

@ -37,13 +37,13 @@
#include "target.h" #include "target.h"
/* convert ELF header field to host endianness */ /* convert ELF header field to host endianness */
#define field16(elf, field)\ #define field16(elf,field)\
((elf->endianness == ELFDATA2LSB)? \ ((elf->endianness==ELFDATA2LSB)? \
le_to_h_u16((u8*)&field) : be_to_h_u16((u8*)&field)) le_to_h_u16((u8*)&field):be_to_h_u16((u8*)&field))
#define field32(elf, field)\ #define field32(elf,field)\
((elf->endianness == ELFDATA2LSB)? \ ((elf->endianness==ELFDATA2LSB)? \
le_to_h_u32((u8*)&field) : be_to_h_u32((u8*)&field)) le_to_h_u32((u8*)&field):be_to_h_u32((u8*)&field))
static int autodetect_image_type(image_t *image, char *url) static int autodetect_image_type(image_t *image, char *url)
{ {
@ -55,20 +55,14 @@ static int autodetect_image_type(image_t *image, char *url)
/* read the first 4 bytes of image */ /* read the first 4 bytes of image */
if ((retval = fileio_open(&fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK) if ((retval = fileio_open(&fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot open image: %s", fileio.error_str);
ERROR(image->error_str);
return retval; return retval;
} }
if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK) if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot read image header: %s", fileio.error_str);
ERROR(image->error_str);
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
} }
if (read_bytes != 9) if (read_bytes != 9)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot read image, only partially read");
ERROR(image->error_str);
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
} }
fileio_close(&fileio); fileio_close(&fileio);
@ -79,15 +73,15 @@ static int autodetect_image_type(image_t *image, char *url)
DEBUG("ELF image detected."); DEBUG("ELF image detected.");
image->type = IMAGE_ELF; image->type = IMAGE_ELF;
} }
else if ((buffer[0] == ':') /* record start byte */ else if ((buffer[0]==':') /* record start byte */
&&(isxdigit(buffer[1])) &&(isxdigit(buffer[1]))
&&(isxdigit(buffer[2])) &&(isxdigit(buffer[2]))
&&(isxdigit(buffer[3])) &&(isxdigit(buffer[3]))
&&(isxdigit(buffer[4])) &&(isxdigit(buffer[4]))
&&(isxdigit(buffer[5])) &&(isxdigit(buffer[5]))
&&(isxdigit(buffer[6])) &&(isxdigit(buffer[6]))
&&(buffer[7] == '0') /* record type : 00 -> 05 */ &&(buffer[7]=='0') /* record type : 00 -> 05 */
&&(buffer[8] >= '0') && (buffer[8] < '6')) &&(buffer[8]>='0')&&(buffer[8]<'6'))
{ {
DEBUG("IHEX image detected."); DEBUG("IHEX image detected.");
image->type = IMAGE_IHEX; image->type = IMAGE_IHEX;
@ -360,12 +354,12 @@ int image_elf_read_headers(image_t *image)
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
} }
if (strncmp((char*)elf->header->e_ident,ELFMAG,SELFMAG) != 0) if (strncmp((char*)elf->header->e_ident,ELFMAG,SELFMAG)!=0)
{ {
ERROR("invalid ELF file, bad magic number"); ERROR("invalid ELF file, bad magic number");
return ERROR_IMAGE_FORMAT_ERROR; return ERROR_IMAGE_FORMAT_ERROR;
} }
if (elf->header->e_ident[EI_CLASS] != ELFCLASS32) if (elf->header->e_ident[EI_CLASS]!=ELFCLASS32)
{ {
ERROR("invalid ELF file, only 32bits files are supported"); ERROR("invalid ELF file, only 32bits files are supported");
return ERROR_IMAGE_FORMAT_ERROR; return ERROR_IMAGE_FORMAT_ERROR;
@ -373,28 +367,28 @@ int image_elf_read_headers(image_t *image)
elf->endianness = elf->header->e_ident[EI_DATA]; elf->endianness = elf->header->e_ident[EI_DATA];
if ((elf->endianness != ELFDATA2LSB) if ((elf->endianness!=ELFDATA2LSB)
&&(elf->endianness != ELFDATA2MSB)) &&(elf->endianness!=ELFDATA2MSB))
{ {
ERROR("invalid ELF file, unknown endianess setting"); ERROR("invalid ELF file, unknown endianess setting");
return ERROR_IMAGE_FORMAT_ERROR; return ERROR_IMAGE_FORMAT_ERROR;
} }
elf->segment_count = field16(elf, elf->header->e_phnum); elf->segment_count = field16(elf,elf->header->e_phnum);
if (elf->segment_count == 0) if (elf->segment_count==0)
{ {
ERROR("invalid ELF file, no program headers"); ERROR("invalid ELF file, no program headers");
return ERROR_IMAGE_FORMAT_ERROR; return ERROR_IMAGE_FORMAT_ERROR;
} }
elf->segments = malloc(elf->segment_count * sizeof(Elf32_Phdr)); elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
if ((retval = fileio_read(&elf->fileio, elf->segment_count * sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK) if ((retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK)
{ {
ERROR("cannot read ELF segment headers, read failed"); ERROR("cannot read ELF segment headers, read failed");
return retval; return retval;
} }
if (read_bytes != elf->segment_count * sizeof(Elf32_Phdr)) if (read_bytes != elf->segment_count*sizeof(Elf32_Phdr))
{ {
ERROR("cannot read ELF segment headers, only partially read"); ERROR("cannot read ELF segment headers, only partially read");
return ERROR_FILEIO_OPERATION_FAILED; return ERROR_FILEIO_OPERATION_FAILED;
@ -402,25 +396,25 @@ int image_elf_read_headers(image_t *image)
/* count useful segments (loadable), ignore BSS section */ /* count useful segments (loadable), ignore BSS section */
image->num_sections = 0; image->num_sections = 0;
for (i = 0; i < elf->segment_count; i++) for (i=0;i<elf->segment_count;i++)
if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
image->num_sections++; image->num_sections++;
/* alloc and fill sections array with loadable segments */ /* alloc and fill sections array with loadable segments */
image->sections = malloc(image->num_sections * sizeof(image_section_t)); image->sections = malloc(image->num_sections * sizeof(image_section_t));
for (i = 0, j = 0; i < elf->segment_count; i++) for (i=0,j=0;i<elf->segment_count;i++)
{ {
if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
{ {
image->sections[j].size = field32(elf, elf->segments[i].p_filesz); image->sections[j].size = field32(elf,elf->segments[i].p_filesz);
image->sections[j].base_address = field32(elf, elf->segments[i].p_paddr); image->sections[j].base_address = field32(elf,elf->segments[i].p_paddr);
image->sections[j].private = &elf->segments[i]; image->sections[j].private = &elf->segments[i];
image->sections[j].flags = field32(elf, elf->segments[i].p_flags); image->sections[j].flags = field32(elf,elf->segments[i].p_flags);
j++; j++;
} }
} }
image->start_address_set = 1; image->start_address_set = 1;
image->start_address = field32(elf, elf->header->e_entry); image->start_address = field32(elf,elf->header->e_entry);
return ERROR_OK; return ERROR_OK;
} }
@ -429,22 +423,22 @@ int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8
{ {
image_elf_t *elf = image->type_private; image_elf_t *elf = image->type_private;
Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private; Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private;
u32 read_size, really_read; u32 read_size,really_read;
int retval; int retval;
*size_read = 0; *size_read = 0;
DEBUG("load segment %d at 0x%x (sz = 0x%x)", section, offset, size); DEBUG("load segment %d at 0x%x (sz=0x%x)",section,offset,size);
/* read initialized data in current segment if any */ /* read initialized data in current segment if any */
if (offset < field32(elf, segment->p_filesz)) if (offset<field32(elf,segment->p_filesz))
{ {
/* maximal size present in file for the current segment */ /* maximal size present in file for the current segment */
read_size = MIN(size, field32(elf, segment->p_filesz) - offset); read_size = MIN(size, field32(elf,segment->p_filesz)-offset);
DEBUG("read elf: size = 0x%x at 0x%x", read_size, DEBUG("read elf: size = 0x%x at 0x%x",read_size,
field32(elf, segment->p_offset) + offset); field32(elf,segment->p_offset)+offset);
/* read initialized area of the segment */ /* read initialized area of the segment */
if ((retval = fileio_seek(&elf->fileio, field32(elf, segment->p_offset) + offset)) != ERROR_OK) if ((retval = fileio_seek(&elf->fileio, field32(elf,segment->p_offset)+offset)) != ERROR_OK)
{ {
ERROR("cannot find ELF segment content, seek failed"); ERROR("cannot find ELF segment content, seek failed");
return retval; return retval;
@ -552,6 +546,7 @@ int image_mot_buffer_complete(image_t *image)
bytes_read += 8; bytes_read += 8;
count -=4; count -=4;
break; break;
} }
if (full_address != address) if (full_address != address)
@ -650,8 +645,6 @@ int image_open(image_t *image, char *url, char *type_string)
if ((retval = fileio_open(&image_binary->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK) if ((retval = fileio_open(&image_binary->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
{ {
strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
ERROR(image->error_str);
return retval; return retval;
} }
@ -669,16 +662,12 @@ int image_open(image_t *image, char *url, char *type_string)
if ((retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK) if ((retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
{ {
strncpy(image->error_str, image_ihex->fileio.error_str, IMAGE_MAX_ERROR_STRING);
ERROR(image->error_str);
return retval; return retval;
} }
if ((retval = image_ihex_buffer_complete(image)) != ERROR_OK) if ((retval = image_ihex_buffer_complete(image)) != ERROR_OK)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, ERROR("failed buffering IHEX image, check daemon output for additional information");
"failed buffering IHEX image, check daemon output for additional information");
ERROR(image->error_str);
fileio_close(&image_ihex->fileio); fileio_close(&image_ihex->fileio);
return retval; return retval;
} }
@ -691,16 +680,11 @@ int image_open(image_t *image, char *url, char *type_string)
if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK) if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
{ {
strncpy(image->error_str, image_elf->fileio.error_str, IMAGE_MAX_ERROR_STRING);
ERROR(image->error_str);
return retval; return retval;
} }
if ((retval = image_elf_read_headers(image)) != ERROR_OK) if ((retval = image_elf_read_headers(image)) != ERROR_OK)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
"failed to read ELF headers, check daemon output for additional information");
ERROR(image->error_str);
fileio_close(&image_elf->fileio); fileio_close(&image_elf->fileio);
return retval; return retval;
} }
@ -729,16 +713,12 @@ int image_open(image_t *image, char *url, char *type_string)
if ((retval = fileio_open(&image_mot->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK) if ((retval = fileio_open(&image_mot->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
{ {
strncpy(image->error_str, image_mot->fileio.error_str, IMAGE_MAX_ERROR_STRING);
ERROR(image->error_str);
return retval; return retval;
} }
if ((retval = image_mot_buffer_complete(image)) != ERROR_OK) if ((retval = image_mot_buffer_complete(image)) != ERROR_OK)
{ {
snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, ERROR("failed buffering S19 image, check daemon output for additional information");
"failed buffering S19 image, check daemon output for additional information");
ERROR(image->error_str);
fileio_close(&image_mot->fileio); fileio_close(&image_mot->fileio);
return retval; return retval;
} }
@ -754,15 +734,15 @@ int image_open(image_t *image, char *url, char *type_string)
{ {
/* relocate */ /* relocate */
int section; int section;
for (section = 0; section < image->num_sections; section++) for (section=0; section < image->num_sections; section++)
{ {
image->sections[section].base_address += image->base_address; image->sections[section].base_address+=image->base_address;
} }
/* we're done relocating. The two statements below are mainly /* we're done relocating. The two statements below are mainly
* for documenation purposes: stop anyone from empirically * for documenation purposes: stop anyone from empirically
* thinking they should use these values henceforth. */ * thinking they should use these values henceforth. */
image->base_address = 0; image->base_address=0;
image->base_address_set = 0; image->base_address_set=0;
} }
return retval; return retval;
@ -791,14 +771,12 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
/* seek to offset */ /* seek to offset */
if ((retval = fileio_seek(&image_binary->fileio, offset)) != ERROR_OK) if ((retval = fileio_seek(&image_binary->fileio, offset)) != ERROR_OK)
{ {
strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
return retval; return retval;
} }
/* return requested bytes */ /* return requested bytes */
if ((retval = fileio_read(&image_binary->fileio, size, buffer, size_read)) != ERROR_OK) if ((retval = fileio_read(&image_binary->fileio, size, buffer, size_read)) != ERROR_OK)
{ {
strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING);
return retval; return retval;
} }
} }
@ -806,7 +784,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
{ {
memcpy(buffer, (u8*)image->sections[section].private + offset, size); memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size; *size_read = size;
image->error_str[0] = '\0';
return ERROR_OK; return ERROR_OK;
} }
@ -857,7 +834,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
{ {
memcpy(buffer, (u8*)image->sections[section].private + offset, size); memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size; *size_read = size;
image->error_str[0] = '\0';
return ERROR_OK; return ERROR_OK;
} }
@ -865,7 +841,6 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
{ {
memcpy(buffer, (u8*)image->sections[section].private + offset, size); memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size; *size_read = size;
image->error_str[0] = '\0';
return ERROR_OK; return ERROR_OK;
} }
@ -1026,5 +1001,3 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
return ERROR_OK; return ERROR_OK;
} }

1
src/target/image.h
View File

@ -64,7 +64,6 @@ typedef struct image_s
int base_address; /* base address, if one is set */ int base_address; /* base address, if one is set */
int start_address_set; /* whether the image has a start address (entry point) associated */ int start_address_set; /* whether the image has a start address (entry point) associated */
u32 start_address; /* start address, if one is set */ u32 start_address; /* start address, if one is set */
char error_str[IMAGE_MAX_ERROR_STRING];
} image_t; } image_t;
typedef struct image_binary_s typedef struct image_binary_s

67
src/target/xscale.c
View File

@ -327,7 +327,7 @@ int xscale_read_dcsr(target_t *target)
int xscale_receive(target_t *target, u32 *buffer, int num_words) int xscale_receive(target_t *target, u32 *buffer, int num_words)
{ {
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;
@ -380,7 +380,7 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
jtag_add_runtest(1, -1); jtag_add_runtest(1, -1);
/* repeat until all words have been collected */ /* repeat until all words have been collected */
int attempts = 0; int attempts=0;
while (words_done < num_words) while (words_done < num_words)
{ {
/* schedule reads */ /* schedule reads */
@ -417,12 +417,12 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
words_scheduled--; words_scheduled--;
} }
} }
if (words_scheduled == 0) if (words_scheduled==0)
{ {
if (attempts++ == 1000) if (attempts++==1000)
{ {
ERROR("Failed to receiving data from debug handler after 1000 attempts"); ERROR("Failed to receiving data from debug handler after 1000 attempts");
retval = ERROR_JTAG_QUEUE_FAILED; retval=ERROR_JTAG_QUEUE_FAILED;
break; break;
} }
} }
@ -700,25 +700,25 @@ int xscale_send(target_t *target, u8 *buffer, int count, int size)
{ {
while (done_count++ < count) while (done_count++ < count)
{ {
/* extract sized element from target-endian buffer, and put it /* extract sized element from target-endian buffer, and put it
* into little-endian output buffer * into little-endian output buffer
*/ */
switch (size) switch (size)
{ {
case 2: case 2:
buf_set_u32(output, 0, 32, target_buffer_get_u16(target, buffer)); buf_set_u32(output, 0, 32, target_buffer_get_u16(target, buffer));
break; break;
case 1: case 1:
output[0] = *buffer; output[0] = *buffer;
break; break;
default: default:
ERROR("BUG: size neither 4, 2 nor 1"); ERROR("BUG: size neither 4, 2 nor 1");
exit(-1); exit(-1);
} }
jtag_add_dr_scan(3, fields, TAP_RTI); jtag_add_dr_scan(3, fields, TAP_RTI);
buffer += size; buffer += size;
} }
} }
@ -1049,9 +1049,9 @@ int xscale_poll(target_t *target)
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
*/ */
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
return ERROR_OK; return ERROR_OK;
@ -1062,6 +1062,7 @@ int xscale_poll(target_t *target)
else else
target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED); target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
} }
return retval; return retval;
} }
@ -1657,9 +1658,8 @@ int xscale_deassert_reset(target_t *target)
xscale_write_dcsr(target, 1, 0); xscale_write_dcsr(target, 1, 0);
/* Load debug handler */ /* Load debug handler */
if (fileio_open(&debug_handler, PKGLIBDIR "/xscale/debug_handler.bin", FILEIO_READ, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&debug_handler, "xscale/debug_handler.bin", FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{ {
ERROR("file open error: %s", debug_handler.error_str);
return ERROR_OK; return ERROR_OK;
} }
@ -1685,7 +1685,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)
{ {
ERROR("reading debug handler failed: %s", debug_handler.error_str);
} }
for (i = 0; i < buf_cnt; i += 4) for (i = 0; i < buf_cnt; i += 4)
@ -2323,7 +2323,7 @@ int xscale_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{ {
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;
u8 enable = 0; u8 enable=0;
reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON]; reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON];
u32 dbcon_value = buf_get_u32(dbcon->value, 0, 32); u32 dbcon_value = buf_get_u32(dbcon->value, 0, 32);
@ -3261,6 +3261,7 @@ static int xscale_virt2phys(struct target_s *target, u32 virtual, u32 *physical)
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;
@ -3270,7 +3271,6 @@ static int xscale_virt2phys(struct target_s *target, u32 virtual, u32 *physical)
{ {
return ret; return ret;
} }
*physical = ret; *physical = ret;
return ERROR_OK; return ERROR_OK;
} }
@ -3285,11 +3285,11 @@ static int xscale_mmu(struct target_s *target, int *enabled)
ERROR("Target not halted"); ERROR("Target not halted");
return ERROR_TARGET_INVALID; return ERROR_TARGET_INVALID;
} }
*enabled = xscale->armv4_5_mmu.mmu_enabled; *enabled = xscale->armv4_5_mmu.mmu_enabled;
return ERROR_OK; return ERROR_OK;
} }
int xscale_handle_mmu_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc) int xscale_handle_mmu_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target = get_current_target(cmd_ctx); target_t *target = get_current_target(cmd_ctx);
@ -3558,7 +3558,6 @@ int xscale_handle_trace_image_command(struct command_context_s *cmd_ctx, char *c
if (image_open(xscale->trace.image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK) if (image_open(xscale->trace.image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
{ {
command_print(cmd_ctx, "image opening error: %s", xscale->trace.image->error_str);
free(xscale->trace.image); free(xscale->trace.image);
xscale->trace.image = NULL; xscale->trace.image = NULL;
return ERROR_OK; return ERROR_OK;
@ -3602,7 +3601,6 @@ int xscale_handle_dump_trace_command(struct command_context_s *cmd_ctx, char *cm
if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{ {
command_print(cmd_ctx, "file open error: %s", file.error_str);
return ERROR_OK; return ERROR_OK;
} }
@ -3793,6 +3791,7 @@ int xscale_register_commands(struct command_context_s *cmd_ctx)
register_command(cmd_ctx, xscale_cmd, "fast_memory_access", handle_xscale_fast_memory_access_command, register_command(cmd_ctx, xscale_cmd, "fast_memory_access", handle_xscale_fast_memory_access_command,
COMMAND_ANY, "use fast memory accesses instead of slower but potentially unsafe slow accesses <enable|disable>"); COMMAND_ANY, "use fast memory accesses instead of slower but potentially unsafe slow accesses <enable|disable>");
armv4_5_register_commands(cmd_ctx); armv4_5_register_commands(cmd_ctx);
return ERROR_OK; return ERROR_OK;