- stops multiple calls to examine from allocating the breakpoint arrays

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

diff --git a/src/target/image.c b/src/target/image.c
index 793a811f6724ba901a63aa6618b4663c5c960c2e..a8753ac9c5a1f0fbd5408f14f623a4541e769cd8 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -912,7 +912,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,40 +994,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)
+               {
+                       run=32768;
+               }
+               nbytes-=run;
+               while (run--)
                {
-                       keep_alive();
+                       /* as per gdb */
+                       crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
                }
+               keep_alive();
        }
 
+       LOG_DEBUG("Calculating checksum done");
+
        *checksum = crc;
        return ERROR_OK;
 }