X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fimage.c;h=16f328671e8697293d77f1efa80f3e28b15781d6;hb=6af107855dd590a054b7bd610dadf3f7210c352c;hp=a1a2a441eda92b6bc83da619950a3ae3bf1b427e;hpb=62e65b9fdeab8802d6940f65022b9221751e4c68;p=fw%2Fopenocd

diff --git a/src/target/image.c b/src/target/image.c
index a1a2a441e..16f328671 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -55,28 +55,26 @@ 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)
+	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 */
@@ -89,7 +87,7 @@ static int autodetect_image_type(image_t *image, char *url)
 	        &&(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 */
@@ -98,7 +96,7 @@ static int autodetect_image_type(image_t *image, char *url)
 		&&(isxdigit(buffer[3]))
 		&&(buffer[1] >= '0') && (buffer[1] < '9'))
 	{
-		DEBUG("S19 image detected.");
+		LOG_DEBUG("S19 image detected.");
 		image->type = IMAGE_SRECORD;
 	}
 	else
@@ -321,7 +319,7 @@ int image_ihex_buffer_complete(image_t *image)
 		}
 		else
 		{
-			ERROR("unhandled IHEX record type: %i", record_type);
+			LOG_ERROR("unhandled IHEX record type: %i", record_type);
 			return ERROR_IMAGE_FORMAT_ERROR;
 		}
 		
@@ -331,12 +329,12 @@ int image_ihex_buffer_complete(image_t *image)
 		if ((u8)checksum != (u8)(~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;
 }
 
@@ -349,25 +347,31 @@ int image_elf_read_headers(image_t *image)
 
 	elf->header = malloc(sizeof(Elf32_Ehdr));
 
+	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)
 	{
-		ERROR("cannot read ELF file header, read failed");
+		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)
 	{
-		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)
 	{
-		ERROR("invalid ELF file, only 32bits files are supported");
+		LOG_ERROR("invalid ELF file, only 32bits files are supported");
 		return ERROR_IMAGE_FORMAT_ERROR;
 	}
 
@@ -376,27 +380,38 @@ int image_elf_read_headers(image_t *image)
 	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)
 	{
-		ERROR("invalid ELF file, no program headers");
+		LOG_ERROR("invalid ELF file, no program headers");
 		return ERROR_IMAGE_FORMAT_ERROR;
 	}
 
+	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)
 	{
-		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))
 	{
-		ERROR("cannot read ELF segment headers, only partially read");
+		LOG_ERROR("cannot read ELF segment headers, only partially read");
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 
@@ -411,7 +426,7 @@ int image_elf_read_headers(image_t *image)
 	{
 		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);
@@ -434,24 +449,24 @@ int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8
 
 	*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))
 	{
 		/* 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,
+		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)
 		{
-			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;
@@ -462,15 +477,6 @@ int image_elf_read_section(image_t *image, int section, u32 offset, u32 size, u8
 		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;
 }
@@ -622,7 +628,7 @@ int image_mot_buffer_complete(image_t *image)
 		}
 		else
 		{
-			ERROR("unhandled S19 record type: %i", record_type);
+			LOG_ERROR("unhandled S19 record type: %i", record_type);
 			return ERROR_IMAGE_FORMAT_ERROR;
 		}
 		
@@ -634,12 +640,12 @@ int image_mot_buffer_complete(image_t *image)
 		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;
 }
 
@@ -660,8 +666,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)
 		{
-			strncpy(image->error_str, image_binary->fileio.error_str, IMAGE_MAX_ERROR_STRING); 
-			ERROR(image->error_str);
 			return retval;
 		}
 		
@@ -679,16 +683,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)
 		{
-			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;
 		}
@@ -701,16 +701,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)
 		{
-			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;
 		}
@@ -739,16 +734,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)
 		{
-			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;
 		}
@@ -762,15 +753,15 @@ int image_open(image_t *image, char *url, char *type_string)
 
 	if (image->base_address_set)
 	{
-		// relocate
+		/* relocate */
 		int section;
 		for (section=0; section < image->num_sections; section++)
 		{
 			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.
+		/* 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;
 	}
@@ -785,7 +776,7 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 	/* 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;
 	}
@@ -801,14 +792,12 @@ int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *bu
 		/* 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;
 		}
 	}
@@ -816,7 +805,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);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}
@@ -867,7 +855,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);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}
@@ -875,7 +862,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);
 		*size_read = size;
-		image->error_str[0] = '\0';
 		
 		return ERROR_OK;
 	}