zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image_section_t -> struct image_section 

Remove misleading typedef and redundant suffix from struct image_section.
__archive__
Zachary T Welch 2009-11-13 08:42:52 -08:00
parent 99614219ad
commit 24df46d067
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/target/image.c
View File

@ -158,7 +158,7 @@ static int image_ihex_buffer_complete(image_t *image)
/* we can't determine the number of sections that we'll have to create ahead of time, /* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */ * so we locally hold them until parsing is finished */
image_section_t section[IMAGE_MAX_SECTIONS]; struct image_section section[IMAGE_MAX_SECTIONS];
ihex->buffer = malloc(fileio->size >> 1); ihex->buffer = malloc(fileio->size >> 1);
cooked_bytes = 0x0; cooked_bytes = 0x0;
@ -232,7 +232,7 @@ static int image_ihex_buffer_complete(image_t *image)
image->num_sections++; image->num_sections++;
/* copy section information */ /* copy section information */
image->sections = malloc(sizeof(image_section_t) * image->num_sections); image->sections = malloc(sizeof(struct image_section) * image->num_sections);
for (i = 0; i < image->num_sections; i++) for (i = 0; i < image->num_sections; i++)
{ {
image->sections[i].private = section[i].private; image->sections[i].private = section[i].private;
@ -439,7 +439,7 @@ static int image_elf_read_headers(image_t *image)
if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
image->num_sections++; image->num_sections++;
/* alloc and fill sections array with loadable segments */ /* alloc and fill sections array with loadable segments */
image->sections = malloc(image->num_sections * sizeof(image_section_t)); image->sections = malloc(image->num_sections * sizeof(struct image_section));
for (i = 0,j = 0;i < elf->segment_count;i++) for (i = 0,j = 0;i < elf->segment_count;i++)
{ {
if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
@ -510,7 +510,7 @@ static int image_mot_buffer_complete(image_t *image)
/* we can't determine the number of sections that we'll have to create ahead of time, /* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */ * so we locally hold them until parsing is finished */
image_section_t section[IMAGE_MAX_SECTIONS]; struct image_section section[IMAGE_MAX_SECTIONS];
mot->buffer = malloc(fileio->size >> 1); mot->buffer = malloc(fileio->size >> 1);
cooked_bytes = 0x0; cooked_bytes = 0x0;
@ -635,7 +635,7 @@ static int image_mot_buffer_complete(image_t *image)
image->num_sections++; image->num_sections++;
/* copy section information */ /* copy section information */
image->sections = malloc(sizeof(image_section_t) * image->num_sections); image->sections = malloc(sizeof(struct image_section) * image->num_sections);
for (i = 0; i < image->num_sections; i++) for (i = 0; i < image->num_sections; i++)
{ {
image->sections[i].private = section[i].private; image->sections[i].private = section[i].private;
@ -690,7 +690,7 @@ int image_open(image_t *image, const char *url, const char *type_string)
} }
image->num_sections = 1; image->num_sections = 1;
image->sections = malloc(sizeof(image_section_t)); image->sections = malloc(sizeof(struct image_section));
image->sections[0].base_address = 0x0; image->sections[0].base_address = 0x0;
image->sections[0].size = image_binary->fileio.size; image->sections[0].size = image_binary->fileio.size;
image->sections[0].flags = 0; image->sections[0].flags = 0;
@ -743,7 +743,7 @@ int image_open(image_t *image, const char *url, const char *type_string)
image_memory_t *image_memory; image_memory_t *image_memory;
image->num_sections = 1; image->num_sections = 1;
image->sections = malloc(sizeof(image_section_t)); image->sections = malloc(sizeof(struct image_section));
image->sections[0].base_address = 0x0; image->sections[0].base_address = 0x0;
image->sections[0].size = 0xffffffff; image->sections[0].size = 0xffffffff;
image->sections[0].flags = 0; image->sections[0].flags = 0;
@ -899,7 +899,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data) int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data)
{ {
image_section_t *section; struct image_section *section;
/* only image builder supports adding sections */ /* only image builder supports adding sections */
if (image->type != IMAGE_BUILDER) if (image->type != IMAGE_BUILDER)
@ -923,7 +923,7 @@ int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, u
/* allocate new section */ /* allocate new section */
image->num_sections++; image->num_sections++;
image->sections = realloc(image->sections, sizeof(image_section_t) * image->num_sections); image->sections = realloc(image->sections, sizeof(struct image_section) * image->num_sections);
section = &image->sections[image->num_sections - 1]; section = &image->sections[image->num_sections - 1];
section->base_address = base; section->base_address = base;
section->size = size; section->size = size;

6
src/target/image.h
View File

@ -47,20 +47,20 @@ typedef enum image_type
IMAGE_BUILDER, /* when building a new image */ IMAGE_BUILDER, /* when building a new image */
} image_type_t; } image_type_t;
typedef struct image_section_s struct image_section
{ {
uint32_t base_address; uint32_t base_address;
uint32_t size; uint32_t size;
int flags; int flags;
void *private; /* private data */ void *private; /* private data */
} image_section_t; };
typedef struct image_s typedef struct image_s
{ {
image_type_t type; /* image type (plain, ihex, ...) */ image_type_t type; /* image type (plain, ihex, ...) */
void *type_private; /* type private data */ void *type_private; /* type private data */
int num_sections; /* number of sections contained in the image */ int num_sections; /* number of sections contained in the image */
image_section_t *sections; /* array of sections */ struct image_section *sections; /* array of sections */
int base_address_set; /* whether the image has a base address set (for relocation purposes) */ int base_address_set; /* whether the image has a base address set (for relocation purposes) */
int base_address; /* base address, if one is set */ int base_address; /* base address, if one is set */
int start_address_set; /* whether the image has a start address (entry point) associated */ int start_address_set; /* whether the image has a start address (entry point) associated */