Uwe Hermann <uwe@hermann-uwe.de> oocdlink file

[fw/openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index 793a811f6724ba901a63aa6618b4663c5c960c2e..fb4d8915acdde57d35ab3b0004585b65d021170b 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -83,15 +83,15 @@ static int autodetect_image_type(image_t *image, char *url)
                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'))
        {
                LOG_DEBUG("IHEX image detected.");
                image->type = IMAGE_IHEX;
@@ -381,7 +381,6 @@ int image_elf_read_headers(image_t *image)
                return ERROR_IMAGE_FORMAT_ERROR;
        }
 
-
        elf->endianness = elf->header->e_ident[EI_DATA];
        if ((elf->endianness!=ELFDATA2LSB)
                 &&(elf->endianness!=ELFDATA2MSB))
@@ -718,6 +717,13 @@ 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)
+               {
+                       LOG_ERROR("Target '%s' does not exist", url);
+                       return ERROR_FAIL;
+               }
+
                image_memory_t *image_memory;
 
                image->num_sections = 1;
@@ -728,7 +734,7 @@ int image_open(image_t *image, char *url, char *type_string)
 
                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;
        }
@@ -912,7 +918,7 @@ int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data)
        return ERROR_OK;
 }
 
-int image_close(image_t *image)
+void image_close(image_t *image)
 {
        if (image->type == IMAGE_BINARY)
        {
@@ -994,42 +1000,44 @@ int image_close(image_t *image)
                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)
 {
        u32 crc = 0xffffffff;
+       LOG_DEBUG("Calculating checksum");
+
+       u32 crc32_table[256];
 
-       if (!crc32_table[1])
+       /* 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;
-               }
+               /* 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--)
+       while (nbytes>0)
        {
-               /* as per gdb */
-               crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
-               if ((nbytes%16384)==0)
+               int run=nbytes;
+               if (run>32768)
                {
-                       keep_alive();
+                       run=32768;
                }
+               nbytes-=run;
+               while (run--)
+               {
+                       /* as per gdb */
+                       crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
+               }
+               keep_alive();
        }
 
+       LOG_DEBUG("Calculating checksum done");
+
        *checksum = crc;
        return ERROR_OK;
 }
-
-