From 7be1c4891a2036c31e706908d43f33f7f59ae5a9 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 11 Aug 2005 01:25:29 +0000 Subject: * README-vms: Delete. * config-gas.com: Delete. * makefile.vms: Delete. * vmsconf.sh: Delete. * config/atof-tahoe.c: Delete. * config/m88k-opcode.h: Delete. * config/obj-bout.c: Delete. * config/obj-bout.h: Delete. * config/obj-hp300.c: Delete. * config/obj-hp300.h: Delete. * config/tc-a29k.c: Delete. * config/tc-a29k.h: Delete. * config/tc-h8500.c: Delete. * config/tc-h8500.h: Delete. * config/tc-m88k.c: Delete. * config/tc-m88k.h: Delete. * config/tc-tahoe.c: Delete. * config/tc-tahoe.h: Delete. * config/tc-tic80.c: Delete. * config/tc-tic80.h: Delete. * config/tc-w65.c: Delete. * config/tc-w65.h: Delete. * config/te-aux.h: Delete. * config/te-delt88.h: Delete. * config/te-delta.h: Delete. * config/te-dpx2.h: Delete. * config/te-hp300.h: Delete. * config/te-ic960.h: Delete. * config/vms-a-conf.h: Delete. * doc/c-a29k.texi: Delete. * doc/c-h8500.texi: Delete. * doc/c-m88k.texi: Delete. * README: Remove obsolete examples, and list of supported targets. * Makefile.am: Remove a29k, h8500, m88k, tahoe, tic80, w65, bout and hp300 support. (DEP_FLAGS): Don't define BFD_ASSEMBLER. * configure.in: Remove --enable-bfd-assembler, need_bfd, primary_bfd_gas. * configure.tgt: Remove a29k, h8300-coff, h8500-*, i960 non-elf, m68k non bfd, m88k, or32-coff, tic80-*, vax non-bfd, w65k-*, *-nindy. * as.c: Remove all non-BFD_ASSEMBLER code, support for above targets. * as.h: Likewise. * dw2gencfi.c: Likewise. * dwarf2dbg.c: Likewise. * ehopt.c: Likewise. * input-file.c: Likewise. * listing.c: Likewise. * literal.c: Likewise. * messages.c: Likewise. * obj.h: Likewise. * output-file.c: Likewise. * read.c: Likewise. * stabs.c: Likewise. * struc-symbol.h: Likewise. * subsegs.c: Likewise. * subsegs.h: Likewise. * symbols.c: Likewise. * symbols.h: Likewise. * tc.h: Likewise. * write.c: Likewise. * write.h: Likewise. * config/aout_gnu.h: Likewise. * config/obj-aout.c: Likewise. * config/obj-aout.h: Likewise. * config/obj-coff.c: Likewise. * config/obj-coff.h: Likewise. * config/obj-evax.h: Likewise. * config/obj-ieee.h: Likewise. * config/tc-arm.c: Likewise. * config/tc-arm.h: Likewise. * config/tc-avr.c: Likewise. * config/tc-avr.h: Likewise. * config/tc-crx.h: Likewise. * config/tc-d10v.h: Likewise. * config/tc-d30v.h: Likewise. * config/tc-dlx.h: Likewise. * config/tc-fr30.h: Likewise. * config/tc-frv.h: Likewise. * config/tc-h8300.c: Likewise. * config/tc-h8300.h: Likewise. * config/tc-hppa.h: Likewise. * config/tc-i370.h: Likewise. * config/tc-i386.c: Likewise. * config/tc-i386.h: Likewise. * config/tc-i860.h: Likewise. * config/tc-i960.c: Likewise. * config/tc-i960.h: Likewise. * config/tc-ip2k.h: Likewise. * config/tc-iq2000.h: Likewise. * config/tc-m32c.h: Likewise. * config/tc-m32r.h: Likewise. * config/tc-m68hc11.h: Likewise. * config/tc-m68k.c: Likewise. * config/tc-m68k.h: Likewise. * config/tc-maxq.c: Likewise. * config/tc-maxq.h: Likewise. * config/tc-mcore.c: Likewise. * config/tc-mcore.h: Likewise. * config/tc-mn10200.h: Likewise. * config/tc-mn10300.c: Likewise. * config/tc-mn10300.h: Likewise. * config/tc-ms1.h: Likewise. * config/tc-msp430.c: Likewise. * config/tc-msp430.h: Likewise. * config/tc-ns32k.c: Likewise. * config/tc-ns32k.h: Likewise. * config/tc-openrisc.h: Likewise. * config/tc-or32.c: Likewise. * config/tc-or32.h: Likewise. * config/tc-ppc.c: Likewise. * config/tc-ppc.h: Likewise. * config/tc-s390.h: Likewise. * config/tc-sh.c: Likewise. * config/tc-sh.h: Likewise. * config/tc-sparc.c: Likewise. * config/tc-tic30.c: Likewise. * config/tc-tic30.h: Likewise. * config/tc-tic4x.c: Likewise. * config/tc-tic4x.h: Likewise. * config/tc-tic54x.c: Likewise. * config/tc-tic54x.h: Likewise. * config/tc-v850.h: Likewise. * config/tc-vax.c: Likewise. * config/tc-vax.h: Likewise. * config/tc-xstormy16.h: Likewise. * config/tc-xtensa.h: Likewise. * config/tc-z8k.c: Likewise. * config/tc-z8k.h: Likewise. * config/vms-a-conf.h * doc/Makefile.am: Likewise. * doc/all.texi: Likewise. * doc/as.texinfo: Likewise. * doc/Makefile.in: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. * config.in: Regenerate. * po/POTFILES.in: Regenerate. --- gas/subsegs.c | 249 +++++----------------------------------------------------- 1 file changed, 20 insertions(+), 229 deletions(-) (limited to 'gas/subsegs.c') diff --git a/gas/subsegs.c b/gas/subsegs.c index 50343b6..b1cb8e4 100644 --- a/gas/subsegs.c +++ b/gas/subsegs.c @@ -31,45 +31,11 @@ frchainS *frchain_root, *frchain_now; static struct obstack frchains; -#ifndef BFD_ASSEMBLER -#ifdef MANY_SEGMENTS -segment_info_type segment_info[SEG_MAXIMUM_ORDINAL]; - -#else -/* Commented in "subsegs.h". */ -frchainS *data0_frchainP, *bss0_frchainP; - -#endif /* MANY_SEGMENTS */ -char const *const seg_name[] = { - "absolute", -#ifdef MANY_SEGMENTS - "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", - "e10", "e11", "e12", "e13", "e14", "e15", "e16", "e17", "e18", "e19", - "e20", "e21", "e22", "e23", "e24", "e25", "e26", "e27", "e28", "e29", - "e30", "e31", "e32", "e33", "e34", "e35", "e36", "e37", "e38", "e39", -#else - "text", - "data", - "bss", -#endif /* MANY_SEGMENTS */ - "unknown", - "ASSEMBLER-INTERNAL-LOGIC-ERROR!", - "expr", - "debug", - "transfert vector preload", - "transfert vector postload", - "register", - "", -}; /* Used by error reporters, dumpers etc. */ -#else /* BFD_ASSEMBLER */ - /* Gas segment information for bfd_abs_section_ptr and bfd_und_section_ptr. */ static segment_info_type *abs_seg_info; static segment_info_type *und_seg_info; -#endif /* BFD_ASSEMBLER */ - static void subseg_set_rest (segT, subsegT); static fragS dummy_frag; @@ -79,22 +45,6 @@ static frchainS absolute_frchain; void subsegs_begin (void) { - /* Check table(s) seg_name[], seg_N_TYPE[] is in correct order */ -#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) - know (SEG_ABSOLUTE == 0); - know (SEG_TEXT == 1); - know (SEG_DATA == 2); - know (SEG_BSS == 3); - know (SEG_UNKNOWN == 4); - know (SEG_GOOF == 5); - know (SEG_EXPR == 6); - know (SEG_DEBUG == 7); - know (SEG_NTV == 8); - know (SEG_PTV == 9); - know (SEG_REGISTER == 10); - know (SEG_MAXIMUM_ORDINAL == SEG_REGISTER); -#endif - obstack_begin (&frchains, chunksize); #if __GNUC__ >= 2 obstack_alignment_mask (&frchains) = __alignof__ (frchainS) - 1; @@ -105,32 +55,9 @@ subsegs_begin (void) frag_now = &dummy_frag; -#ifndef BFD_ASSEMBLER - now_subseg = 42; /* Lie for 1st call to subseg_new. */ -#ifdef MANY_SEGMENTS - { - int i; - for (i = SEG_E0; i < SEG_UNKNOWN; i++) - { - subseg_set (i, 0); - segment_info[i].frchainP = frchain_now; - } - } -#else - subseg_set (SEG_DATA, 0); /* .data 0 */ - data0_frchainP = frchain_now; - - subseg_set (SEG_BSS, 0); - bss0_frchainP = frchain_now; - -#endif /* ! MANY_SEGMENTS */ -#endif /* ! BFD_ASSEMBLER */ - absolute_frchain.frch_seg = absolute_section; absolute_frchain.frch_subseg = 0; -#ifdef BFD_ASSEMBLER absolute_frchain.fix_root = absolute_frchain.fix_tail = 0; -#endif absolute_frchain.frch_frag_now = &zero_address_frag; absolute_frchain.frch_root = absolute_frchain.frch_last = &zero_address_frag; } @@ -150,54 +77,27 @@ subseg_change (register segT seg, register int subseg) { now_seg = seg; now_subseg = subseg; + segment_info_type *seginfo; if (now_seg == absolute_section) return; -#ifdef BFD_ASSEMBLER - { - segment_info_type *seginfo; - seginfo = (segment_info_type *) bfd_get_section_userdata (stdoutput, seg); - if (! seginfo) - { - seginfo = (segment_info_type *) xmalloc (sizeof (*seginfo)); - memset ((PTR) seginfo, 0, sizeof (*seginfo)); - seginfo->fix_root = NULL; - seginfo->fix_tail = NULL; - seginfo->bfd_section = seg; - seginfo->sym = 0; - if (seg == bfd_abs_section_ptr) - abs_seg_info = seginfo; - else if (seg == bfd_und_section_ptr) - und_seg_info = seginfo; - else - bfd_set_section_userdata (stdoutput, seg, (PTR) seginfo); - } - } -#else -#ifdef MANY_SEGMENTS - seg_fix_rootP = &segment_info[seg].fix_root; - seg_fix_tailP = &segment_info[seg].fix_tail; -#else - if (seg == SEG_DATA) - { - seg_fix_rootP = &data_fix_root; - seg_fix_tailP = &data_fix_tail; - } - else if (seg == SEG_TEXT) - { - seg_fix_rootP = &text_fix_root; - seg_fix_tailP = &text_fix_tail; - } - else + seginfo = (segment_info_type *) bfd_get_section_userdata (stdoutput, seg); + if (! seginfo) { - know (seg == SEG_BSS); - seg_fix_rootP = &bss_fix_root; - seg_fix_tailP = &bss_fix_tail; + seginfo = (segment_info_type *) xmalloc (sizeof (*seginfo)); + memset ((PTR) seginfo, 0, sizeof (*seginfo)); + seginfo->fix_root = NULL; + seginfo->fix_tail = NULL; + seginfo->bfd_section = seg; + seginfo->sym = 0; + if (seg == bfd_abs_section_ptr) + abs_seg_info = seginfo; + else if (seg == bfd_und_section_ptr) + und_seg_info = seginfo; + else + bfd_set_section_userdata (stdoutput, seg, (PTR) seginfo); } - -#endif -#endif } static void @@ -274,13 +174,13 @@ subseg_set_rest (segT seg, subsegT subseg) /* * This should be the only code that creates a frchainS. */ + segment_info_type *seginfo; + newP = (frchainS *) obstack_alloc (&frchains, sizeof (frchainS)); newP->frch_subseg = subseg; newP->frch_seg = seg; -#ifdef BFD_ASSEMBLER newP->fix_root = NULL; newP->fix_tail = NULL; -#endif obstack_begin (&newP->frch_obstack, chunksize); #if __GNUC__ >= 2 obstack_alignment_mask (&newP->frch_obstack) = __alignof__ (fragS) - 1; @@ -293,14 +193,9 @@ subseg_set_rest (segT seg, subsegT subseg) *lastPP = newP; newP->frch_next = frcP; /* perhaps NULL */ -#ifdef BFD_ASSEMBLER - { - segment_info_type *seginfo; - seginfo = seg_info (seg); - if (seginfo && seginfo->frchainP == frcP) - seginfo->frchainP = newP; - } -#endif + seginfo = seg_info (seg); + if (seginfo && seginfo->frchainP == frcP) + seginfo->frchainP = newP; frcP = newP; } @@ -329,73 +224,6 @@ subseg_set_rest (segT seg, subsegT subseg) * Frchain_root updated if needed. */ -#ifndef BFD_ASSEMBLER - -segT -subseg_new (segname, subseg) - const char *segname; - subsegT subseg; -{ - int i; - - for (i = 0; i < (int) SEG_MAXIMUM_ORDINAL; i++) - { - const char *s; - - s = segment_name ((segT) i); - if (strcmp (segname, s) == 0 - || (segname[0] == '.' - && strcmp (segname + 1, s) == 0)) - { - subseg_set ((segT) i, subseg); - return (segT) i; - } -#ifdef obj_segment_name - s = obj_segment_name ((segT) i); - if (strcmp (segname, s) == 0 - || (segname[0] == '.' - && strcmp (segname + 1, s) == 0)) - { - subseg_set ((segT) i, subseg); - return (segT) i; - } -#endif - } - -#ifdef obj_add_segment - { - segT new_seg; - new_seg = obj_add_segment (segname); - subseg_set (new_seg, subseg); - return new_seg; - } -#else - as_bad (_("attempt to switch to nonexistent segment \"%s\""), segname); - return now_seg; -#endif -} - -void -subseg_set (seg, subseg) /* begin assembly for a new sub-segment */ - register segT seg; /* SEG_DATA or SEG_TEXT */ - register subsegT subseg; -{ -#ifndef MANY_SEGMENTS - know (seg == SEG_DATA - || seg == SEG_TEXT - || seg == SEG_BSS - || seg == SEG_ABSOLUTE); -#endif - - if (seg != now_seg || subseg != now_subseg) - { /* we just changed sub-segments */ - subseg_set_rest (seg, subseg); - } - mri_common_symbol = NULL; -} - -#else /* BFD_ASSEMBLER */ - segT subseg_get (const char *segname, int force_new) { @@ -550,49 +378,12 @@ section_symbol (segT sec) return s; } -#endif /* BFD_ASSEMBLER */ - /* Return whether the specified segment is thought to hold text. */ -#ifndef BFD_ASSEMBLER -const char * const nontext_section_names[] = { - ".eh_frame", - ".gcc_except_table", -#ifdef OBJ_COFF -#ifndef COFF_LONG_SECTION_NAMES - ".eh_fram", - ".gcc_exc", -#endif -#endif - NULL -}; -#endif /* ! BFD_ASSEMBLER */ - int 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 || sec == absolute_section) - return 0; - - for (p = nontext_section_names; *p != NULL; ++p) - { - if (strcmp (segment_name (sec), *p) == 0) - return 0; - -#ifdef obj_segment_name - if (strcmp (obj_segment_name (sec), *p) == 0) - return 0; -#endif - } - - return 1; - -#endif /* ! BFD_ASSEMBLER */ } /* Return non zero if SEC has at least one byte of data. It is -- cgit v1.1