#include "target.h"
/* convert ELF header field to host endianness */
-#define field16(elf, field)\
- ((elf->endianness == ELFDATA2LSB)? \
- le_to_h_u16((u8*)&field) : be_to_h_u16((u8*)&field))
+#define field16(elf,field)\
+ ((elf->endianness==ELFDATA2LSB)? \
+ le_to_h_u16((u8*)&field):be_to_h_u16((u8*)&field))
-#define field32(elf, field)\
- ((elf->endianness == ELFDATA2LSB)? \
- le_to_h_u32((u8*)&field) : be_to_h_u32((u8*)&field))
+#define field32(elf,field)\
+ ((elf->endianness==ELFDATA2LSB)? \
+ le_to_h_u32((u8*)&field):be_to_h_u32((u8*)&field))
static int autodetect_image_type(image_t *image, char *url)
{
/* read the first 4 bytes of image */
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;
}
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;
}
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;
}
fileio_close(&fileio);
DEBUG("ELF image detected.");
image->type = IMAGE_ELF;
}
- else if ((buffer[0] == ':') /* record start byte */
+ else if ((buffer[0]==':') /* record start byte */
&&(isxdigit(buffer[1]))
&&(isxdigit(buffer[2]))
&&(isxdigit(buffer[3]))
&&(isxdigit(buffer[4]))
&&(isxdigit(buffer[5]))
&&(isxdigit(buffer[6]))
- &&(buffer[7] == '0') /* record type : 00 -> 05 */
- &&(buffer[8] >= '0') && (buffer[8] < '6'))
+ &&(buffer[7]=='0') /* record type : 00 -> 05 */
+ &&(buffer[8]>='0')&&(buffer[8]<'6'))
{
DEBUG("IHEX image detected.");
image->type = IMAGE_IHEX;
/* count useful segments (loadable), ignore BSS section */
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))
image->num_sections++;
/* alloc and fill sections array with loadable segments */
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))
{
- image->sections[j].size = field32(elf,elf->segments[i].p_memsz);
+ 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].private = &elf->segments[i];
image->sections[j].flags = field32(elf,elf->segments[i].p_flags);
{
image_elf_t *elf = image->type_private;
Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private;
- u32 read_size, really_read;
+ u32 read_size,really_read;
int retval;
*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 */
- if (offset < field32(elf, segment->p_filesz))
+ if (offset<field32(elf,segment->p_filesz))
{
/* maximal size present in file for the current segment */
- read_size = MIN(size, field32(elf, segment->p_filesz) - offset);
- DEBUG("read elf: size = 0x%x at 0x%x", read_size,
- field32(elf,segment->p_offset) + offset);
+ read_size = MIN(size, field32(elf,segment->p_filesz)-offset);
+ DEBUG("read elf: size = 0x%x at 0x%x",read_size,
+ field32(elf,segment->p_offset)+offset);
/* 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");
return retval;
if (!size)
return ERROR_OK;
}
- /* if there is remaining zeroed area in current segment */
- if (offset < field32(elf, segment->p_memsz))
- {
- /* fill zeroed part (BSS) of the segment */
- read_size = MIN(size, field32(elf, segment->p_memsz) - offset);
- DEBUG("zero fill: size = 0x%x", read_size);
- memset(buffer, 0, read_size);
- *size_read += read_size;
- }
return ERROR_OK;
}
bytes_read += 8;
count -=4;
break;
+
}
if (full_address != address)
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;
}
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;
}
if ((retval = image_ihex_buffer_complete(image)) != ERROR_OK)
{
- snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
- "failed buffering IHEX image, check daemon output for additional information");
- ERROR(image->error_str);
+ ERROR("failed buffering IHEX image, check daemon output for additional information");
fileio_close(&image_ihex->fileio);
return retval;
}
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;
}
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);
return retval;
}
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;
}
if ((retval = image_mot_buffer_complete(image)) != ERROR_OK)
{
- snprintf(image->error_str, IMAGE_MAX_ERROR_STRING,
- "failed buffering S19 image, check daemon output for additional information");
- ERROR(image->error_str);
+ ERROR("failed buffering S19 image, check daemon output for additional information");
fileio_close(&image_mot->fileio);
return retval;
}
{
/* relocate */
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
* for documenation purposes: stop anyone from empirically
* thinking they should use these values henceforth. */
- image->base_address = 0;
- image->base_address_set = 0;
+ image->base_address=0;
+ image->base_address_set=0;
}
return retval;
/* seek to offset */
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 requested bytes */
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;
}
}
{
memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
{
memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
{
memcpy(buffer, (u8*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
image_elf_t *image_elf = image->type_private;
fileio_close(&image_elf->fileio);
-
+
if (image_elf->header)
{
free(image_elf->header);
return ERROR_OK;
}
-