* 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 *
#define OPENOCD_TARGET_IMAGE_H
#include <helper/fileio.h>
+#include <helper/replacements.h>
#ifdef HAVE_ELF_H
#include <elf.h>
struct image {
enum image_type type; /* image type (plain, ihex, ...) */
void *type_private; /* type private data */
- int num_sections; /* number of sections contained in the image */
+ unsigned int num_sections; /* number of sections contained in the image */
struct imagesection *sections; /* array of sections */
- int base_address_set; /* whether the image has a base address set (for relocation purposes) */
+ bool base_address_set; /* whether the image has a base address set (for relocation purposes) */
long long base_address; /* base address, if one is set */
- int start_address_set; /* whether the image has a start address (entry point) associated */
+ bool start_address_set; /* whether the image has a start address (entry point) associated */
uint32_t start_address; /* start address, if one is set */
};
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;
};
};
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(uint8_t *buffer, uint32_t nbytes,
+int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes,
uint32_t *checksum);
#define ERROR_IMAGE_FORMAT_ERROR (-1400)