/* subsegs.c - subsegments -
- Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+ Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2002, 2004
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/*
- * Segments & sub-segments.
- */
+/* Segments & sub-segments. */
#include "as.h"
segment_info_type segment_info[SEG_MAXIMUM_ORDINAL];
#else
-/* Commented in "subsegs.h". */
+/* Commented in "subsegs.h". */
frchainS *data0_frchainP, *bss0_frchainP;
#endif /* MANY_SEGMENTS */
-char const *const seg_name[] =
-{
+char const *const seg_name[] = {
"absolute",
#ifdef MANY_SEGMENTS
"e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9",
"transfert vector postload",
"register",
"",
-}; /* Used by error reporters, dumpers etc. */
+}; /* Used by error reporters, dumpers etc. */
#else /* BFD_ASSEMBLER */
/* Gas segment information for bfd_abs_section_ptr and
#endif /* BFD_ASSEMBLER */
-static void subseg_set_rest PARAMS ((segT, subsegT));
+static void subseg_set_rest (segT, subsegT);
static fragS dummy_frag;
static frchainS absolute_frchain;
\f
void
-subsegs_begin ()
+subsegs_begin (void)
{
/* Check table(s) seg_name[], seg_N_TYPE[] is in correct order */
#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER)
#endif
frchain_root = NULL;
- frchain_now = NULL; /* Warn new_subseg() that we are booting. */
+ frchain_now = NULL; /* Warn new_subseg() that we are booting. */
frag_now = &dummy_frag;
#ifndef BFD_ASSEMBLER
- now_subseg = 42; /* Lie for 1st call to subseg_new. */
+ now_subseg = 42; /* Lie for 1st call to subseg_new. */
#ifdef MANY_SEGMENTS
{
int i;
* segment context correct.
*/
void
-subseg_change (seg, subseg)
- register segT seg;
- register int subseg;
+subseg_change (register segT seg, register int subseg)
{
now_seg = seg;
now_subseg = subseg;
}
\f
static void
-subseg_set_rest (seg, subseg)
- segT seg;
- subsegT subseg;
+subseg_set_rest (segT seg, subsegT subseg)
{
register frchainS *frcP; /* crawl frchain chain */
register frchainS **lastPP; /* address of last pointer */
*/
if (!frcP
|| (frcP->frch_seg > seg
- || frcP->frch_subseg > subseg)) /* Kinky logic only works with 2 segments. */
+ || frcP->frch_subseg > subseg)) /* Kinky logic only works with 2 segments. */
{
/*
* This should be the only code that creates a frchainS.
seginfo->frchainP = newP;
}
#endif
-
+
frcP = newP;
}
/*
return new_seg;
}
#else
- as_bad (_("Attempt to switch to nonexistent segment \"%s\""), segname);
+ as_bad (_("attempt to switch to nonexistent segment \"%s\""), segname);
return now_seg;
#endif
}
#else /* BFD_ASSEMBLER */
segT
-subseg_get (segname, force_new)
- const char *segname;
- int force_new;
+subseg_get (const char *segname, int force_new)
{
segT secptr;
segment_info_type *seginfo;
else
secptr = bfd_make_section_anyway (stdoutput, segname);
+#ifdef obj_sec_set_private_data
+ obj_sec_set_private_data (stdoutput, secptr);
+#endif
+
seginfo = seg_info (secptr);
if (! seginfo)
{
/* Check whether output_section is set first because secptr may
- be bfd_abs_section_ptr. */
+ be bfd_abs_section_ptr. */
if (secptr->output_section != secptr)
secptr->output_section = secptr;
seginfo = (segment_info_type *) xmalloc (sizeof (*seginfo));
}
segT
-subseg_new (segname, subseg)
- const char *segname;
- subsegT subseg;
+subseg_new (const char *segname, subsegT subseg)
{
segT secptr;
segment_info_type *seginfo;
/* Like subseg_new, except a new section is always created, even if
a section with that name already exists. */
segT
-subseg_force_new (segname, subseg)
- const char *segname;
- subsegT subseg;
+subseg_force_new (const char *segname, subsegT subseg)
{
segT secptr;
segment_info_type *seginfo;
}
void
-subseg_set (secptr, subseg)
- segT secptr;
- subsegT subseg;
+subseg_set (segT secptr, subsegT subseg)
{
if (! (secptr == now_seg && subseg == now_subseg))
subseg_set_rest (secptr, subseg);
/* Get the gas information we are storing for a section. */
segment_info_type *
-seg_info (sec)
- segT sec;
+seg_info (segT sec)
{
if (sec == bfd_abs_section_ptr)
return abs_seg_info;
}
symbolS *
-section_symbol (sec)
- segT sec;
+section_symbol (segT sec)
{
segment_info_type *seginfo = seg_info (sec);
symbolS *s;
#define EMIT_SECTION_SYMBOLS 1
#endif
- if (! EMIT_SECTION_SYMBOLS
-#ifdef BFD_ASSEMBLER
- || symbol_table_frozen
-#endif
- )
+ if (! EMIT_SECTION_SYMBOLS || symbol_table_frozen)
{
/* Here we know it won't be going into the symbol table. */
- s = symbol_create (sec->name, sec, 0, &zero_address_frag);
+ s = symbol_create (sec->symbol->name, sec, 0, &zero_address_frag);
}
else
{
- s = symbol_find_base (sec->name, 0);
- if (s == NULL)
- s = symbol_new (sec->name, sec, 0, &zero_address_frag);
- else
+ segT seg;
+ s = symbol_find_base (sec->symbol->name, 0);
+ /* We have to make sure it is the right symbol when we
+ have multiple sections with the same section name. */
+ if (s == NULL
+ || ((seg = S_GET_SEGMENT (s)) != sec
+ && seg != undefined_section))
+ s = symbol_new (sec->symbol->name, sec, 0, &zero_address_frag);
+ else if (seg == undefined_section)
{
- if (S_GET_SEGMENT (s) == undefined_section)
- {
- S_SET_SEGMENT (s, sec);
- symbol_set_frag (s, &zero_address_frag);
- }
+ S_SET_SEGMENT (s, sec);
+ symbol_set_frag (s, &zero_address_frag);
}
}
/* Use the BFD section symbol, if possible. */
if (obj_sec_sym_ok_for_reloc (sec))
symbol_set_bfdsym (s, sec->symbol);
+ else
+ symbol_get_bfdsym (s)->flags |= BSF_SECTION_SYM;
seginfo->sym = s;
return s;
/* Return whether the specified segment is thought to hold text. */
#ifndef BFD_ASSEMBLER
-const char * const nontext_section_names[] =
-{
+const char * const nontext_section_names[] = {
".eh_frame",
".gcc_except_table",
#ifdef OBJ_COFF
#endif /* ! BFD_ASSEMBLER */
int
-subseg_text_p (sec)
- segT sec;
+subseg_text_p (segT sec)
{
#ifdef BFD_ASSEMBLER
return (bfd_get_section_flags (stdoutput, sec) & SEC_CODE) != 0;
#else /* ! BFD_ASSEMBLER */
const char * const *p;
- if (sec == data_section || sec == bss_section)
+ if (sec == data_section || sec == bss_section || sec == absolute_section)
return 0;
for (p = nontext_section_names; *p != NULL; ++p)
}
void
-subsegs_print_statistics (file)
- FILE *file;
+subsegs_print_statistics (FILE *file)
{
frchainS *frchp;
fprintf (file, "frag chains:\n");
count++;
}
fprintf (file, "\n");
- fprintf (file, "\t%p %-10s\t%10d frags\n", frchp,
+ fprintf (file, "\t%p %-10s\t%10d frags\n", (void *) frchp,
segment_name (frchp->frch_seg), count);
}
}