X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fmri.c;h=e5c379c8b6091331688362d5430da8e5920d01bf;hb=d835a58baae720abe909795cb68763040d1750a8;hp=aed6e0263f235777aef18da2dd333b22fe01f40d;hpb=ee3cc2e2eef036f2175d91ccba93d523d5418e23;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/mri.c b/ld/mri.c index aed6e0263f..e5c379c8b6 100644 --- a/ld/mri.c +++ b/ld/mri.c @@ -1,69 +1,63 @@ /* mri.c -- handle MRI style linker scripts - Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000 - Free Software Foundation, Inc. + Copyright (C) 1991-2020 Free Software Foundation, Inc. + Contributed by Steve Chamberlain . -This file is part of GLD, the Gnu Linker. + This file is part of the GNU Binutils. -GLD is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -GLD is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GLD; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ - This bit does the tree decoration when MRI style link scripts - are parsed. - Contributed by Steve Chamberlain . */ +/* This bit does the tree decoration when MRI style link scripts + are parsed. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" +#include "bfdlink.h" +#include "ctf-api.h" #include "ld.h" #include "ldexp.h" #include "ldlang.h" #include "ldmisc.h" #include "mri.h" -#include "ldgram.h" +#include #include "libiberty.h" struct section_name_struct { struct section_name_struct *next; - CONST char *name; - CONST char *alias; + const char *name; + const char *alias; etree_type *vma; etree_type *align; etree_type *subalign; int ok_to_load; }; -unsigned int symbol_truncate = 10000; -struct section_name_struct *order; -struct section_name_struct *only_load; -struct section_name_struct *address; -struct section_name_struct *alias; +static unsigned int symbol_truncate = 10000; +static etree_type *base; /* Relocation base - or null */ -struct section_name_struct *alignment; -struct section_name_struct *subalignment; +static struct section_name_struct *order; +static struct section_name_struct *only_load; +static struct section_name_struct *address; +static struct section_name_struct *alias; -static struct section_name_struct **lookup - PARAMS ((const char *name, struct section_name_struct **list)); -static void mri_add_to_list PARAMS ((struct section_name_struct **list, - const char *name, etree_type *vma, - const char *zalias, etree_type *align, - etree_type *subalign)); +static struct section_name_struct *alignment; +static struct section_name_struct *subalignment; static struct section_name_struct ** -lookup (name, list) - CONST char *name; - struct section_name_struct **list; +lookup (const char *name, struct section_name_struct **list) { struct section_name_struct **ptr = list; @@ -77,24 +71,24 @@ lookup (name, list) ptr = &((*ptr)->next); } - *ptr = (struct section_name_struct *) xmalloc (sizeof (struct section_name_struct)); + *ptr = (struct section_name_struct *) + xmalloc (sizeof (struct section_name_struct)); return ptr; } static void -mri_add_to_list (list, name, vma, zalias, align, subalign) - struct section_name_struct **list; - CONST char *name; - etree_type *vma; - CONST char *zalias; - etree_type *align; - etree_type *subalign; +mri_add_to_list (struct section_name_struct **list, + const char *name, + etree_type *vma, + const char *zalias, + etree_type *align, + etree_type *subalign) { struct section_name_struct **ptr = lookup (name, list); (*ptr)->name = name; (*ptr)->vma = vma; - (*ptr)->next = (struct section_name_struct *) NULL; + (*ptr)->next = NULL; (*ptr)->ok_to_load = 0; (*ptr)->alias = zalias; (*ptr)->align = align; @@ -102,9 +96,7 @@ mri_add_to_list (list, name, vma, zalias, align, subalign) } void -mri_output_section (name, vma) - CONST char *name; - etree_type *vma; +mri_output_section (const char *name, etree_type *vma) { mri_add_to_list (&address, name, vma, 0, 0, 0); } @@ -113,15 +105,13 @@ mri_output_section (name, vma) marked thus. */ void -mri_only_load (name) - CONST char *name; +mri_only_load (const char *name) { mri_add_to_list (&only_load, name, 0, 0, 0, 0); } void -mri_base (exp) - etree_type *exp; +mri_base (etree_type *exp) { base = exp; } @@ -129,45 +119,30 @@ mri_base (exp) static int done_tree = 0; void -mri_draw_tree () +mri_draw_tree (void) { if (done_tree) return; -#if 0 /* We don't bother with memory regions. */ - /* Create the regions. */ - { - lang_memory_region_type *r; - - r = lang_memory_region_lookup("long"); - r->current = r->origin = exp_get_vma (base, (bfd_vma)0, "origin", - lang_first_phase_enum); - r->length = (bfd_size_type) exp_get_vma (0, (bfd_vma) ~((bfd_size_type)0), - "length", lang_first_phase_enum); - } -#endif - /* Now build the statements for the ldlang machine. */ - /* Attatch the addresses of any which have addresses, + /* Attach the addresses of any which have addresses, and add the ones not mentioned. */ - if (address != (struct section_name_struct *) NULL) + if (address != NULL) { struct section_name_struct *alist; struct section_name_struct *olist; - if (order == (struct section_name_struct *) NULL) + if (order == NULL) order = address; for (alist = address; - alist != (struct section_name_struct *) NULL; + alist != NULL; alist = alist->next) { int done = 0; - for (olist = order; - done == 0 && olist != (struct section_name_struct *) NULL; - olist = olist->next) + for (olist = order; done == 0 && olist != NULL; olist = olist->next) { if (strcmp (alist->name, olist->name) == 0) { @@ -186,12 +161,12 @@ mri_draw_tree () /* If we're only supposed to load a subset of them in, then prune the list. */ - if (only_load != (struct section_name_struct *) NULL) + if (only_load != NULL) { struct section_name_struct *ptr1; struct section_name_struct *ptr2; - if (order == (struct section_name_struct *) NULL) + if (order == NULL) order = only_load; /* See if this name is in the list, if it is then we can load it. */ @@ -210,7 +185,7 @@ mri_draw_tree () } /* Create the order of sections to load. */ - if (order != (struct section_name_struct *) NULL) + if (order != NULL) { /* Been told to output the sections in a certain order. */ struct section_name_struct *p = order; @@ -235,16 +210,16 @@ mri_draw_tree () base = p->vma ? p->vma : exp_nameop (NAME, "."); lang_enter_output_section_statement (p->name, base, - p->ok_to_load ? 0 : noload_section, - 1, align, subalign, - (etree_type *) NULL); + p->ok_to_load ? normal_section : noload_section, + align, subalign, NULL, 0, 0); base = 0; tmp = (struct wildcard_list *) xmalloc (sizeof *tmp); tmp->next = NULL; tmp->spec.name = p->name; tmp->spec.exclude_name_list = NULL; - tmp->spec.sorted = false; - lang_add_wild (NULL, tmp, false); + tmp->spec.sorted = none; + tmp->spec.section_flag_list = NULL; + lang_add_wild (NULL, tmp, FALSE); /* If there is an alias for this section, add it too. */ for (aptr = alias; aptr; aptr = aptr->next) @@ -254,13 +229,12 @@ mri_draw_tree () tmp->next = NULL; tmp->spec.name = aptr->name; tmp->spec.exclude_name_list = NULL; - tmp->spec.sorted = false; - lang_add_wild (NULL, tmp, false); + tmp->spec.sorted = none; + tmp->spec.section_flag_list = NULL; + lang_add_wild (NULL, tmp, FALSE); } - lang_leave_output_section_statement - (0, "*default*", (struct lang_output_section_phdr_list *) NULL, - NULL); + lang_leave_output_section_statement (0, "*default*", NULL, NULL); p = p->next; } @@ -270,29 +244,20 @@ mri_draw_tree () } void -mri_load (name) - CONST char *name; +mri_load (const char *name) { base = 0; - lang_add_input_file (name, - lang_input_file_is_file_enum, (char *) NULL); -#if 0 - lang_leave_output_section_statement (0, "*default*"); -#endif + lang_add_input_file (name, lang_input_file_is_file_enum, NULL); } void -mri_order (name) - CONST char *name; +mri_order (const char *name) { mri_add_to_list (&order, name, 0, 0, 0, 0); } void -mri_alias (want, is, isn) - CONST char *want; - CONST char *is; - int isn; +mri_alias (const char *want, const char *is, int isn) { if (!is) { @@ -311,56 +276,41 @@ mri_alias (want, is, isn) } void -mri_name (name) - CONST char *name; +mri_name (const char *name) { lang_add_output (name, 1); } void -mri_format (name) - CONST char *name; +mri_format (const char *name) { if (strcmp (name, "S") == 0) - lang_add_output_format ("srec", (char *) NULL, (char *) NULL, 1); - - else if (strcmp (name, "IEEE") == 0) - lang_add_output_format ("ieee", (char *) NULL, (char *) NULL, 1); - - else if (strcmp (name, "COFF") == 0) - lang_add_output_format ("coff-m68k", (char *) NULL, (char *) NULL, 1); + lang_add_output_format ("srec", NULL, NULL, 1); else - einfo (_("%P%F: unknown format type %s\n"), name); + einfo (_("%F%P: unknown format type %s\n"), name); } void -mri_public (name, exp) - CONST char *name; - etree_type *exp; +mri_public (const char *name, etree_type *exp) { - lang_add_assignment (exp_assop ('=', name, exp)); + lang_add_assignment (exp_assign (name, exp, FALSE)); } void -mri_align (name, exp) - CONST char *name; - etree_type *exp; +mri_align (const char *name, etree_type *exp) { mri_add_to_list (&alignment, name, 0, 0, exp, 0); } void -mri_alignmod (name, exp) - CONST char *name; - etree_type *exp; +mri_alignmod (const char *name, etree_type *exp) { mri_add_to_list (&subalignment, name, 0, 0, 0, exp); } void -mri_truncate (exp) - unsigned int exp; +mri_truncate (unsigned int exp) { symbol_truncate = exp; }