diff options
Diffstat (limited to 'bfd/tekhex.c')
-rw-r--r-- | bfd/tekhex.c | 1023 |
1 files changed, 551 insertions, 472 deletions
diff --git a/bfd/tekhex.c b/bfd/tekhex.c index 5c3d470..9f2a50f 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -1,5 +1,5 @@ /* BFD backend for Extended Tektronix Hex Format objects. - Copyright (C) 1992 Free Software Foundation, Inc. + Copyright (C) 1992, 1993 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>. @@ -32,7 +32,7 @@ DESCRIPTION It seems that the sections are descibed as being really big, the example I have says that the text section is 0..ffffffff. BFD would barf with this, many apps would try to alloc 4GB to - read in the file. + read in the file. Tex Hex may contain many sections, but the data which comes in has no tag saying which section it belongs to, so we create @@ -42,7 +42,7 @@ DESCRIPTION TekHex may come out of order and there is no header, so an initial scan is required to discover the minimum and maximum addresses used to create the vma and size of the sections we - create. + create. We read in the data into pages of CHUNK_MASK+1 size and read them out from that whenever we need to. @@ -73,26 +73,30 @@ serial protocol, so big files are unlikely, so we keep a list of 8k chunks #include "sysdep.h" #include "libbfd.h" -typedef struct { -bfd_vma low; -bfd_vma high; -} addr_range_type; +typedef struct + { + bfd_vma low; + bfd_vma high; + } addr_range_type; -typedef struct tekhex_symbol_struct { +typedef struct tekhex_symbol_struct + { - asymbol symbol; -struct tekhex_symbol_struct *prev; + asymbol symbol; + struct tekhex_symbol_struct *prev; -} tekhex_symbol_type; + } tekhex_symbol_type; static char digs[] = "0123456789ABCDEF"; static char sum_block[256]; + /* Horrible ascii dependent macros for converting between hex and binary */ #define CHARS_IN_SET 256 static char hex_value[CHARS_IN_SET]; + #define NOT_HEX 20 #define NIBBLE(x) hex_value[x] #define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1])) @@ -146,7 +150,7 @@ explanation: %2832F9T_SEGMENT83i$18FFFFFFFC81$1481$214 %0781010 -Turns into +Turns into sac@thepub$ ./objdump -dx -m m68k f f: file format tekhex @@ -157,9 +161,9 @@ start address 0x00000000 SECTION 0 [D00000000] : size 00020000 vma 00000000 align 2**0 ALLOC, LOAD SECTION 1 [D00008000] : size 00002001 vma 00008000 align 2**0 - + SECTION 2 [T_SEGMENT] : size ffffffff vma 00000000 align 2**0 - + SYMBOL TABLE: 00000000 g T_SEGMENT gcc_compiled$ 00000000 g T_SEGMENT hello$c @@ -211,51 +215,54 @@ Disassembly of section D00000000: */ static void -DEFUN_VOID(tekhex_init) +tekhex_init () { unsigned int i; static boolean inited = false; - int val; - if (inited == false) + int val; + + if (inited == false) { - + inited = true; - - for (i = 0; i < CHARS_IN_SET; i++) + + for (i = 0; i < CHARS_IN_SET; i++) { hex_value[i] = NOT_HEX; } - - for (i = 0; i < 10; i++) + + for (i = 0; i < 10; i++) { hex_value[i + '0'] = i; - + } - for (i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { - hex_value[i + 'a'] = i+10; - hex_value[i + 'A'] = i+10; + hex_value[i + 'a'] = i + 10; + hex_value[i + 'A'] = i + 10; } val = 0; - for (i = 0; i < 10; i++) { - sum_block[i + '0'] = val++; - } - for (i = 'A'; i <= 'Z'; i++) { - sum_block[i] = val++; - } + for (i = 0; i < 10; i++) + { + sum_block[i + '0'] = val++; + } + for (i = 'A'; i <= 'Z'; i++) + { + sum_block[i] = val++; + } sum_block['$'] = val++; sum_block['%'] = val++; sum_block['.'] = val++; sum_block['_'] = val++; - for (i = 'a'; i <= 'z'; i++) { - sum_block[i] = val++; - } - } + for (i = 'a'; i <= 'z'; i++) + { + sum_block[i] = val++; + } + } } - /* The maximum number of bytes on a line is FF */ -#define MAXCHUNK 0xff +#define MAXCHUNK 0xff /* The number of bytes we fit onto a line on output */ #define CHUNK 21 @@ -264,62 +271,63 @@ DEFUN_VOID(tekhex_init) struct tekhex_data_list_struct { - unsigned char *data; - bfd_vma where; - bfd_size_type size; - struct tekhex_data_list_struct *next; - -} ; -typedef struct tekhex_data_list_struct tekhex_data_list_type; - + unsigned char *data; + bfd_vma where; + bfd_size_type size; + struct tekhex_data_list_struct *next; +}; +typedef struct tekhex_data_list_struct tekhex_data_list_type; #define CHUNK_MASK 0x1fff -struct data_struct { - char chunk_data[CHUNK_MASK+1]; - char chunk_init[CHUNK_MASK+1]; - bfd_vma vma; - struct data_struct *next; -} ; +struct data_struct + { + char chunk_data[CHUNK_MASK + 1]; + char chunk_init[CHUNK_MASK + 1]; + bfd_vma vma; + struct data_struct *next; + }; typedef struct tekhex_data_struct { - tekhex_data_list_type *head; - unsigned int type; - struct tekhex_symbol_struct *symbols; - struct data_struct *data; + tekhex_data_list_type *head; + unsigned int type; + struct tekhex_symbol_struct *symbols; + struct data_struct *data; } tdata_type; - - #define enda(x) (x->vma + x->size) - -static bfd_vma -DEFUN(getvalue,(srcp), - char **srcp) +static bfd_vma +getvalue (srcp) + char **srcp; { char *src = *srcp; bfd_vma value = 0; unsigned int len = hex_value[*src++]; - if (len == 0) len=16; - while (len --) { - value = value << 4 | hex_value[*src++]; - } + + if (len == 0) + len = 16; + while (len--) + { + value = value << 4 | hex_value[*src++]; + } *srcp = src; return value; } -static unsigned int -DEFUN(getsym,(dstp,srcp), - char *dstp AND - char **srcp) +static unsigned int +getsym (dstp, srcp) + char *dstp; + char **srcp; { char *src = *srcp; unsigned int i; unsigned int len = hex_value[*src++]; - if (len == 0) len=16; + + if (len == 0) + len = 16; for (i = 0; i < len; i++) dstp[i] = src[i]; dstp[i] = 0; @@ -328,136 +336,168 @@ DEFUN(getsym,(dstp,srcp), } struct data_struct * -DEFUN(find_chunk,(abfd, vma), - bfd *abfd AND - bfd_vma vma) +find_chunk (abfd, vma) + bfd *abfd; + bfd_vma vma; { struct data_struct *d = abfd->tdata.tekhex_data->data; + vma &= ~CHUNK_MASK; while (d && (d->vma) != vma) { d = d->next; } - if (!d) { - char *sname = bfd_alloc(abfd, 12); - asection *s; - - /* No chunk for this address, so make one up */ - d =(struct data_struct *) - bfd_alloc(abfd, sizeof(struct data_struct)); - memset(d->chunk_init, 0, CHUNK_MASK+1); - memset(d->chunk_data, 0, CHUNK_MASK+1); - d->next = abfd->tdata.tekhex_data->data ; - d->vma = vma; - abfd->tdata.tekhex_data->data = d; - } + if (!d) + { + char *sname = bfd_alloc (abfd, 12); + asection *s; + + /* No chunk for this address, so make one up */ + d = (struct data_struct *) + bfd_alloc (abfd, sizeof (struct data_struct)); + + if (!sname || !d) + { + bfd_error = no_memory; + return NULL; + } + + memset (d->chunk_init, 0, CHUNK_MASK + 1); + memset (d->chunk_data, 0, CHUNK_MASK + 1); + d->next = abfd->tdata.tekhex_data->data; + d->vma = vma; + abfd->tdata.tekhex_data->data = d; + } return d; } -DEFUN(insert_byte,(abfd, value, addr), - bfd *abfd AND - int value AND - bfd_vma addr) +static void +insert_byte (abfd, value, addr) + bfd *abfd; + int value; + bfd_vma addr; { /* Find the chunk that this byte needs and put it in */ - struct data_struct *d = find_chunk(abfd, addr); - d->chunk_data[addr &CHUNK_MASK] = value; - d->chunk_init[addr &CHUNK_MASK] = 1; + struct data_struct *d = find_chunk (abfd, addr); + d->chunk_data[addr & CHUNK_MASK] = value; + d->chunk_init[addr & CHUNK_MASK] = 1; } -/* The first pass is to find the names of all the sections, and see + +/* The first pass is to find the names of all the sections, and see how big the data is */ static void -DEFUN(first_phase,(abfd, type, src), - bfd *abfd AND - char type AND - char *src) +first_phase (abfd, type, src) + bfd *abfd; + char type; + char *src; { asection *section = &bfd_abs_section; int len; char sym[17]; /* A symbol can only be 16chars long */ + switch (type) { case '6': /* Data record - read it and store it */ { - bfd_vma addr = getvalue(&src); - while (*src) { - insert_byte(abfd, HEX(src), addr); - src+=2; - addr++; - } + bfd_vma addr = getvalue (&src); + + while (*src) + { + insert_byte (abfd, HEX (src), addr); + src += 2; + addr++; + } } - + return; case '3': /* Symbol record, read the segment */ - len = getsym(sym, &src); - section = bfd_get_section_by_name(abfd, sym); - if (section == (asection *)NULL) + len = getsym (sym, &src); + section = bfd_get_section_by_name (abfd, sym); + if (section == (asection *) NULL) { - char *n = bfd_alloc(abfd, len+1); - memcpy(n, sym, len+1); - section = bfd_make_section(abfd, n); + char *n = bfd_alloc (abfd, len + 1); + + if (!n) + { + bfd_error = no_memory; + abort(); /* FIXME */ + } + memcpy (n, sym, len + 1); + section = bfd_make_section (abfd, n); } - while (*src) + while (*src) { - switch (*src) { - asection *s; - case '1': /* section range */ - src++; - section->vma = getvalue(&src); - section->_raw_size = getvalue(&src) - section->vma; - section->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC; - break; - - case '2': - case '3': - case '4': - case '6': - case '7': - case '8': - /* Symbols, add to section */ + switch (*src) { - tekhex_symbol_type *new = - (tekhex_symbol_type *)bfd_alloc(abfd, - sizeof(tekhex_symbol_type)); - char type=(*src); - new->symbol.the_bfd = abfd; + asection *s; + + case '1': /* section range */ src++; - abfd->symcount++; - abfd->flags |= HAS_SYMS; - new->prev = abfd->tdata.tekhex_data->symbols; - abfd->tdata.tekhex_data->symbols = new; - len = getsym(sym, &src); - new->symbol.name = bfd_alloc(abfd,len+1); - memcpy((char *)(new->symbol.name), sym, len+1); - new->symbol.section = section ; - if (type <= '4') - new->symbol.flags = (BSF_GLOBAL|BSF_EXPORT); - else + section->vma = getvalue (&src); + section->_raw_size = getvalue (&src) - section->vma; + section->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC; + break; + + case '2': + case '3': + case '4': + case '6': + case '7': + case '8': + /* Symbols, add to section */ + { + tekhex_symbol_type *new = + (tekhex_symbol_type *) bfd_alloc (abfd, + sizeof (tekhex_symbol_type)); + char type = (*src); + + if (!new) + { + bfd_error = no_memory; + abort(); /* FIXME */ + } + new->symbol.the_bfd = abfd; + src++; + abfd->symcount++; + abfd->flags |= HAS_SYMS; + new->prev = abfd->tdata.tekhex_data->symbols; + abfd->tdata.tekhex_data->symbols = new; + len = getsym (sym, &src); + new->symbol.name = bfd_alloc (abfd, len + 1); + if (!new->symbol.name) + { + bfd_error = no_memory; + abort(); /* FIXME */ + } + memcpy ((char *) (new->symbol.name), sym, len + 1); + new->symbol.section = section; + if (type <= '4') + new->symbol.flags = (BSF_GLOBAL | BSF_EXPORT); + else new->symbol.flags = BSF_LOCAL; - new->symbol.value = getvalue(&src) - section->vma; + new->symbol.value = getvalue (&src) - section->vma; + } } - } - } + } } } - /* Pass over an tekhex, calling one of the above functions on each record. */ static void - DEFUN(pass_over,(abfd, func), - bfd *abfd AND - void (*func) PARAMS ((bfd *, char, char *))) + pass_over (abfd, func) + bfd *abfd; + void (*func) (); { unsigned int chars_on_line; boolean eof = false; /* To the front of the file */ - bfd_seek(abfd, (file_ptr)0, SEEK_SET); + bfd_seek (abfd, (file_ptr) 0, SEEK_SET); while (eof == false) { char buffer[MAXCHUNK]; @@ -466,233 +506,242 @@ static void bfd_vma address = 0; /* Find first '%' */ - eof = (boolean)(bfd_read(src, 1, 1, abfd) != 1); - while (*src!= '%' && !eof) { - eof = (boolean)(bfd_read(src, 1, 1, abfd) != 1); - } - if (eof) break; + eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1); + while (*src != '%' && !eof) + { + eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1); + } + if (eof) + break; src++; - /* Fetch the type and the length and the checksum */ - bfd_read(src, 1, 5, abfd); + bfd_read (src, 1, 5, abfd); type = src[2]; if (!ISHEX (src[0]) || !ISHEX (src[1])) break; - chars_on_line = HEX(src) - 5; /* Already read five char */ + chars_on_line = HEX (src) - 5; /* Already read five char */ - bfd_read(src, 1 , chars_on_line , abfd); + bfd_read (src, 1, chars_on_line, abfd); src[chars_on_line] = 0; /* put a null at the end */ - - - func(abfd, type, src); + func (abfd, type, src); } } - - - unsigned int -DEFUN(tekhex_get_symtab,(abfd, table), - bfd *abfd AND - asymbol **table) +tekhex_get_symtab (abfd, table) + bfd *abfd; + asymbol **table; + { tekhex_symbol_type *p = abfd->tdata.tekhex_data->symbols; - unsigned int c = bfd_get_symcount(abfd) ; - table[c]= 0; - while (p) { - table[--c] = &(p->symbol); - p = p->prev; - } - - return bfd_get_symcount(abfd); + unsigned int c = bfd_get_symcount (abfd); + + table[c] = 0; + while (p) + { + table[--c] = &(p->symbol); + p = p->prev; + } + + return bfd_get_symcount (abfd); } - + unsigned int -DEFUN(tekhex_get_symtab_upper_bound,(abfd), - bfd *abfd) +tekhex_get_symtab_upper_bound (abfd) + bfd *abfd; { - return (abfd->symcount+1) * (sizeof(struct tekhex_asymbol_struct *)); + return (abfd->symcount + 1) * (sizeof (struct tekhex_asymbol_struct *)); } static boolean -DEFUN(tekhex_mkobject, (abfd), - bfd *abfd) +tekhex_mkobject (abfd) + bfd *abfd; { - tdata_type *tdata = (tdata_type *)bfd_alloc(abfd, sizeof(tdata_type)); - abfd->tdata.tekhex_data = tdata; - tdata->type = 1; - tdata->head = (tekhex_data_list_type *)NULL; - tdata->symbols = (struct tekhex_symbol_struct *)NULL; -tdata->data = (struct data_struct *)NULL; - return true; - + tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type)); + + if (!tdata) + { + bfd_error = no_memory; + return false; + } + abfd->tdata.tekhex_data = tdata; + tdata->type = 1; + tdata->head = (tekhex_data_list_type *) NULL; + tdata->symbols = (struct tekhex_symbol_struct *) NULL; + tdata->data = (struct data_struct *) NULL; + return true; } -/* +/* Return true if the file looks like it's in TekHex format. Just look for a percent sign and some hex digits */ - static bfd_target * -DEFUN(tekhex_object_p, (abfd), - bfd *abfd) +tekhex_object_p (abfd) + bfd *abfd; { char b[4]; asection *section; - tekhex_init(); - - bfd_seek(abfd, (file_ptr)0, SEEK_SET); - bfd_read(b, 1, 4, abfd); - if (b[0] != '%' || !ISHEX(b[1]) || !ISHEX(b[2]) || !ISHEX(b[3])) - return (bfd_target*) NULL; + tekhex_init (); + + bfd_seek (abfd, (file_ptr) 0, SEEK_SET); + bfd_read (b, 1, 4, abfd); + + if (b[0] != '%' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3])) + return (bfd_target *) NULL; - tekhex_mkobject(abfd); + tekhex_mkobject (abfd); - pass_over(abfd, first_phase); + pass_over (abfd, first_phase); return abfd->xvec; } - static boolean -DEFUN(move_section_contents,(abfd, section, locationp, offset,count, - get), - - bfd *abfd AND - asection *section AND - PTR locationp AND - file_ptr offset AND - bfd_size_type count AND - boolean get) +move_section_contents (abfd, section, locationp, offset, count, get) + bfd *abfd; + asection *section; + PTR locationp; + file_ptr offset; + bfd_size_type count; + boolean get; { bfd_vma addr; - char *location = (char *)locationp; + char *location = (char *) locationp; bfd_vma prev_number = 1; /* Nothing can have this as a high bit*/ - struct data_struct *d = (struct data_struct *)NULL; - for (addr = section->vma; count != 0; count --, addr++) + struct data_struct *d = (struct data_struct *) NULL; + + for (addr = section->vma; count != 0; count--, addr++) { - bfd_vma chunk_number = addr & ~ CHUNK_MASK; /* Get high bits of address */ + bfd_vma chunk_number = addr & ~CHUNK_MASK; /* Get high bits of address */ bfd_vma low_bits = addr & CHUNK_MASK; - if (chunk_number != prev_number) + + if (chunk_number != prev_number) { /* Different chunk, so move pointer */ - d = find_chunk(abfd, chunk_number); + d = find_chunk (abfd, chunk_number); } - if (get) { - if (d->chunk_init[low_bits]) - { - *location = d->chunk_data[low_bits]; - } - else - { - *location = 0; - } - } - else { - d->chunk_data[low_bits] = *location ; - d->chunk_init[low_bits] = (*location != 0); - } - + if (get) + { + if (d->chunk_init[low_bits]) + { + *location = d->chunk_data[low_bits]; + } + else + { + *location = 0; + } + } + else + { + d->chunk_data[low_bits] = *location; + d->chunk_init[low_bits] = (*location != 0); + } - location ++; + location++; } -} +} static boolean -DEFUN(tekhex_get_section_contents,(abfd, section, locationp, offset, count), - bfd *abfd AND - asection *section AND - PTR locationp AND - file_ptr offset AND - bfd_size_type count) +tekhex_get_section_contents (abfd, section, locationp, offset, count) + bfd *abfd; + asection *section; + PTR locationp; + file_ptr offset; + bfd_size_type count; { if (section->flags & (SEC_LOAD | SEC_ALLOC)) { - move_section_contents(abfd, section, locationp, offset, count, true); + move_section_contents (abfd, section, locationp, offset, count, true); return true; } - else return false; + else + return false; } - - boolean -DEFUN(tekhex_set_arch_mach,(abfd, arch, machine), - bfd *abfd AND - enum bfd_architecture arch AND - unsigned long machine) +tekhex_set_arch_mach (abfd, arch, machine) + bfd *abfd; + enum bfd_architecture arch; + unsigned long machine; { - return bfd_default_set_arch_mach(abfd, arch, machine); + return bfd_default_set_arch_mach (abfd, arch, machine); } - /* we have to save up all the Tekhexords for a splurge before output, */ static boolean -DEFUN(tekhex_set_section_contents,(abfd, section, locationp, offset, bytes_to_do), - bfd *abfd AND - sec_ptr section AND - PTR locationp AND - file_ptr offset AND - bfd_size_type bytes_to_do) +tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do) + bfd *abfd; + sec_ptr section; + PTR locationp; + file_ptr offset; + bfd_size_type bytes_to_do; { - if (abfd->output_has_begun == false) { - /* The first time around, allocate enough sections to hold all the chunks */ - asection *s = abfd->sections; - bfd_vma vma; - for (s = abfd->sections; s ; s = s->next) { - if (s->flags & SEC_LOAD) { - for (vma = s->vma & ~CHUNK_MASK; - vma < s->vma + s->_raw_size; - vma += CHUNK_MASK) - find_chunk(abfd, vma); - } - } + if (abfd->output_has_begun == false) + { + /* The first time around, allocate enough sections to hold all the chunks */ + asection *s = abfd->sections; + bfd_vma vma; + + for (s = abfd->sections; s; s = s->next) + { + if (s->flags & SEC_LOAD) + { + for (vma = s->vma & ~CHUNK_MASK; + vma < s->vma + s->_raw_size; + vma += CHUNK_MASK) + find_chunk (abfd, vma); + } + } - } + } if (section->flags & (SEC_LOAD | SEC_ALLOC)) { - move_section_contents(abfd, section, locationp, offset, bytes_to_do, false); + move_section_contents (abfd, section, locationp, offset, bytes_to_do, false); return true; } - else return false; + else + return false; } - static void -DEFUN(writevalue,(dst, value), - char **dst AND - bfd_vma value) +writevalue (dst, value) + char **dst; + bfd_vma value; { char *p = *dst; - int len ; + int len; int shift; - for (len = 8, shift = 28; shift ; shift-=4, len--) + + for (len = 8, shift = 28; shift; shift -= 4, len--) { - if ((value>>shift) & 0xf) { - *p ++ = len + '0'; - while (len) { - *p ++ = digs[(value>>shift) &0xf]; - shift-=4; - len --; - } - *dst = p; - return; + if ((value >> shift) & 0xf) + { + *p++ = len + '0'; + while (len) + { + *p++ = digs[(value >> shift) & 0xf]; + shift -= 4; + len--; + } + *dst = p; + return; - } + } } *p++ = '1'; *p++ = '0'; @@ -700,66 +749,73 @@ DEFUN(writevalue,(dst, value), } static void -DEFUN(writesym,(dst, sym), - char **dst AND - CONST char *sym) +writesym (dst, sym) + char **dst; + CONST char *sym; { char *p = *dst; - int len = (sym?strlen(sym):0); - if (len >= 16) { - *p++ = '0'; - len = 16; - } + int len = (sym ? strlen (sym) : 0); - else { - if (len == 0) { - *p++ = '1'; - sym = "$"; - len=1; + if (len >= 16) + { + *p++ = '0'; + len = 16; } - else - { - *p++ = digs[len]; - } - } - while (len--) { - *p++ = *sym++; - } + else + { + if (len == 0) + { + *p++ = '1'; + sym = "$"; + len = 1; + } + else + { + *p++ = digs[len]; + } + } + + while (len--) + { + *p++ = *sym++; + } *dst = p; } -static void -DEFUN(out,(abfd, type, start, end), - bfd *abfd AND - char type AND - char *start AND - char *end) +static void +out (abfd, type, start, end) + bfd *abfd; + char type; + char *start; + char *end; { int sum = 0; char *s; char front[6]; + front[0] = '%'; - TOHEX(front+1, end - start + 5); + TOHEX (front + 1, end - start + 5); front[3] = type; - for (s = start; s < end; s++) { - sum += sum_block[*s]; - } - + for (s = start; s < end; s++) + { + sum += sum_block[*s]; + } - sum += sum_block[front[1]];/* length */ + sum += sum_block[front[1]]; /* length */ sum += sum_block[front[2]]; - sum += sum_block[front[3]];/* type */ - TOHEX(front+4, sum); - bfd_write(front, 1, 6,abfd); + sum += sum_block[front[3]]; /* type */ + TOHEX (front + 4, sum); + bfd_write (front, 1, 6, abfd); end[0] = '\n'; - bfd_write(start, 1,end-start+1,abfd); + bfd_write (start, 1, end - start + 1, abfd); } + static boolean -DEFUN(tekhex_write_object_contents,(abfd), - bfd *abfd) +tekhex_write_object_contents (abfd) + bfd *abfd; { int bytes_written; char buffer[100]; @@ -768,159 +824,173 @@ DEFUN(tekhex_write_object_contents,(abfd), tekhex_data_list_type *list; asection *s; struct data_struct *d; + bytes_written = 0; /* And the raw data */ for (d = abfd->tdata.tekhex_data->data; - d != (struct data_struct *)NULL; + d != (struct data_struct *) NULL; d = d->next) { int low; - CONST int span=32; + CONST int span = 32; int addr; + /* Write it in blocks of 32 bytes */ - for (addr = 0; addr < CHUNK_MASK + 1; addr+=span) + for (addr = 0; addr < CHUNK_MASK + 1; addr += span) { int need = 0; + /* Check to see if necessary */ - for (low = 0; !need && low < span; low++) { - if (d->chunk_init[addr + low]) need = 1; - } - if (need){ - char * dst = buffer; - writevalue(&dst, addr + d->vma); - for (low = 0; low <span; low++) { - TOHEX(dst, d->chunk_data[addr + low]); - dst+=2; + for (low = 0; !need && low < span; low++) + { + if (d->chunk_init[addr + low]) + need = 1; + } + if (need) + { + char *dst = buffer; + + writevalue (&dst, addr + d->vma); + for (low = 0; low < span; low++) + { + TOHEX (dst, d->chunk_data[addr + low]); + dst += 2; + } + out (abfd, '6', buffer, dst); } - out(abfd, '6', buffer, dst); - } } } /* write all the section headers for the sections */ - for (s = abfd->sections ; s != (asection *)NULL ; s = s->next) + for (s = abfd->sections; s != (asection *) NULL; s = s->next) { char *dst = buffer; - writesym(&dst, s->name); + + writesym (&dst, s->name); *dst++ = '1'; - writevalue(&dst, s->vma); - writevalue(&dst, s->vma + s->_raw_size); - out(abfd, '3',buffer, dst); + writevalue (&dst, s->vma); + writevalue (&dst, s->vma + s->_raw_size); + out (abfd, '3', buffer, dst); } /* And the symbols */ - for (p = abfd->outsymbols; *p; p++) { - int section_code = bfd_decode_symclass (*p); - if (section_code != '?') { /* do not include debug symbols */ - asymbol *s = *p; - char *dst = buffer; - writesym(&dst, s->section->name); - - switch(section_code) { - case 'A': - *dst++ = '2'; - break; - case 'a': - *dst++ = '6'; - break; - case 'D': - case 'B': - case 'O': - *dst++ = '4'; - break; - case 'd': - case 'b': - case 'o': - *dst++ = '8'; - break; - case 'T': - *dst++ = '3'; - break; - case 't': - *dst++ = '7'; - break; - case 'C': - case 'U': - bfd_error=wrong_format; - return false; - } + for (p = abfd->outsymbols; *p; p++) + { + int section_code = bfd_decode_symclass (*p); + + if (section_code != '?') + { /* do not include debug symbols */ + asymbol *s = *p; + char *dst = buffer; + + writesym (&dst, s->section->name); + + switch (section_code) + { + case 'A': + *dst++ = '2'; + break; + case 'a': + *dst++ = '6'; + break; + case 'D': + case 'B': + case 'O': + *dst++ = '4'; + break; + case 'd': + case 'b': + case 'o': + *dst++ = '8'; + break; + case 'T': + *dst++ = '3'; + break; + case 't': + *dst++ = '7'; + break; + case 'C': + case 'U': + bfd_error = wrong_format; + return false; + } - writesym(&dst, s->name); - writevalue(&dst, s->value + s->section->vma); - out(abfd, '3', buffer, dst); + writesym (&dst, s->name); + writevalue (&dst, s->value + s->section->vma); + out (abfd, '3', buffer, dst); + } } - } - /* And the terminator */ - bfd_write("%7081010\n", 1,9 , abfd); -return true; + bfd_write ("%7081010\n", 1, 9, abfd); + return true; } - -static int -DEFUN(tekhex_sizeof_headers,(abfd, exec), - bfd *abfd AND - boolean exec) +static int + tekhex_sizeof_headers (abfd, exec) + bfd *abfd; + boolean exec; + { -return 0; + return 0; } static asymbol * -DEFUN(tekhex_make_empty_symbol, (abfd), - bfd*abfd) +tekhex_make_empty_symbol (abfd) + bfd *abfd; { - tekhex_symbol_type *new= - (tekhex_symbol_type *)bfd_zalloc (abfd, sizeof (struct tekhex_symbol_struct)); + tekhex_symbol_type *new = + (tekhex_symbol_type *) bfd_zalloc (abfd, sizeof (struct tekhex_symbol_struct)); + + if (!new) + { + bfd_error = no_memory; + return NULL; + } new->symbol.the_bfd = abfd; - new->prev = (struct tekhex_symbol_struct *)NULL; + new->prev = (struct tekhex_symbol_struct *) NULL; return &(new->symbol); } static void -DEFUN(tekhex_print_symbol,(ignore_abfd, filep, symbol, how), - bfd *ignore_abfd AND - PTR filep AND - asymbol *symbol AND - bfd_print_symbol_type how) +tekhex_get_symbol_info (ignore_abfd, symbol, ret) + bfd *ignore_abfd; + asymbol *symbol; + symbol_info *ret; { - FILE *file = (FILE *)filep; - switch (how) { - case bfd_print_symbol_name: - fprintf(file, "%s", symbol->name); - break; - case bfd_print_symbol_more: - break; - case bfd_print_symbol_nm: - { - int section_code = bfd_decode_symclass (symbol); + bfd_symbol_info (symbol, ret); +} - if (section_code == 'U') - fprintf(file, " "); - fprintf_vma(file, symbol->value+symbol->section->vma); - if (section_code == '?') - { - fprintf(file," ?"); - } - else - fprintf(file," %c", section_code); - if (symbol->name) - fprintf(file," %s", symbol->name); - } - break; - case bfd_print_symbol_all: +static void +tekhex_print_symbol (ignore_abfd, filep, symbol, how) + bfd *ignore_abfd; + PTR filep; + asymbol *symbol; + bfd_print_symbol_type how; +{ + FILE *file = (FILE *) filep; + + switch (how) { - CONST char *section_name = symbol->section->name; - bfd_print_symbol_vandf((PTR) file, symbol); + case bfd_print_symbol_name: + fprintf (file, "%s", symbol->name); + break; + case bfd_print_symbol_more: + break; - - fprintf(file, " %-5s %s", - section_name, - symbol->name); - } - } + case bfd_print_symbol_all: + { + CONST char *section_name = symbol->section->name; + + bfd_print_symbol_vandf ((PTR) file, symbol); + + fprintf (file, " %-5s %s", + section_name, + symbol->name); + } + } } #define FOO PROTO @@ -928,12 +998,10 @@ DEFUN(tekhex_print_symbol,(ignore_abfd, filep, symbol, how), #define tekhex_get_reloc_upper_bound (FOO(unsigned int, (*),(bfd*, asection *)))bfd_false #define tekhex_canonicalize_reloc (FOO(unsigned int, (*),(bfd*,asection *, arelent **, asymbol **))) bfd_0 - #define tekhex_openr_next_archived_file (FOO(bfd *, (*), (bfd*,bfd*))) bfd_nullvoidptr #define tekhex_find_nearest_line (FOO(boolean, (*),(bfd*,asection*,asymbol**,bfd_vma, CONST char**, CONST char**, unsigned int *))) bfd_false #define tekhex_generic_stat_arch_elt (FOO(int, (*), (bfd *,struct stat *))) bfd_0 - #define tekhex_core_file_failing_command (char *(*)())(bfd_nullvoidptr) #define tekhex_core_file_failing_signal (int (*)())bfd_0 #define tekhex_core_file_matches_executable_p (FOO(boolean, (*),(bfd*, bfd*)))bfd_false @@ -948,43 +1016,54 @@ DEFUN(tekhex_print_symbol,(ignore_abfd, filep, symbol, how), #define tekhex_bfd_debug_info_accumulate (FOO(void, (*), (bfd *, asection *))) bfd_void #define tekhex_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents #define tekhex_bfd_relax_section bfd_generic_relax_section +#define tekhex_bfd_reloc_type_lookup \ + ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr) +#define tekhex_bfd_make_debug_symbol \ + ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr) +#define tekhex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define tekhex_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define tekhex_bfd_final_link _bfd_generic_final_link + bfd_target tekhex_vec = { - "tekhex", /* name */ - bfd_target_tekhex_flavour, - true, /* target byte order */ - true, /* target headers byte order */ - ( EXEC_P | /* object flags */ - HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED), - (SEC_CODE|SEC_DATA|SEC_ROM|SEC_HAS_CONTENTS - |SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ - 1, /* minimum alignment */ - _do_getb64, _do_putb64, _do_getb32, - _do_putb32, _do_getb16, _do_putb16, /* data */ - _do_getb64, _do_putb64, _do_getb32, - _do_putb32, _do_getb16, _do_putb16, /* hdrs */ + "tekhex", /* name */ + bfd_target_tekhex_flavour, + true, /* target byte order */ + true, /* target headers byte order */ + (EXEC_P | /* object flags */ + HAS_SYMS | HAS_LINENO | HAS_DEBUG | HAS_RELOC | HAS_LOCALS | + WP_TEXT | D_PAGED), + (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS + | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + 0, /* leading underscore */ + ' ', /* ar_pad_char */ + 16, /* ar_max_namelen */ + 1, /* minimum alignment */ + bfd_getb64, bfd_getb_signed_64, bfd_putb64, + bfd_getb32, bfd_getb_signed_32, bfd_putb32, + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */ + bfd_getb64, bfd_getb_signed_64, bfd_putb64, + bfd_getb32, bfd_getb_signed_32, bfd_putb32, + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ { - _bfd_dummy_target, - tekhex_object_p, /* bfd_check_format */ - (struct bfd_target *(*)()) bfd_nullvoidptr, - (struct bfd_target *(*)()) bfd_nullvoidptr, + _bfd_dummy_target, + tekhex_object_p, /* bfd_check_format */ + (struct bfd_target * (*)()) bfd_nullvoidptr, + (struct bfd_target * (*)()) bfd_nullvoidptr, }, { - bfd_false, - tekhex_mkobject, - _bfd_generic_mkarchive, - bfd_false, + bfd_false, + tekhex_mkobject, + _bfd_generic_mkarchive, + bfd_false, }, { /* bfd_write_contents */ - bfd_false, - tekhex_write_object_contents, - _bfd_write_archive_contents, - bfd_false, + bfd_false, + tekhex_write_object_contents, + _bfd_write_archive_contents, + bfd_false, }, - JUMP_TABLE(tekhex) - }; - + JUMP_TABLE (tekhex), + (PTR) 0 +}; |