X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fimage.c;h=2ce03b829575af39d62cb1046ca6397180b4bb55;hp=2b6d0d11def83ebd35cac5bca16f6ebeaddaf19d;hb=128a73342856217e98a5da64b2805e062fd4e00d;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa diff --git a/src/target/image.c b/src/target/image.c index 2b6d0d11de..2ce03b8295 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -27,36 +27,26 @@ #include "config.h" #endif -#include -#include -#ifdef HAVE_ELF_H -#include -#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)) + 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)) + 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]; + uint32_t read_bytes; + uint8_t buffer[9]; /* read the first 4 bytes of image */ if ((retval = fileio_open(&fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK) @@ -74,7 +64,7 @@ static int autodetect_image_type(image_t *image, char *url) } fileio_close(&fileio); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) return retval; /* check header against known signatures */ @@ -91,7 +81,7 @@ static int autodetect_image_type(image_t *image, char *url) &&(isxdigit(buffer[5])) &&(isxdigit(buffer[6])) &&(buffer[7]=='0') /* record type : 00 -> 05 */ - &&(buffer[8]>='0')&&(buffer[8]<'6')) + &&(buffer[8]>='0') && (buffer[8]<'6')) { LOG_DEBUG("IHEX image detected."); image->type = IMAGE_IHEX; @@ -158,8 +148,8 @@ static int image_ihex_buffer_complete(image_t *image) { image_ihex_t *ihex = image->type_private; fileio_t *fileio = &ihex->fileio; - u32 full_address = 0x0; - u32 cooked_bytes; + uint32_t full_address = 0x0; + uint32_t cooked_bytes; int i; char lpszLine[1023]; @@ -177,23 +167,23 @@ static int image_ihex_buffer_complete(image_t *image) 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(&lpszLine[bytes_read], ":%2x%4x%2x", &count, &address, &record_type) != 3) + uint32_t count; + uint32_t address; + uint32_t record_type; + uint32_t checksum; + uint8_t cal_checksum = 0; + uint32_t bytes_read = 0; + + if (sscanf(&lpszLine[bytes_read], ":%2" SCNx32 "%4" SCNx32 "%2" SCNx32 , &count, &address, &record_type) != 3) { return ERROR_IMAGE_FORMAT_ERROR; } 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 */ { @@ -217,8 +207,10 @@ static int image_ihex_buffer_complete(image_t *image) 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; @@ -244,11 +236,11 @@ static int image_ihex_buffer_complete(image_t *image) } 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) @@ -271,24 +263,24 @@ static int image_ihex_buffer_complete(image_t *image) } else if (record_type == 3) /* Start Segment Address Record */ { - u32 dummy; + uint32_t dummy; /* "Start Segment Address Record" will not be supported */ /* but we must consume it, and do not create an error. */ while (count-- > 0) { - sscanf(&lpszLine[bytes_read], "%2x", &dummy); - cal_checksum += (u8)dummy; + sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &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) @@ -311,28 +303,28 @@ static int image_ihex_buffer_complete(image_t *image) } else if (record_type == 5) /* Start Linear Address Record */ { - u32 start_address; + uint32_t 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; + sscanf(&lpszLine[bytes_read], "%8" SCNx32, &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 { - LOG_ERROR("unhandled IHEX record type: %i", record_type); + LOG_ERROR("unhandled IHEX record type: %i", (int)record_type); return ERROR_IMAGE_FORMAT_ERROR; } - sscanf(&lpszLine[bytes_read], "%2x", &checksum); + sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &checksum); bytes_read += 2; - if ((u8)checksum != (u8)(~cal_checksum + 1)) + if ((uint8_t)checksum != (uint8_t)(~cal_checksum + 1)) { /* checksum failed */ LOG_ERROR("incorrect record checksum found in IHEX file"); @@ -347,19 +339,19 @@ static int image_ihex_buffer_complete(image_t *image) static int image_elf_read_headers(image_t *image) { image_elf_t *elf = image->type_private; - u32 read_bytes; - u32 i,j; + uint32_t read_bytes; + uint32_t i,j; int retval; elf->header = malloc(sizeof(Elf32_Ehdr)); - if(elf->header == NULL) + if (elf->header == NULL) { LOG_ERROR("insufficient memory to perform operation "); return ERROR_FILEIO_OPERATION_FAILED; } - if ((retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (u8*)elf->header, &read_bytes)) != ERROR_OK) + 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; @@ -370,7 +362,7 @@ static int image_elf_read_headers(image_t *image) 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) { LOG_ERROR("invalid ELF file, bad magic number"); return ERROR_IMAGE_FORMAT_ERROR; @@ -382,8 +374,8 @@ static int image_elf_read_headers(image_t *image) } elf->endianness = elf->header->e_ident[EI_DATA]; - if ((elf->endianness!=ELFDATA2LSB) - &&(elf->endianness!=ELFDATA2MSB)) + if ((elf->endianness != ELFDATA2LSB) + &&(elf->endianness != ELFDATA2MSB)) { LOG_ERROR("invalid ELF file, unknown endianess setting"); return ERROR_IMAGE_FORMAT_ERROR; @@ -403,13 +395,13 @@ static int image_elf_read_headers(image_t *image) } elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr)); - if(elf->segments == NULL) + 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) { LOG_ERROR("cannot read ELF segment headers, read failed"); return retval; @@ -445,23 +437,23 @@ static int image_elf_read_headers(image_t *image) return ERROR_OK; } -static 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, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read) { image_elf_t *elf = image->type_private; Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private; - u32 read_size,really_read; + uint32_t read_size,really_read; int retval; *size_read = 0; - LOG_DEBUG("load segment %d at 0x%x (sz=0x%x)",section,offset,size); + LOG_DEBUG("load segment %d at 0x%" PRIx32 " (sz=0x%" PRIx32 ")",section,offset,size); /* read initialized data in current segment if any */ if (offsetp_filesz)) { /* maximal size present in file for the current segment */ read_size = MIN(size, field32(elf,segment->p_filesz)-offset); - LOG_DEBUG("read elf: size = 0x%x at 0x%x",read_size, + LOG_DEBUG("read elf: size = 0x%" PRIx32 " at 0x%" PRIx32 "",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) @@ -490,8 +482,8 @@ static int image_mot_buffer_complete(image_t *image) { image_mot_t *mot = image->type_private; fileio_t *fileio = &mot->fileio; - u32 full_address = 0x0; - u32 cooked_bytes; + uint32_t full_address = 0x0; + uint32_t cooked_bytes; int i; char lpszLine[1023]; @@ -509,21 +501,21 @@ static int image_mot_buffer_complete(image_t *image) 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; + uint32_t count; + uint32_t address; + uint32_t record_type; + uint32_t checksum; + uint8_t cal_checksum = 0; + uint32_t bytes_read = 0; /* get record type and record length */ - if (sscanf(&lpszLine[bytes_read], "S%1x%2x", &record_type, &count) != 2) + if (sscanf(&lpszLine[bytes_read], "S%1" SCNx32 "%2" SCNx32 , &record_type, &count) != 2) { return ERROR_IMAGE_FORMAT_ERROR; } bytes_read += 4; - cal_checksum += (u8)count; + cal_checksum += (uint8_t)count; /* skip checksum byte */ count -=1; @@ -535,40 +527,40 @@ static int image_mot_buffer_complete(image_t *image) while (count-- > 0) { sscanf(&lpszLine[bytes_read], "%2x", &iValue); - cal_checksum += (u8)iValue; + cal_checksum += (uint8_t)iValue; bytes_read += 2; } } else if (record_type >= 1 && record_type <= 3) { - switch( record_type ) + switch ( record_type ) { case 1: /* S1 - 16 bit address data record */ - sscanf(&lpszLine[bytes_read], "%4x", &address); - cal_checksum += (u8)(address >> 8); - cal_checksum += (u8)address; + sscanf(&lpszLine[bytes_read], "%4" SCNx32, &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; + sscanf(&lpszLine[bytes_read], "%6" SCNx32 , &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; + sscanf(&lpszLine[bytes_read], "%8" SCNx32 , &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; @@ -594,8 +586,10 @@ static int image_mot_buffer_complete(image_t *image) 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; @@ -605,12 +599,12 @@ static int image_mot_buffer_complete(image_t *image) else if (record_type == 5) { /* S5 is the data count record, we ignore it */ - u32 dummy; + uint32_t dummy; while (count-- > 0) { - sscanf(&lpszLine[bytes_read], "%2x", &dummy); - cal_checksum += (u8)dummy; + sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &dummy); + cal_checksum += (uint8_t)dummy; bytes_read += 2; } } @@ -633,16 +627,16 @@ static int image_mot_buffer_complete(image_t *image) } else { - LOG_ERROR("unhandled S19 record type: %i", record_type); + LOG_ERROR("unhandled S19 record type: %i", (int)(record_type)); return ERROR_IMAGE_FORMAT_ERROR; } /* account for checksum, will always be 0xFF */ - sscanf(&lpszLine[bytes_read], "%2x", &checksum); - cal_checksum += (u8)checksum; + sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &checksum); + cal_checksum += (uint8_t)checksum; bytes_read += 2; - if( cal_checksum != 0xFF ) + if ( cal_checksum != 0xFF ) { /* checksum failed */ LOG_ERROR("incorrect record checksum found in S19 file"); @@ -717,10 +711,11 @@ int image_open(image_t *image, char *url, char *type_string) } else if (image->type == IMAGE_MEMORY) { - target_t *target = get_target_by_num(strtoul(url, NULL, 0)); - if (target==NULL) + target_t *target = get_target(url); + + if (target == NULL) { - LOG_ERROR("Target '%s' does not exist", url); + LOG_ERROR("target '%s' not defined", url); return ERROR_FAIL; } @@ -769,7 +764,7 @@ int image_open(image_t *image, char *url, char *type_string) int 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 @@ -781,14 +776,14 @@ int image_open(image_t *image, char *url, char *type_string) 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, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read) { int retval; /* don't read past the end of a section */ if (offset + size > image->sections[section].size) { - LOG_DEBUG("read past end of section: 0x%8.8x + 0x%8.8x > 0x%8.8x", + LOG_DEBUG("read past end of section: 0x%8.8" PRIx32 " + 0x%8.8" PRIx32 " > 0x%8.8" PRIx32 "", offset, size, image->sections[section].size); return ERROR_INVALID_ARGUMENTS; } @@ -815,7 +810,7 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu } 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; return ERROR_OK; @@ -827,13 +822,13 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu else if (image->type == IMAGE_MEMORY) { image_memory_t *image_memory = image->type_private; - u32 address = image->sections[section].base_address + offset; + uint32_t address = image->sections[section].base_address + offset; *size_read = 0; while ((size - *size_read) > 0) { - u32 size_in_cache; + uint32_t size_in_cache; if (!image_memory->cache || (address < image_memory->cache_address) @@ -865,14 +860,14 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu } 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; 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; return ERROR_OK; @@ -881,7 +876,7 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu 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, uint32_t base, uint32_t size, int flags, uint8_t *data) { image_section_t *section; @@ -899,7 +894,7 @@ int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data) 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; } @@ -912,8 +907,8 @@ int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data) 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; } @@ -1002,12 +997,12 @@ void image_close(image_t *image) } } -int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum) +int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes, uint32_t* checksum) { - u32 crc = 0xffffffff; + uint32_t crc = 0xffffffff; LOG_DEBUG("Calculating checksum"); - u32 crc32_table[256]; + uint32_t crc32_table[256]; /* Initialize the CRC table and the decoding table. */ int i, j; @@ -1027,7 +1022,7 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum) { run=32768; } - nbytes-=run; + nbytes -= run; while (run--) { /* as per gdb */