Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / target / image.c
diff --git a/src/target/image.c b/src/target/image.c
index eafa73eaae648e4c347e128091702d5ed35d29de..440fe17d18a43847844256b862eeb59ecc79e3e9 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -13,19 +15,6 @@
  *                                                                         *
  *   Copyright (C) 2018 by Advantest                                       *
  *   florian.meister@advantest.com                                         *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -35,6 +24,7 @@
 #include "image.h"
 #include "target.h"
 #include <helper/log.h>
+#include <server/server.h>
 
 /* convert ELF header field to host endianness */
 #define field16(elf, field) \
@@ -61,12 +51,15 @@ static int autodetect_image_type(struct image *image, const char *url)
        if (retval != ERROR_OK)
                return retval;
        retval = fileio_read(fileio, 9, buffer, &read_bytes);
+       fileio_close(fileio);
 
-       if (retval == ERROR_OK) {
-               if (read_bytes != 9)
-                       retval = ERROR_FILEIO_OPERATION_FAILED;
+       /* If the file is smaller than 9 bytes, it can only be bin */
+       if (retval == ERROR_OK && read_bytes != 9) {
+               LOG_DEBUG("Less than 9 bytes in the image file found.");
+               LOG_DEBUG("BIN image detected.");
+               image->type = IMAGE_BINARY;
+               return ERROR_OK;
        }
-       fileio_close(fileio);
 
        if (retval != ERROR_OK)
                return retval;
@@ -93,8 +86,10 @@ static int autodetect_image_type(struct image *image, const char *url)
                && (buffer[1] >= '0') && (buffer[1] < '9')) {
                LOG_DEBUG("S19 image detected.");
                image->type = IMAGE_SRECORD;
-       } else
+       } else {
+               LOG_DEBUG("BIN image detected.");
                image->type = IMAGE_BINARY;
+       }
 
        return ERROR_OK;
 }
@@ -102,20 +97,22 @@ static int autodetect_image_type(struct image *image, const char *url)
 static int identify_image_type(struct image *image, const char *type_string, const char *url)
 {
        if (type_string) {
-               if (!strcmp(type_string, "bin"))
+               if (!strcmp(type_string, "bin")) {
                        image->type = IMAGE_BINARY;
-               else if (!strcmp(type_string, "ihex"))
+               } else if (!strcmp(type_string, "ihex")) {
                        image->type = IMAGE_IHEX;
-               else if (!strcmp(type_string, "elf"))
+               } else if (!strcmp(type_string, "elf")) {
                        image->type = IMAGE_ELF;
-               else if (!strcmp(type_string, "mem"))
+               } else if (!strcmp(type_string, "mem")) {
                        image->type = IMAGE_MEMORY;
-               else if (!strcmp(type_string, "s19"))
+               } else if (!strcmp(type_string, "s19")) {
                        image->type = IMAGE_SRECORD;
-               else if (!strcmp(type_string, "build"))
+               } else if (!strcmp(type_string, "build")) {
                        image->type = IMAGE_BUILDER;
-               else
+               } else {
+                       LOG_ERROR("Unknown image type: %s, use one of: bin, ihex, elf, mem, s19, build", type_string);
                        return ERROR_IMAGE_TYPE_UNKNOWN;
+               }
        } else
                return autodetect_image_type(image, url);
 
@@ -596,7 +593,7 @@ static int image_elf64_read_headers(struct image *image)
                                image->sections[j].base_address = field64(elf,
                                                elf->segments64[i].p_paddr);
                        image->sections[j].private = &elf->segments64[i];
-                       image->sections[j].flags = field32(elf, elf->segments64[i].p_flags);
+                       image->sections[j].flags = field64(elf, elf->segments64[i].p_flags);
                        j++;
                }
        }
@@ -972,12 +969,13 @@ int image_open(struct image *image, const char *url, const char *type_string)
 
                retval = fileio_open(&image_binary->fileio, url, FILEIO_READ, FILEIO_BINARY);
                if (retval != ERROR_OK)
-                       return retval;
+                       goto free_mem_on_error;
+
                size_t filesize;
                retval = fileio_size(image_binary->fileio, &filesize);
                if (retval != ERROR_OK) {
                        fileio_close(image_binary->fileio);
-                       return retval;
+                       goto free_mem_on_error;
                }
 
                image->num_sections = 1;
@@ -992,14 +990,14 @@ int image_open(struct image *image, const char *url, const char *type_string)
 
                retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT);
                if (retval != ERROR_OK)
-                       return retval;
+                       goto free_mem_on_error;
 
                retval = image_ihex_buffer_complete(image);
                if (retval != ERROR_OK) {
                        LOG_ERROR(
                                "failed buffering IHEX image, check server output for additional information");
                        fileio_close(image_ihex->fileio);
-                       return retval;
+                       goto free_mem_on_error;
                }
        } else if (image->type == IMAGE_ELF) {
                struct image_elf *image_elf;
@@ -1008,12 +1006,12 @@ int image_open(struct image *image, const char *url, const char *type_string)
 
                retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY);
                if (retval != ERROR_OK)
-                       return retval;
+                       goto free_mem_on_error;
 
                retval = image_elf_read_headers(image);
                if (retval != ERROR_OK) {
                        fileio_close(image_elf->fileio);
-                       return retval;
+                       goto free_mem_on_error;
                }
        } else if (image->type == IMAGE_MEMORY) {
                struct target *target = get_target(url);
@@ -1043,14 +1041,14 @@ int image_open(struct image *image, const char *url, const char *type_string)
 
                retval = fileio_open(&image_mot->fileio, url, FILEIO_READ, FILEIO_TEXT);
                if (retval != ERROR_OK)
-                       return retval;
+                       goto free_mem_on_error;
 
                retval = image_mot_buffer_complete(image);
                if (retval != ERROR_OK) {
                        LOG_ERROR(
                                "failed buffering S19 image, check server output for additional information");
                        fileio_close(image_mot->fileio);
-                       return retval;
+                       goto free_mem_on_error;
                }
        } else if (image->type == IMAGE_BUILDER) {
                image->num_sections = 0;
@@ -1071,6 +1069,11 @@ int image_open(struct image *image, const char *url, const char *type_string)
        }
 
        return retval;
+
+free_mem_on_error:
+       free(image->type_private);
+       image->type_private = NULL;
+       return retval;
 };
 
 int image_read_section(struct image *image,
@@ -1168,7 +1171,7 @@ int image_read_section(struct image *image,
        return ERROR_OK;
 }
 
-int image_add_section(struct image *image, target_addr_t base, uint32_t size, int flags, uint8_t const *data)
+int image_add_section(struct image *image, target_addr_t base, uint32_t size, uint64_t flags, uint8_t const *data)
 {
        struct imagesection *section;
 
@@ -1293,6 +1296,8 @@ int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes, uint32_t *c
                        crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
                }
                keep_alive();
+               if (openocd_is_shutdown_pending())
+                       return ERROR_SERVER_INTERRUPTED;
        }
 
        LOG_DEBUG("Calculating checksum done; checksum=0x%" PRIx32, crc);
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)