* Copyright (C) 2007 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
+ * *
+ * Copyright (C) 2008 by Spencer Oliver *
+ * spen@spen-soft.co.uk *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
#include "config.h"
#endif
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_ELF_H
-#include <elf.h>
-#endif
-
#include "image.h"
-
-#include "types.h"
-#include "replacements.h"
+#include "target.h"
#include "log.h"
-#include "fileio.h"
-#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((uint8_t*)&field):be_to_h_u16((uint8_t*)&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((uint8_t*)&field):be_to_h_u32((uint8_t*)&field))
static int autodetect_image_type(image_t *image, char *url)
{
int retval;
fileio_t fileio;
u32 read_bytes;
- u8 buffer[9];
+ uint8_t buffer[9];
/* 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)
+ retval = fileio_read(&fileio, 9, buffer, &read_bytes);
+
+ if (retval==ERROR_OK)
{
- snprintf(image->error_str, IMAGE_MAX_ERROR_STRING, "cannot read image, only partially read");
- ERROR(image->error_str);
- return ERROR_FILEIO_OPERATION_FAILED;
+ if (read_bytes != 9)
+ {
+ retval=ERROR_FILEIO_OPERATION_FAILED;
+ }
}
fileio_close(&fileio);
+ if (retval!=ERROR_OK)
+ return retval;
+
/* check header against known signatures */
if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0)
{
- DEBUG("ELF image detected.");
+ LOG_DEBUG("ELF image detected.");
image->type = IMAGE_ELF;
}
- 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'))
+ 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'))
{
- DEBUG("IHEX image detected.");
+ LOG_DEBUG("IHEX image detected.");
image->type = IMAGE_IHEX;
}
else if ((buffer[0] == 'S') /* record start byte */
&&(isxdigit(buffer[3]))
&&(buffer[1] >= '0') && (buffer[1] < '9'))
{
- DEBUG("S19 image detected.");
+ LOG_DEBUG("S19 image detected.");
image->type = IMAGE_SRECORD;
}
else
return ERROR_OK;
}
-int identify_image_type(image_t *image, char *type_string, char *url)
+static int identify_image_type(image_t *image, char *type_string, char *url)
{
if (type_string)
{
return ERROR_OK;
}
-int image_ihex_buffer_complete(image_t *image)
+static int image_ihex_buffer_complete(image_t *image)
{
image_ihex_t *ihex = image->type_private;
fileio_t *fileio = &ihex->fileio;
u32 address;
u32 record_type;
u32 checksum;
- u8 cal_checksum = 0;
+ uint8_t cal_checksum = 0;
u32 bytes_read = 0;
if (sscanf(&lpszLine[bytes_read], ":%2x%4x%2x", &count, &address, &record_type) != 3)
}
bytes_read += 9;
- cal_checksum += (u8)count;
- cal_checksum += (u8)(address >> 8);
- cal_checksum += (u8)address;
- cal_checksum += (u8)record_type;
+ cal_checksum += (uint8_t)count;
+ cal_checksum += (uint8_t)(address >> 8);
+ cal_checksum += (uint8_t)address;
+ cal_checksum += (uint8_t)record_type;
if (record_type == 0) /* Data Record */
{
while (count-- > 0)
{
- sscanf(&lpszLine[bytes_read], "%2x", (u32*)&ihex->buffer[cooked_bytes]);
- cal_checksum += (u8)ihex->buffer[cooked_bytes];
+ unsigned value;
+ sscanf(&lpszLine[bytes_read], "%2x", &value);
+ ihex->buffer[cooked_bytes] = (uint8_t)value;
+ cal_checksum += (uint8_t)ihex->buffer[cooked_bytes];
bytes_read += 2;
cooked_bytes += 1;
section[image->num_sections].size += 1;
}
else if (record_type == 2) /* Linear Address Record */
{
- u16 upper_address;
+ uint16_t upper_address;
sscanf(&lpszLine[bytes_read], "%4hx", &upper_address);
- cal_checksum += (u8)(upper_address >> 8);
- cal_checksum += (u8)upper_address;
+ cal_checksum += (uint8_t)(upper_address >> 8);
+ cal_checksum += (uint8_t)upper_address;
bytes_read += 4;
if ((full_address >> 4) != upper_address)
while (count-- > 0)
{
sscanf(&lpszLine[bytes_read], "%2x", &dummy);
- cal_checksum += (u8)dummy;
+ cal_checksum += (uint8_t)dummy;
bytes_read += 2;
}
}
else if (record_type == 4) /* Extended Linear Address Record */
{
- u16 upper_address;
+ uint16_t upper_address;
sscanf(&lpszLine[bytes_read], "%4hx", &upper_address);
- cal_checksum += (u8)(upper_address >> 8);
- cal_checksum += (u8)upper_address;
+ cal_checksum += (uint8_t)(upper_address >> 8);
+ cal_checksum += (uint8_t)upper_address;
bytes_read += 4;
if ((full_address >> 16) != upper_address)
u32 start_address;
sscanf(&lpszLine[bytes_read], "%8x", &start_address);
- cal_checksum += (u8)(start_address >> 24);
- cal_checksum += (u8)(start_address >> 16);
- cal_checksum += (u8)(start_address >> 8);
- cal_checksum += (u8)start_address;
+ cal_checksum += (uint8_t)(start_address >> 24);
+ cal_checksum += (uint8_t)(start_address >> 16);
+ cal_checksum += (uint8_t)(start_address >> 8);
+ cal_checksum += (uint8_t)start_address;
bytes_read += 8;
image->start_address_set = 1;
- image->start_address = be_to_h_u32((u8*)&start_address);
+ image->start_address = be_to_h_u32((uint8_t*)&start_address);
}
else
{
- ERROR("unhandled IHEX record type: %i", record_type);
+ LOG_ERROR("unhandled IHEX record type: %i", record_type);
return ERROR_IMAGE_FORMAT_ERROR;
}
sscanf(&lpszLine[bytes_read], "%2x", &checksum);
bytes_read += 2;
- if ((u8)checksum != (u8)(~cal_checksum + 1))
+ if ((uint8_t)checksum != (uint8_t)(~cal_checksum + 1))
{
/* checksum failed */
- ERROR("incorrect record checksum found in IHEX file");
+ LOG_ERROR("incorrect record checksum found in IHEX file");
return ERROR_IMAGE_CHECKSUM;
}
}
- ERROR("premature end of IHEX file, no end-of-file record found");
+ LOG_ERROR("premature end of IHEX file, no end-of-file record found");
return ERROR_IMAGE_FORMAT_ERROR;
}
-int image_elf_read_headers(image_t *image)
+static int image_elf_read_headers(image_t *image)
{
image_elf_t *elf = image->type_private;
u32 read_bytes;
elf->header = malloc(sizeof(Elf32_Ehdr));
- if ((retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (u8*)elf->header, &read_bytes)) != ERROR_OK)
+ if(elf->header == NULL)
{
- ERROR("cannot read ELF file header, read failed");
+ LOG_ERROR("insufficient memory to perform operation ");
+ return ERROR_FILEIO_OPERATION_FAILED;
+ }
+
+ if ((retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (uint8_t*)elf->header, &read_bytes)) != ERROR_OK)
+ {
+ LOG_ERROR("cannot read ELF file header, read failed");
return ERROR_FILEIO_OPERATION_FAILED;
}
if (read_bytes != sizeof(Elf32_Ehdr))
{
- ERROR("cannot read ELF file header, only partially read");
+ LOG_ERROR("cannot read ELF file header, only partially read");
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");
+ LOG_ERROR("invalid ELF file, bad magic number");
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");
+ LOG_ERROR("invalid ELF file, only 32bits files are supported");
return ERROR_IMAGE_FORMAT_ERROR;
}
-
elf->endianness = elf->header->e_ident[EI_DATA];
- if ((elf->endianness != ELFDATA2LSB)
- &&(elf->endianness != ELFDATA2MSB))
+ if ((elf->endianness!=ELFDATA2LSB)
+ &&(elf->endianness!=ELFDATA2MSB))
{
- ERROR("invalid ELF file, unknown endianess setting");
+ LOG_ERROR("invalid ELF file, unknown endianess setting");
return ERROR_IMAGE_FORMAT_ERROR;
}
- elf->segment_count = field16(elf, elf->header->e_phnum);
- if (elf->segment_count == 0)
+ elf->segment_count = field16(elf,elf->header->e_phnum);
+ if (elf->segment_count==0)
{
- ERROR("invalid ELF file, no program headers");
+ LOG_ERROR("invalid ELF file, no program headers");
return ERROR_IMAGE_FORMAT_ERROR;
}
- elf->segments = malloc(elf->segment_count * sizeof(Elf32_Phdr));
+ if ((retval = fileio_seek(&elf->fileio, field32(elf,elf->header->e_phoff))) != ERROR_OK)
+ {
+ LOG_ERROR("cannot seek to ELF program header table, read failed");
+ return retval;
+ }
+
+ elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
+ if(elf->segments == NULL)
+ {
+ LOG_ERROR("insufficient memory to perform operation ");
+ return ERROR_FILEIO_OPERATION_FAILED;
+ }
- 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), (uint8_t*)elf->segments, &read_bytes)) != ERROR_OK)
{
- ERROR("cannot read ELF segment headers, read failed");
+ LOG_ERROR("cannot read ELF segment headers, read failed");
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");
+ LOG_ERROR("cannot read ELF segment headers, only partially read");
return ERROR_FILEIO_OPERATION_FAILED;
}
/* 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_filesz);
- image->sections[j].base_address = field32(elf, elf->segments[i].p_paddr);
+ 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->sections[j].flags = field32(elf,elf->segments[i].p_flags);
j++;
}
}
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;
}
-int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read)
+static int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, uint8_t *buffer, u32 *size_read)
{
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);
+ LOG_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);
+ LOG_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");
+ LOG_ERROR("cannot find ELF segment content, seek failed");
return retval;
}
if ((retval = fileio_read(&elf->fileio, read_size, buffer, &really_read)) != ERROR_OK)
{
- ERROR("cannot read ELF segment content, read failed");
+ LOG_ERROR("cannot read ELF segment content, read failed");
return retval;
}
buffer += read_size;
return ERROR_OK;
}
-int image_mot_buffer_complete(image_t *image)
+static int image_mot_buffer_complete(image_t *image)
{
image_mot_t *mot = image->type_private;
fileio_t *fileio = &mot->fileio;
u32 address;
u32 record_type;
u32 checksum;
- u8 cal_checksum = 0;
+ uint8_t cal_checksum = 0;
u32 bytes_read = 0;
/* get record type and record length */
}
bytes_read += 4;
- cal_checksum += (u8)count;
+ cal_checksum += (uint8_t)count;
/* skip checksum byte */
count -=1;
while (count-- > 0) {
sscanf(&lpszLine[bytes_read], "%2x", &iValue);
- cal_checksum += (u8)iValue;
+ cal_checksum += (uint8_t)iValue;
bytes_read += 2;
}
}
case 1:
/* S1 - 16 bit address data record */
sscanf(&lpszLine[bytes_read], "%4x", &address);
- cal_checksum += (u8)(address >> 8);
- cal_checksum += (u8)address;
+ cal_checksum += (uint8_t)(address >> 8);
+ cal_checksum += (uint8_t)address;
bytes_read += 4;
count -=2;
break;
case 2:
/* S2 - 24 bit address data record */
sscanf(&lpszLine[bytes_read], "%6x", &address);
- cal_checksum += (u8)(address >> 16);
- cal_checksum += (u8)(address >> 8);
- cal_checksum += (u8)address;
+ cal_checksum += (uint8_t)(address >> 16);
+ cal_checksum += (uint8_t)(address >> 8);
+ cal_checksum += (uint8_t)address;
bytes_read += 6;
count -=3;
break;
case 3:
/* S3 - 32 bit address data record */
sscanf(&lpszLine[bytes_read], "%8x", &address);
- cal_checksum += (u8)(address >> 24);
- cal_checksum += (u8)(address >> 16);
- cal_checksum += (u8)(address >> 8);
- cal_checksum += (u8)address;
+ cal_checksum += (uint8_t)(address >> 24);
+ cal_checksum += (uint8_t)(address >> 16);
+ cal_checksum += (uint8_t)(address >> 8);
+ cal_checksum += (uint8_t)address;
bytes_read += 8;
count -=4;
break;
+
}
if (full_address != address)
while (count-- > 0)
{
- sscanf(&lpszLine[bytes_read], "%2x", (u32*)&mot->buffer[cooked_bytes]);
- cal_checksum += (u8)mot->buffer[cooked_bytes];
+ unsigned value;
+ sscanf(&lpszLine[bytes_read], "%2x", &value);
+ mot->buffer[cooked_bytes] = (uint8_t)value;
+ cal_checksum += (uint8_t)mot->buffer[cooked_bytes];
bytes_read += 2;
cooked_bytes += 1;
section[image->num_sections].size += 1;
while (count-- > 0)
{
sscanf(&lpszLine[bytes_read], "%2x", &dummy);
- cal_checksum += (u8)dummy;
+ cal_checksum += (uint8_t)dummy;
bytes_read += 2;
}
}
}
else
{
- ERROR("unhandled S19 record type: %i", record_type);
+ LOG_ERROR("unhandled S19 record type: %i", record_type);
return ERROR_IMAGE_FORMAT_ERROR;
}
/* account for checksum, will always be 0xFF */
sscanf(&lpszLine[bytes_read], "%2x", &checksum);
- cal_checksum += (u8)checksum;
+ cal_checksum += (uint8_t)checksum;
bytes_read += 2;
if( cal_checksum != 0xFF )
{
/* checksum failed */
- ERROR("incorrect record checksum found in S19 file");
+ LOG_ERROR("incorrect record checksum found in S19 file");
return ERROR_IMAGE_CHECKSUM;
}
}
- ERROR("premature end of S19 file, no end-of-file record found");
+ LOG_ERROR("premature end of S19 file, no end-of-file record found");
return ERROR_IMAGE_FORMAT_ERROR;
}
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);
+ LOG_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;
}
}
else if (image->type == IMAGE_MEMORY)
{
+ target_t *target = get_target(url);
+
+ if (target == NULL)
+ {
+ LOG_ERROR("target '%s' not defined", url);
+ return ERROR_FAIL;
+ }
+
image_memory_t *image_memory;
image->num_sections = 1;
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_address = 0x0;
}
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);
+ LOG_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;
};
-int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read)
+int image_read_section(image_t *image, int section, u32 offset, u32 size, uint8_t *buffer, u32 *size_read)
{
int retval;
/* don't read past the end of a section */
if (offset + size > image->sections[section].size)
{
- DEBUG("read past end of section: 0x%8.8x + 0x%8.8x > 0x%8.8x",
+ LOG_DEBUG("read past end of section: 0x%8.8x + 0x%8.8x > 0x%8.8x",
offset, size, image->sections[section].size);
return ERROR_INVALID_ARGUMENTS;
}
/* 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;
}
}
else if (image->type == IMAGE_IHEX)
{
- memcpy(buffer, (u8*)image->sections[section].private + offset, size);
+ memcpy(buffer, (uint8_t*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
}
else if (image->type == IMAGE_SRECORD)
{
- memcpy(buffer, (u8*)image->sections[section].private + offset, size);
+ memcpy(buffer, (uint8_t*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
else if (image->type == IMAGE_BUILDER)
{
- memcpy(buffer, (u8*)image->sections[section].private + offset, size);
+ memcpy(buffer, (uint8_t*)image->sections[section].private + offset, size);
*size_read = size;
- image->error_str[0] = '\0';
return ERROR_OK;
}
return ERROR_OK;
}
-int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data)
+int image_add_section(image_t *image, u32 base, u32 size, int flags, uint8_t *data)
{
image_section_t *section;
if (((section->base_address + section->size) == base) && (section->flags == flags))
{
section->private = realloc(section->private, section->size + size);
- memcpy((u8*)section->private + section->size, data, size);
+ memcpy((uint8_t*)section->private + section->size, data, size);
section->size += size;
return ERROR_OK;
}
section->base_address = base;
section->size = size;
section->flags = flags;
- section->private = malloc(sizeof(u8) * size);
- memcpy((u8*)section->private, data, size);
+ section->private = malloc(sizeof(uint8_t) * size);
+ memcpy((uint8_t*)section->private, data, size);
return ERROR_OK;
}
-int image_close(image_t *image)
+void image_close(image_t *image)
{
if (image->type == IMAGE_BINARY)
{
free(image->sections);
image->sections = NULL;
}
-
- return ERROR_OK;
}
-static u32 crc32_table[256] = {0, 0};
-
-int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
+int image_calculate_checksum(uint8_t* buffer, u32 nbytes, u32* checksum)
{
u32 crc = 0xffffffff;
+ LOG_DEBUG("Calculating checksum");
- if (!crc32_table[1])
+ u32 crc32_table[256];
+
+ /* Initialize the CRC table and the decoding table. */
+ int i, j;
+ unsigned int c;
+ for (i = 0; i < 256; i++)
{
- /* Initialize the CRC table and the decoding table. */
- int i, j;
- unsigned int c;
- for (i = 0; i < 256; i++)
+ /* as per gdb */
+ for (c = i << 24, j = 8; j > 0; --j)
+ c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
+ crc32_table[i] = c;
+ }
+
+ while (nbytes>0)
+ {
+ int run=nbytes;
+ if (run>32768)
+ {
+ run=32768;
+ }
+ nbytes-=run;
+ while (run--)
{
/* as per gdb */
- for (c = i << 24, j = 8; j > 0; --j)
- c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
- crc32_table[i] = c;
+ crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
}
+ keep_alive();
}
- while (nbytes--)
- {
- /* as per gdb */
- crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
- }
+ LOG_DEBUG("Calculating checksum done");
*checksum = crc;
return ERROR_OK;
}
-
-
-
projects / fw / openocd / blobdiff