diff options
| author | Florian Meister <florian.meister@advantest.com> | 2019-06-05 10:19:52 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-05-01 13:36:15 +0100 |
| commit | 9206bd243b0b594821ca96b37517b2e3de80dc39 (patch) | |
| tree | 9fe319c4c52ac0f15bd6200aecc661ecfae657ff /src/target/image.h | |
| parent | 11d918d9c1f7cb637a525a92521b747d2d4c840f (diff) | |
| download | riscv-openocd-9206bd243b0b594821ca96b37517b2e3de80dc39.zip riscv-openocd-9206bd243b0b594821ca96b37517b2e3de80dc39.tar.gz riscv-openocd-9206bd243b0b594821ca96b37517b2e3de80dc39.tar.bz2 | |
target/image: allow loading of 64-bit ELF files
Change-Id: I9b88edacf5ffcc3c1caeab8c426693de0d92a695
Signed-off-by: Florian Meister <florian.meister@advantest.com>
Signed-off-by: Christian Hoff <christian.hoff@advantest.com>
Reviewed-on: http://openocd.zylin.com/5204
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Ooi, Cinly <cinly.ooi@intel.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/target/image.h')
| -rw-r--r-- | src/target/image.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/target/image.h b/src/target/image.h index 53c27d8..c8d00d1 100644 --- a/src/target/image.h +++ b/src/target/image.h @@ -8,6 +8,9 @@ * Copyright (C) 2008 by Spencer Oliver * * spen@spen-soft.co.uk * * * + * 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 * @@ -80,8 +83,15 @@ struct image_memory { struct image_elf { struct fileio *fileio; - Elf32_Ehdr *header; - Elf32_Phdr *segments; + bool is_64_bit; + union { + Elf32_Ehdr *header32; + Elf64_Ehdr *header64; + }; + union { + Elf32_Phdr *segments32; + Elf64_Phdr *segments64; + }; uint32_t segment_count; uint8_t endianness; }; @@ -92,11 +102,11 @@ struct image_mot { }; int image_open(struct image *image, const char *url, const char *type_string); -int image_read_section(struct image *image, int section, uint32_t offset, +int image_read_section(struct image *image, int section, target_addr_t offset, uint32_t size, uint8_t *buffer, size_t *size_read); void image_close(struct image *image); -int image_add_section(struct image *image, uint32_t base, uint32_t size, +int image_add_section(struct image *image, target_addr_t base, uint32_t size, int flags, uint8_t const *data); int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes, |