{
image->type = IMAGE_SRECORD;
}
+ else if (!strcmp(type_string, "build"))
+ {
+ image->type = IMAGE_BUILDER;
+ }
else
{
return ERROR_IMAGE_TYPE_UNKNOWN;
{
image_ihex_t *ihex = image->type_private;
fileio_t *fileio = &ihex->fileio;
- u32 raw_bytes_read, raw_bytes;
- int retval;
u32 full_address = 0x0;
- char *buffer = malloc(fileio->size);
u32 cooked_bytes;
int i;
+ char lpszLine[1023];
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
image_section_t section[IMAGE_MAX_SECTIONS];
-
- if ((retval = fileio_read(fileio, fileio->size, (u8*)buffer, &raw_bytes_read)) != ERROR_OK)
- {
- free(buffer);
- ERROR("failed buffering IHEX file, read failed");
- return ERROR_FILEIO_OPERATION_FAILED;
- }
-
- if (raw_bytes_read != fileio->size)
- {
- free(buffer);
- ERROR("failed buffering complete IHEX file, only partially read");
- return ERROR_FILEIO_OPERATION_FAILED;
- }
ihex->buffer = malloc(fileio->size >> 1);
- raw_bytes = 0x0;
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &ihex->buffer[cooked_bytes];
section[image->num_sections].base_address = 0x0;
section[image->num_sections].size = 0x0;
section[image->num_sections].flags = 0;
- while (raw_bytes < raw_bytes_read)
+
+ while (fileio_fgets(fileio, 1023, lpszLine) == ERROR_OK)
{
u32 count;
u32 address;
u32 record_type;
u32 checksum;
u8 cal_checksum = 0;
+ u32 bytes_read = 0;
- if (sscanf(&buffer[raw_bytes], ":%2x%4x%2x", &count, &address, &record_type) != 3)
+ if (sscanf(&lpszLine[bytes_read], ":%2x%4x%2x", &count, &address, &record_type) != 3)
{
return ERROR_IMAGE_FORMAT_ERROR;
}
- raw_bytes += 9;
+ bytes_read += 9;
cal_checksum += (u8)count;
cal_checksum += (u8)(address >> 8);
while (count-- > 0)
{
- sscanf(&buffer[raw_bytes], "%2hhx", &ihex->buffer[cooked_bytes]);
+ sscanf(&lpszLine[bytes_read], "%2x", (u32*)&ihex->buffer[cooked_bytes]);
cal_checksum += (u8)ihex->buffer[cooked_bytes];
- raw_bytes += 2;
+ bytes_read += 2;
cooked_bytes += 1;
section[image->num_sections].size += 1;
full_address++;
image->sections[i].flags = section[i].flags;
}
- free(buffer);
return ERROR_OK;
}
+ else if (record_type == 2) /* Linear Address Record */
+ {
+ u16 upper_address;
+
+ sscanf(&lpszLine[bytes_read], "%4hx", &upper_address);
+ cal_checksum += (u8)(upper_address >> 8);
+ cal_checksum += (u8)upper_address;
+ bytes_read += 4;
+
+ if ((full_address >> 4) != upper_address)
+ {
+ /* we encountered a nonconsecutive location, create a new section,
+ * unless the current section has zero size, in which case this specifies
+ * the current section's base address
+ */
+ if (section[image->num_sections].size != 0)
+ {
+ image->num_sections++;
+ section[image->num_sections].size = 0x0;
+ section[image->num_sections].flags = 0;
+ section[image->num_sections].private = &ihex->buffer[cooked_bytes];
+ }
+ section[image->num_sections].base_address =
+ (full_address & 0xffff) | (upper_address << 4);
+ full_address = (full_address & 0xffff) | (upper_address << 4);
+ }
+ }
else if (record_type == 4) /* Extended Linear Address Record */
{
u16 upper_address;
- sscanf(&buffer[raw_bytes], "%4hx", &upper_address);
+ sscanf(&lpszLine[bytes_read], "%4hx", &upper_address);
cal_checksum += (u8)(upper_address >> 8);
cal_checksum += (u8)upper_address;
- raw_bytes += 4;
+ bytes_read += 4;
if ((full_address >> 16) != upper_address)
{
{
u32 start_address;
- sscanf(&buffer[raw_bytes], "%8x", &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;
- raw_bytes += 8;
+ bytes_read += 8;
image->start_address_set = 1;
image->start_address = be_to_h_u32((u8*)&start_address);
}
else
{
- free(buffer);
ERROR("unhandled IHEX record type: %i", record_type);
return ERROR_IMAGE_FORMAT_ERROR;
}
- sscanf(&buffer[raw_bytes], "%2x", &checksum);
- raw_bytes += 2;
+ sscanf(&lpszLine[bytes_read], "%2x", &checksum);
+ bytes_read += 2;
if ((u8)checksum != (u8)(~cal_checksum + 1))
{
/* checksum failed */
- free(buffer);
ERROR("incorrect record checksum found in IHEX file");
return ERROR_IMAGE_CHECKSUM;
}
-
- /* consume new-line character(s) */
- if ((buffer[raw_bytes] == '\n') || (buffer[raw_bytes] == '\r'))
- raw_bytes++;
-
- if ((buffer[raw_bytes] == '\n') || (buffer[raw_bytes] == '\r'))
- raw_bytes++;
}
-
- free(buffer);
+
ERROR("premature end of IHEX file, no end-of-file record found");
return ERROR_IMAGE_FORMAT_ERROR;
}
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].base_address = field32(elf,elf->segments[i].p_vaddr);
+ 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);
j++;
{
image_mot_t *mot = image->type_private;
fileio_t *fileio = &mot->fileio;
- u32 raw_bytes_read, raw_bytes;
- int retval;
u32 full_address = 0x0;
- char *buffer = malloc(fileio->size);
u32 cooked_bytes;
int i;
+ char lpszLine[1023];
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
image_section_t section[IMAGE_MAX_SECTIONS];
- if ((retval = fileio_read(fileio, fileio->size, (u8*)buffer, &raw_bytes_read)) != ERROR_OK)
- {
- free(buffer);
- ERROR("failed buffering S19 file, read failed");
- return ERROR_FILEIO_OPERATION_FAILED;
- }
-
- if (raw_bytes_read != fileio->size)
- {
- free(buffer);
- ERROR("failed buffering complete IHEX file, only partially read");
- return ERROR_FILEIO_OPERATION_FAILED;
- }
-
mot->buffer = malloc(fileio->size >> 1);
- raw_bytes = 0x0;
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &mot->buffer[cooked_bytes];
section[image->num_sections].size = 0x0;
section[image->num_sections].flags = 0;
- while (raw_bytes < raw_bytes_read)
+ while (fileio_fgets(fileio, 1023, lpszLine) == ERROR_OK)
{
u32 count;
u32 address;
u32 record_type;
u32 checksum;
u8 cal_checksum = 0;
-
+ u32 bytes_read = 0;
+
/* get record type and record length */
- if (sscanf(&buffer[raw_bytes], "S%1x%2x", &record_type, &count) != 2)
+ if (sscanf(&lpszLine[bytes_read], "S%1x%2x", &record_type, &count) != 2)
{
return ERROR_IMAGE_FORMAT_ERROR;
}
- raw_bytes += 4;
+ bytes_read += 4;
cal_checksum += (u8)count;
/* skip checksum byte */
int iValue;
while (count-- > 0) {
- sscanf(&buffer[raw_bytes], "%2x", &iValue);
+ sscanf(&lpszLine[bytes_read], "%2x", &iValue);
cal_checksum += (u8)iValue;
- raw_bytes += 2;
+ bytes_read += 2;
}
}
else if (record_type >= 1 && record_type <= 3)
{
case 1:
/* S1 - 16 bit address data record */
- sscanf(&buffer[raw_bytes], "%4x", &address);
+ sscanf(&lpszLine[bytes_read], "%4x", &address);
cal_checksum += (u8)(address >> 8);
cal_checksum += (u8)address;
- raw_bytes += 4;
+ bytes_read += 4;
count -=2;
break;
case 2:
/* S2 - 24 bit address data record */
- sscanf(&buffer[raw_bytes], "%6x", &address);
+ sscanf(&lpszLine[bytes_read], "%6x", &address);
cal_checksum += (u8)(address >> 16);
cal_checksum += (u8)(address >> 8);
cal_checksum += (u8)address;
- raw_bytes += 6;
+ bytes_read += 6;
count -=3;
break;
case 3:
/* S3 - 32 bit address data record */
- sscanf(&buffer[raw_bytes], "%8x", &address);
+ 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;
- raw_bytes += 8;
+ bytes_read += 8;
count -=4;
break;
section[image->num_sections].flags = 0;
section[image->num_sections].private = &mot->buffer[cooked_bytes];
}
- section[image->num_sections].base_address =
- full_address | address;
- full_address = full_address | address;
+ section[image->num_sections].base_address = address;
+ full_address = address;
}
while (count-- > 0)
{
- sscanf(&buffer[raw_bytes], "%2hhx", &mot->buffer[cooked_bytes]);
+ sscanf(&lpszLine[bytes_read], "%2x", (u32*)&mot->buffer[cooked_bytes]);
cal_checksum += (u8)mot->buffer[cooked_bytes];
- raw_bytes += 2;
+ bytes_read += 2;
cooked_bytes += 1;
section[image->num_sections].size += 1;
full_address++;
image->sections[i].flags = section[i].flags;
}
- free(buffer);
return ERROR_OK;
}
else
{
- free(buffer);
ERROR("unhandled S19 record type: %i", record_type);
return ERROR_IMAGE_FORMAT_ERROR;
}
/* account for checksum, will always be 0xFF */
- sscanf(&buffer[raw_bytes], "%2x", &checksum);
+ sscanf(&lpszLine[bytes_read], "%2x", &checksum);
cal_checksum += (u8)checksum;
- raw_bytes += 2;
+ bytes_read += 2;
if( cal_checksum != 0xFF )
{
/* checksum failed */
- free(buffer);
ERROR("incorrect record checksum found in S19 file");
return ERROR_IMAGE_CHECKSUM;
}
-
- /* consume new-line character(s) */
- if ((buffer[raw_bytes] == '\n') || (buffer[raw_bytes] == '\r'))
- raw_bytes++;
-
- if ((buffer[raw_bytes] == '\n') || (buffer[raw_bytes] == '\r'))
- raw_bytes++;
}
-
- free(buffer);
+
ERROR("premature end of S19 file, no end-of-file record found");
return ERROR_IMAGE_FORMAT_ERROR;
}
return retval;
}
}
+ else if (image->type == IMAGE_BUILDER)
+ {
+ image->num_sections = 0;
+ image->sections = NULL;
+ image->type_private = NULL;
+ }
return retval;
};
int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *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",
+ offset, size, image->sections[section].size);
+ return ERROR_INVALID_ARGUMENTS;
+ }
+
if (image->type == IMAGE_BINARY)
{
image_binary_t *image_binary = image->type_private;
if (section != 0)
return ERROR_INVALID_ARGUMENTS;
- if ((offset > image->sections[0].size) || (offset + size > image->sections[0].size))
- return ERROR_INVALID_ARGUMENTS;
-
/* seek to offset */
if ((retval = fileio_seek(&image_binary->fileio, offset)) != ERROR_OK)
{
return ERROR_OK;
}
+ else if (image->type == IMAGE_BUILDER)
+ {
+ memcpy(buffer, (u8*)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)
+{
+ image_section_t *section;
+
+ /* only image builder supports adding sections */
+ if (image->type != IMAGE_BUILDER)
+ return ERROR_INVALID_ARGUMENTS;
+
+ /* see if there's a previous section */
+ if (image->num_sections)
+ {
+ section = &image->sections[image->num_sections - 1];
+
+ /* see if it's enough to extend the last section,
+ * adding data to previous sections or merging is not supported */
+ 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);
+ section->size += size;
+ return ERROR_OK;
+ }
+ }
+
+ /* allocate new section */
+ image->num_sections++;
+ image->sections = realloc(image->sections, sizeof(image_section_t) * image->num_sections);
+ section = &image->sections[image->num_sections - 1];
+ section->base_address = base;
+ section->size = size;
+ section->flags = flags;
+ section->private = malloc(sizeof(u8) * size);
+ memcpy((u8*)section->private, data, size);
return ERROR_OK;
}
if (image_mot->buffer)
free(image_mot->buffer);
}
+ else if (image->type == IMAGE_BUILDER)
+ {
+ int i;
+
+ for (i = 0; i < image->num_sections; i++)
+ {
+ free(image->sections[i].private);
+ }
+ }
if (image->type_private)
free(image->type_private);
return ERROR_OK;
}
+
+static u32 crc32_table[256] = {0, 0};
+
+int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
+{
+ u32 crc = 0xffffffff;
+
+ if (!crc32_table[1])
+ {
+ /* 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--)
+ {
+ /* as per gdb */
+ crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
+ }
+
+ *checksum = crc;
+ return ERROR_OK;
+}
+
projects / openocd / blobdiff