Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* aoutx.h (translate_from_native_sym_flags): Removed statep

Browse Source 
argument.  Just let an indirect symbol point to the next symbol
	without forcing the next symbol to be undefined.  Changed all
	callers.
	* hp300hpux.c (slurp_symbol_table): Changed call to
	translate_from_native_sym_flags.
	* targets.c: Added hp300hpux_vec.
	* Makefile.in (hp300hpux.o): Added dependencies.
This commit is contained in:
Ian Lance Taylor
1993-07-07 18:05:06 +00:00
parent fde326fbc9
commit ebd2413529
5 changed files with 223 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bfd/ChangeLog
View File

@@ -1,3 +1,14 @@
Wed Jul 7 10:56:21 1993 Ian Lance Taylor (ian@cygnus.com)
* aoutx.h (translate_from_native_sym_flags): Removed statep
argument. Just let an indirect symbol point to the next symbol
without forcing the next symbol to be undefined. Changed all
callers.
* hp300hpux.c (slurp_symbol_table): Changed call to
translate_from_native_sym_flags.
* targets.c: Added hp300hpux_vec.
* Makefile.in (hp300hpux.o): Added dependencies.
Tue Jul 6 13:24:55 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) Tue Jul 6 13:24:55 1993 Ken Raeburn (raeburn@cambridge.cygnus.com)
* reloc.c (enum bfd_reloc_code_real): Put simple power-of-two * reloc.c (enum bfd_reloc_code_real): Put simple power-of-two

4
bfd/Makefile.in
View File

@@ -378,6 +378,10 @@ aout32.o : aout32.c aoutx.h $(BFD_H) $(INCDIR)/ansidecl.h \
sunos.o : sunos.c aoutf1.h $(BFD_H) $(INCDIR)/obstack.h \ sunos.o : sunos.c aoutf1.h $(BFD_H) $(INCDIR)/obstack.h \
libaout.h libbfd.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ libaout.h libbfd.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
$(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
hp300hpux.o : hp300hpux.c aoutx.h $(BFD_H) $(INCDIR)/ansidecl.h \
$(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout/aout64.h \
$(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
$(INCDIR)/aout/hp300hpux.h aout-target.h
demo64.o : demo64.c demo64.o : demo64.c
srec.o : srec.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h srec.o : srec.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h

401
bfd/aoutx.h
View File

@@ -361,6 +361,14 @@ DEFUN(NAME(aout,some_aout_object_p),(abfd, execp, callback_to_real_object_p),
oldrawptr = abfd->tdata.aout_data; oldrawptr = abfd->tdata.aout_data;
abfd->tdata.aout_data = rawptr; abfd->tdata.aout_data = rawptr;
/* Copy the contents of the old tdata struct.
In particular, we want the subformat, since for hpux it was set in
hp300hpux.c:swap_exec_header_in and will be used in
hp300hpux.c:callback. */
if (oldrawptr != NULL)
*abfd->tdata.aout_data = *oldrawptr;
abfd->tdata.aout_data->a.hdr = &rawptr->e; abfd->tdata.aout_data->a.hdr = &rawptr->e;
*(abfd->tdata.aout_data->a.hdr) = *execp; /* Copy in the internal_exec struct */ *(abfd->tdata.aout_data->a.hdr) = *execp; /* Copy in the internal_exec struct */
execp = abfd->tdata.aout_data->a.hdr; execp = abfd->tdata.aout_data->a.hdr;
@@ -943,22 +951,11 @@ boolean
bfd_size_type text_size; bfd_size_type text_size;
if (abfd->output_has_begun == false) if (abfd->output_has_begun == false)
{ /* set by bfd.c handler */ {
switch (abfd->direction) if (NAME(aout,adjust_sizes_and_vmas) (abfd,
{ &text_size,
case read_direction: &text_end) == false)
case no_direction: return false;
bfd_error = invalid_operation;
return false;
case write_direction:
if (NAME(aout,adjust_sizes_and_vmas) (abfd,
&text_size,
&text_end) == false)
return false;
case both_direction:
break;
}
} }
/* regardless, once we know what we're doing, we might as well get going */ /* regardless, once we know what we're doing, we might as well get going */
@@ -1017,217 +1014,205 @@ boolean
stabilised these should be inlined into their (single) caller */ stabilised these should be inlined into their (single) caller */
static void static void
DEFUN (translate_from_native_sym_flags, (sym_pointer, cache_ptr, abfd, statep), DEFUN (translate_from_native_sym_flags, (sym_pointer, cache_ptr, abfd),
struct external_nlist *sym_pointer AND struct external_nlist *sym_pointer AND
aout_symbol_type * cache_ptr AND aout_symbol_type * cache_ptr AND
bfd * abfd AND bfd * abfd)
int *statep)
{ {
cache_ptr->symbol.section = 0; cache_ptr->symbol.section = 0;
if (*statep) switch (cache_ptr->type & N_TYPE)
{ {
/* This is an indirect symbol */ case N_SETA:
cache_ptr->symbol.flags = BSF_DEBUGGING; case N_SETT:
cache_ptr->symbol.section = &bfd_und_section; case N_SETD:
*statep = 0; case N_SETB:
} {
else char *copy = bfd_alloc (abfd, strlen (cache_ptr->symbol.name) + 1);
{ asection *section;
switch (cache_ptr->type & N_TYPE) asection *into_section;
{
case N_SETA: arelent_chain *reloc = (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain));
case N_SETT: strcpy (copy, cache_ptr->symbol.name);
case N_SETD:
case N_SETB: /* Make sure that this bfd has a section with the right contructor
name */
section = bfd_get_section_by_name (abfd, copy);
if (!section)
section = bfd_make_section (abfd, copy);
/* Build a relocation entry for the constructor */
switch ((cache_ptr->type & N_TYPE))
{ {
char *copy = bfd_alloc (abfd, strlen (cache_ptr->symbol.name) + 1); case N_SETA:
asection *section; into_section = &bfd_abs_section;
asection *into_section; cache_ptr->type = N_ABS;
break;
arelent_chain *reloc = (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain)); case N_SETT:
strcpy (copy, cache_ptr->symbol.name); into_section = (asection *) obj_textsec (abfd);
cache_ptr->type = N_TEXT;
/* Make sure that this bfd has a section with the right contructor break;
name */ case N_SETD:
section = bfd_get_section_by_name (abfd, copy); into_section = (asection *) obj_datasec (abfd);
if (!section) cache_ptr->type = N_DATA;
section = bfd_make_section (abfd, copy); break;
case N_SETB:
/* Build a relocation entry for the constructor */ into_section = (asection *) obj_bsssec (abfd);
switch ((cache_ptr->type & N_TYPE)) cache_ptr->type = N_BSS;
{ break;
case N_SETA: default:
into_section = &bfd_abs_section; abort ();
cache_ptr->type = N_ABS;
break;
case N_SETT:
into_section = (asection *) obj_textsec (abfd);
cache_ptr->type = N_TEXT;
break;
case N_SETD:
into_section = (asection *) obj_datasec (abfd);
cache_ptr->type = N_DATA;
break;
case N_SETB:
into_section = (asection *) obj_bsssec (abfd);
cache_ptr->type = N_BSS;
break;
default:
abort ();
}
/* Build a relocation pointing into the constuctor section
pointing at the symbol in the set vector specified */
reloc->relent.addend = cache_ptr->symbol.value;
cache_ptr->symbol.section = into_section->symbol->section;
reloc->relent.sym_ptr_ptr = into_section->symbol_ptr_ptr;
/* We modify the symbol to belong to a section depending upon the
name of the symbol - probably __CTOR__ or __DTOR__ but we don't
really care, and add to the size of the section to contain a
pointer to the symbol. Build a reloc entry to relocate to this
symbol attached to this section. */
section->flags = SEC_CONSTRUCTOR;
section->reloc_count++;
section->alignment_power = 2;
reloc->next = section->constructor_chain;
section->constructor_chain = reloc;
reloc->relent.address = section->_raw_size;
section->_raw_size += sizeof (int *);
reloc->relent.howto
= (obj_reloc_entry_size(abfd) == RELOC_EXT_SIZE
? howto_table_ext : howto_table_std)
+ CTOR_TABLE_RELOC_IDX;
cache_ptr->symbol.flags |= BSF_CONSTRUCTOR;
} }
/* Build a relocation pointing into the constuctor section
pointing at the symbol in the set vector specified */
reloc->relent.addend = cache_ptr->symbol.value;
cache_ptr->symbol.section = into_section->symbol->section;
reloc->relent.sym_ptr_ptr = into_section->symbol_ptr_ptr;
/* We modify the symbol to belong to a section depending upon the
name of the symbol - probably __CTOR__ or __DTOR__ but we don't
really care, and add to the size of the section to contain a
pointer to the symbol. Build a reloc entry to relocate to this
symbol attached to this section. */
section->flags = SEC_CONSTRUCTOR;
section->reloc_count++;
section->alignment_power = 2;
reloc->next = section->constructor_chain;
section->constructor_chain = reloc;
reloc->relent.address = section->_raw_size;
section->_raw_size += sizeof (int *);
reloc->relent.howto
= (obj_reloc_entry_size(abfd) == RELOC_EXT_SIZE
? howto_table_ext : howto_table_std)
+ CTOR_TABLE_RELOC_IDX;
cache_ptr->symbol.flags |= BSF_CONSTRUCTOR;
}
break;
default:
if (cache_ptr->type == N_WARNING)
{
/* This symbol is the text of a warning message, the next symbol
is the symbol to associate the warning with */
cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING;
/* @@ Stuffing pointers into integers is a no-no.
We can usually get away with it if the integer is
large enough though. */
if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
abort ();
cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
/* We furgle with the next symbol in place.
We don't want it to be undefined, we'll trample the type */
(sym_pointer + 1)->e_type[0] = 0xff;
break; break;
default: }
if (cache_ptr->type == N_WARNING) if ((cache_ptr->type | N_EXT) == (N_INDR | N_EXT))
{
/* Two symbols in a row for an INDR message. The first symbol
contains the name we will match, the second symbol contains
the name the first name is translated into. It is supplied to
us undefined. This is good, since we want to pull in any files
which define it */
cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT;
/* @@ Stuffing pointers into integers is a no-no.
We can usually get away with it if the integer is
large enough though. */
if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
abort ();
cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
cache_ptr->symbol.section = &bfd_ind_section;
}
else if (sym_is_debugger_info (cache_ptr))
{
cache_ptr->symbol.flags = BSF_DEBUGGING;
/* Work out the section correct for this symbol */
switch (cache_ptr->type & N_TYPE)
{ {
/* This symbol is the text of a warning message, the next symbol case N_TEXT:
is the symbol to associate the warning with */ case N_FN:
cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING; cache_ptr->symbol.section = obj_textsec (abfd);
cache_ptr->symbol.value -= obj_textsec (abfd)->vma;
break;
case N_DATA:
cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
cache_ptr->symbol.section = obj_datasec (abfd);
break;
case N_BSS:
cache_ptr->symbol.section = obj_bsssec (abfd);
cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
break;
default:
case N_ABS:
/* @@ Stuffing pointers into integers is a no-no. cache_ptr->symbol.section = &bfd_abs_section;
We can usually get away with it if the integer is
large enough though. */
if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
abort ();
cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
/* We furgle with the next symbol in place.
We don't want it to be undefined, we'll trample the type */
(sym_pointer + 1)->e_type[0] = 0xff;
break; break;
} }
if ((cache_ptr->type | N_EXT) == (N_INDR | N_EXT)) }
else
{
if (sym_is_fortrancommon (cache_ptr))
{ {
/* Two symbols in a row for an INDR message. The first symbol cache_ptr->symbol.flags = 0;
contains the name we will match, the second symbol contains cache_ptr->symbol.section = &bfd_com_section;
the name the first name is translated into. It is supplied to
us undefined. This is good, since we want to pull in any files
which define it */
cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT;
/* @@ Stuffing pointers into integers is a no-no.
We can usually get away with it if the integer is
large enough though. */
if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
abort ();
cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
cache_ptr->symbol.section = &bfd_ind_section;
*statep = 1;
}
else if (sym_is_debugger_info (cache_ptr))
{
cache_ptr->symbol.flags = BSF_DEBUGGING;
/* Work out the section correct for this symbol */
switch (cache_ptr->type & N_TYPE)
{
case N_TEXT:
case N_FN:
cache_ptr->symbol.section = obj_textsec (abfd);
cache_ptr->symbol.value -= obj_textsec (abfd)->vma;
break;
case N_DATA:
cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
cache_ptr->symbol.section = obj_datasec (abfd);
break;
case N_BSS:
cache_ptr->symbol.section = obj_bsssec (abfd);
cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
break;
default:
case N_ABS:
cache_ptr->symbol.section = &bfd_abs_section;
break;
}
} }
else else
{ {
if (sym_is_fortrancommon (cache_ptr))
{
cache_ptr->symbol.flags = 0;
cache_ptr->symbol.section = &bfd_com_section;
}
else
{
}
} /* In a.out, the value of a symbol is always relative to the
* start of the file, if this is a data symbol we'll subtract
* the size of the text section to get the section relative
* value. If this is a bss symbol (which would be strange)
* we'll subtract the size of the previous two sections
* to find the section relative address.
*/
/* In a.out, the value of a symbol is always relative to the if (sym_in_text_section (cache_ptr))
* start of the file, if this is a data symbol we'll subtract {
* the size of the text section to get the section relative cache_ptr->symbol.value -= obj_textsec (abfd)->vma;
* value. If this is a bss symbol (which would be strange) cache_ptr->symbol.section = obj_textsec (abfd);
* we'll subtract the size of the previous two sections }
* to find the section relative address. else if (sym_in_data_section (cache_ptr))
*/ {
cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
cache_ptr->symbol.section = obj_datasec (abfd);
}
else if (sym_in_bss_section (cache_ptr))
{
cache_ptr->symbol.section = obj_bsssec (abfd);
cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
}
else if (sym_is_undefined (cache_ptr))
{
cache_ptr->symbol.flags = 0;
cache_ptr->symbol.section = &bfd_und_section;
}
else if (sym_is_absolute (cache_ptr))
{
cache_ptr->symbol.section = &bfd_abs_section;
}
if (sym_in_text_section (cache_ptr)) if (sym_is_global_defn (cache_ptr))
{ {
cache_ptr->symbol.value -= obj_textsec (abfd)->vma; cache_ptr->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
cache_ptr->symbol.section = obj_textsec (abfd); }
} else
else if (sym_in_data_section (cache_ptr)) {
{ cache_ptr->symbol.flags = BSF_LOCAL;
cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
cache_ptr->symbol.section = obj_datasec (abfd);
}
else if (sym_in_bss_section (cache_ptr))
{
cache_ptr->symbol.section = obj_bsssec (abfd);
cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
}
else if (sym_is_undefined (cache_ptr))
{
cache_ptr->symbol.flags = 0;
cache_ptr->symbol.section = &bfd_und_section;
}
else if (sym_is_absolute (cache_ptr))
{
cache_ptr->symbol.section = &bfd_abs_section;
}
if (sym_is_global_defn (cache_ptr))
{
cache_ptr->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
}
else
{
cache_ptr->symbol.flags = BSF_LOCAL;
}
} }
} }
} }
@@ -1392,7 +1377,6 @@ DEFUN(NAME(aout,slurp_symbol_table),(abfd),
/* OK, now walk the new symtable, cacheing symbol properties */ /* OK, now walk the new symtable, cacheing symbol properties */
{ {
register struct external_nlist *sym_pointer; register struct external_nlist *sym_pointer;
int state = 0;
register struct external_nlist *sym_end = syms + bfd_get_symcount (abfd); register struct external_nlist *sym_end = syms + bfd_get_symcount (abfd);
register aout_symbol_type *cache_ptr = cached; register aout_symbol_type *cache_ptr = cached;
@@ -1414,8 +1398,7 @@ DEFUN(NAME(aout,slurp_symbol_table),(abfd),
cache_ptr->other = bfd_h_get_8(abfd, sym_pointer->e_other); cache_ptr->other = bfd_h_get_8(abfd, sym_pointer->e_other);
cache_ptr->type = bfd_h_get_8(abfd, sym_pointer->e_type); cache_ptr->type = bfd_h_get_8(abfd, sym_pointer->e_type);
cache_ptr->symbol.udata = 0; cache_ptr->symbol.udata = 0;
translate_from_native_sym_flags (sym_pointer, cache_ptr, translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd);
abfd, &state);
} }
} }

10
bfd/hp300hpux.c
View File

@@ -451,7 +451,6 @@ DEFUN(MY(slurp_symbol_table),(abfd),
aout_symbol_type *cached; aout_symbol_type *cached;
unsigned num_syms = 0; unsigned num_syms = 0;
unsigned num_secondary = 0; unsigned num_secondary = 0;
int xxx = 0; /* for translate_from_native_sym_flags */
/* If there's no work to be done, don't do any */ /* If there's no work to be done, don't do any */
if (obj_aout_symbols (abfd) != (aout_symbol_type *)NULL) return true; if (obj_aout_symbols (abfd) != (aout_symbol_type *)NULL) return true;
@@ -516,8 +515,7 @@ DEFUN(MY(slurp_symbol_table),(abfd),
cache_save = *cache_ptr; cache_save = *cache_ptr;
convert_sym_type(sym_pointer, cache_ptr, abfd); convert_sym_type(sym_pointer, cache_ptr, abfd);
translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd, translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd);
&xxx);
/********************************************************/ /********************************************************/
/* for hpux, the 'lenght' value indicates the length of */ /* for hpux, the 'lenght' value indicates the length of */
@@ -562,8 +560,8 @@ DEFUN(MY(slurp_symbol_table),(abfd),
strings += length+10; strings += length+10;
cache_ptr2->type &= ~HP_SECONDARY_SYMBOL; /* clear secondary */ cache_ptr2->type &= ~HP_SECONDARY_SYMBOL; /* clear secondary */
convert_sym_type(sym_pointer, cache_ptr2, abfd); convert_sym_type(sym_pointer, cache_ptr2, abfd);
translate_from_native_sym_flags (sym_pointer, cache_ptr2, abfd, translate_from_native_sym_flags (sym_pointer, cache_ptr2,
&xxx); abfd);
} }
/* skip over the embedded symbol. */ /* skip over the embedded symbol. */
@@ -590,7 +588,6 @@ DEFUN(MY(swap_std_reloc_in), (abfd, bytes, cache_ptr, symbols),
int r_extern = 0; int r_extern = 0;
unsigned int r_length; unsigned int r_length;
int r_pcrel = 0; int r_pcrel = 0;
int r_baserel = 0, r_jmptable = 0, r_relative = 0;
struct aoutdata *su = &(abfd->tdata.aout_data->a); struct aoutdata *su = &(abfd->tdata.aout_data->a);
cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address); cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
@@ -638,6 +635,7 @@ DEFUN(MY(swap_std_reloc_in), (abfd, bytes, cache_ptr, symbols),
break; break;
default: default:
printf("illegal relocation length: %x\n",bytes->r_length[0] ); printf("illegal relocation length: %x\n",bytes->r_length[0] );
r_length = 0;
} }
cache_ptr->howto = howto_table_std + r_length + 4 * r_pcrel; cache_ptr->howto = howto_table_std + r_length + 4 * r_pcrel;

12
bfd/targets.c
View File

@@ -364,6 +364,10 @@ extern bfd_target bfd_elf32_i860_vec;
extern bfd_target bfd_elf32_m88k_vec; extern bfd_target bfd_elf32_m88k_vec;
extern bfd_target bfd_elf32_bigmips_vec; extern bfd_target bfd_elf32_bigmips_vec;
extern bfd_target bfd_elf32_littlemips_vec; extern bfd_target bfd_elf32_littlemips_vec;
extern bfd_target bfd_elf32_big_generic_vec;
extern bfd_target bfd_elf32_little_generic_vec;
extern bfd_target bfd_elf64_big_generic_vec;
extern bfd_target bfd_elf64_little_generic_vec;
extern bfd_target ieee_vec; extern bfd_target ieee_vec;
extern bfd_target oasys_vec; extern bfd_target oasys_vec;
extern bfd_target m88kbcs_vec; extern bfd_target m88kbcs_vec;
@@ -381,6 +385,7 @@ extern bfd_target h8500coff_vec;
extern bfd_target z8kcoff_vec; extern bfd_target z8kcoff_vec;
extern bfd_target we32kcoff_vec; extern bfd_target we32kcoff_vec;
extern bfd_target shcoff_vec; extern bfd_target shcoff_vec;
extern bfd_target hp300hpux_vec;
#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) #if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD)
extern bfd_target hppa_vec; extern bfd_target hppa_vec;
@@ -437,6 +442,12 @@ bfd_target *target_vector[] = {
&bfd_elf32_m88k_vec, &bfd_elf32_m88k_vec,
&bfd_elf32_littlemips_vec, &bfd_elf32_littlemips_vec,
&bfd_elf32_bigmips_vec, &bfd_elf32_bigmips_vec,
&bfd_elf32_little_generic_vec,
&bfd_elf32_big_generic_vec,
#ifdef BFD64
&bfd_elf64_little_generic_vec,
&bfd_elf64_big_generic_vec,
#endif
&a_out_adobe_vec, &a_out_adobe_vec,
&b_out_vec_little_host, &b_out_vec_little_host,
&b_out_vec_big_host, &b_out_vec_big_host,
@@ -446,6 +457,7 @@ bfd_target *target_vector[] = {
#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) #if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD)
&hppa_vec, &hppa_vec,
#endif #endif
&hp300hpux_vec,
&we32kcoff_vec, &we32kcoff_vec,
#ifdef TRAD_CORE #ifdef TRAD_CORE