retire unused code.

[openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index a1a2a441eda92b6bc83da619950a3ae3bf1b427e..df69f3a80a6397bd70f914a81b0b3d8ef41e855c 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -55,20 +55,14 @@ 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);
@@ -387,6 +381,12 @@ int image_elf_read_headers(image_t *image)
                return ERROR_IMAGE_FORMAT_ERROR;
        }
 
+       if ((retval = fileio_seek(&elf->fileio, field32(elf,elf->header->e_phoff))) != ERROR_OK)
+       {
+               ERROR("cannot seek to ELF program header table, read failed");
+               return retval;
+       }
+
        elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
 
        if ((retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK)
@@ -411,7 +411,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);
@@ -462,15 +462,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;
 }
@@ -660,8 +651,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 +668,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);
+                       ERROR("failed buffering IHEX image, check daemon output for additional information");
                        fileio_close(&image_ihex->fileio);
                        return retval;
                }
@@ -701,16 +686,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 +719,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);
+                       ERROR("failed buffering S19 image, check daemon output for additional information");
                        fileio_close(&image_mot->fileio);
                        return retval;
                }
@@ -762,15 +738,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;
        }
@@ -801,14 +777,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 +790,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 +840,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 +847,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;
        }