/* This module handles expression trees.
-Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support (sac@cygnus.com).
This file is part of GLD, the Gnu Linker.
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, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/*
This module is in charge of working out the contents of expressions.
{ NEXT,"NEXT" },
{ SIZEOF,"SIZEOF" },
{ ADDR,"ADDR" },
+ { LOADADDR,"LOADADDR" },
{ MEMORY,"MEMORY" },
{ DEFINED,"DEFINED" },
{ TARGET_K,"TARGET" },
static void
check (os, name, op)
lang_output_section_statement_type *os;
- CONST char *name;
- CONST char *op;
+ const char *name;
+ const char *op;
{
- if (os == (lang_output_section_statement_type *)NULL) {
- einfo("%F%P: %s uses undefined section %s\n", op, name);
- }
- if (os->processed == false) {
- einfo("%F%P: %s forward reference of section %s\n",op, name);
- }
+ if (os == NULL)
+ einfo ("%F%P: %s uses undefined section %s\n", op, name);
+ if (! os->processed)
+ einfo ("%F%P: %s forward reference of section %s\n", op, name);
}
etree_type *
exp_intop (value)
bfd_vma value;
{
- etree_type *new = (etree_type *)stat_alloc((bfd_size_type)(sizeof(new->value)));
+ etree_type *new = (etree_type *) stat_alloc(sizeof(new->value));
new->type.node_code = INT;
new->value.value = value;
new->type.node_class = etree_value;
value from a relative value is meaningful, and is an
exception. */
if (current_section != abs_output_section
- && (result.section == abs_output_section
- || other.section == abs_output_section)
+ && (other.section == abs_output_section
+ || (result.section == abs_output_section
+ && tree->type.node_code == '+'))
&& (tree->type.node_code == '+'
|| tree->type.node_code == '-'))
{
/* If there is only one absolute term, make sure it is the
second one. */
- if (result.section == abs_output_section)
+ if (other.section != abs_output_section)
{
hold = result;
result = other;
{
struct bfd_link_hash_entry *h;
- h = bfd_link_hash_lookup (link_info.hash, tree->name.name,
- false, false, true);
+ h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+ tree->name.name,
+ false, false, true);
result.value = (h != (struct bfd_link_hash_entry *) NULL
&& (h->type == bfd_link_hash_defined
+ || h->type == bfd_link_hash_defweak
|| h->type == bfd_link_hash_common));
result.section = 0;
result.valid = true;
{
struct bfd_link_hash_entry *h;
- h = bfd_link_hash_lookup (link_info.hash, tree->name.name,
- false, false, true);
- if (h != NULL && h->type == bfd_link_hash_defined)
+ h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+ tree->name.name,
+ false, false, true);
+ if (h != NULL
+ && (h->type == bfd_link_hash_defined
+ || h->type == bfd_link_hash_defweak))
{
if (bfd_is_abs_section (h->u.def.section))
result = new_abs (h->u.def.value);
- else if (allocation_done == lang_final_phase_enum)
+ else if (allocation_done == lang_final_phase_enum
+ || allocation_done == lang_allocating_phase_enum)
{
lang_output_section_statement_type *os;
break;
case ADDR:
+ if (allocation_done != lang_first_phase_enum)
+ {
+ lang_output_section_statement_type *os;
- if (allocation_done != lang_first_phase_enum) {
- lang_output_section_statement_type *os =
- lang_output_section_find(tree->name.name);
- check(os,tree->name.name,"ADDR");
- result = new_rel((bfd_vma)0, os);
- }
- else {
- result = invalid();
- }
+ os = lang_output_section_find (tree->name.name);
+ check (os, tree->name.name, "ADDR");
+ result = new_rel (0, os);
+ }
+ else
+ result = invalid ();
break;
+
+ case LOADADDR:
+ if (allocation_done != lang_first_phase_enum)
+ {
+ lang_output_section_statement_type *os;
+
+ os = lang_output_section_find (tree->name.name);
+ check (os, tree->name.name, "LOADADDR");
+ if (os->load_base == NULL)
+ result = new_rel (0, os);
+ else
+ result = exp_fold_tree_no_dot (os->load_base,
+ abs_output_section,
+ allocation_done);
+ }
+ else
+ result = invalid ();
+ break;
+
case SIZEOF:
- if(allocation_done != lang_first_phase_enum) {
- lang_output_section_statement_type *os =
- lang_output_section_find(tree->name.name);
- check(os,tree->name.name,"SIZEOF");
- result = new_abs((bfd_vma)(os->bfd_section->_raw_size));
- }
- else {
- result = invalid();
- }
+ if (allocation_done != lang_first_phase_enum)
+ {
+ lang_output_section_statement_type *os;
+
+ os = lang_output_section_find (tree->name.name);
+ check (os, tree->name.name, "SIZEOF");
+ result = new_abs (os->bfd_section->_raw_size);
+ }
+ else
+ result = invalid ();
break;
default:
{
etree_value_type result;
- if (tree == (etree_type *)NULL) {
- result.valid = false;
- }
- else {
- switch (tree->type.node_class)
+ if (tree == NULL)
{
- case etree_value:
- result = new_rel(tree->value.value, current_section);
+ result.valid = false;
+ return result;
+ }
+
+ switch (tree->type.node_class)
+ {
+ case etree_value:
+ result = new_rel (tree->value.value, current_section);
break;
+
case etree_rel:
if (allocation_done != lang_final_phase_enum)
result.valid = false;
+ tree->rel.section->output_offset),
current_section);
break;
- case etree_unary:
- result = exp_fold_tree(tree->unary.child,
- current_section,
- allocation_done, dot, dotp);
- if (result.valid == true)
- {
- switch(tree->type.node_code)
- {
- case ALIGN_K:
- if (allocation_done != lang_first_phase_enum) {
- result = new_rel_from_section(ALIGN_N(dot,
- result.value) ,
- current_section);
- }
- else {
- result.valid = false;
- }
- break;
- case ABSOLUTE:
- if (allocation_done != lang_first_phase_enum)
- {
- if (current_section
- == (lang_output_section_statement_type*)NULL)
+ case etree_unary:
+ result = exp_fold_tree (tree->unary.child,
+ current_section,
+ allocation_done, dot, dotp);
+ if (result.valid)
+ {
+ switch (tree->type.node_code)
{
- /* Outside a section, so it's all ok */
+ case ALIGN_K:
+ if (allocation_done != lang_first_phase_enum)
+ result = new_rel_from_section (ALIGN_N (dot, result.value),
+ current_section);
+ else
+ result.valid = false;
+ break;
- }
- else {
- /* Inside a section, subtract the base of the section,
- so when it's added again (in an assignment), everything comes out fine
- */
- result.section = abs_output_section;
- result.value -= current_section->bfd_section->vma;
- result.valid = true;
- }
- }
- else
- {
- result.valid = false;
- }
+ case ABSOLUTE:
+ if (allocation_done != lang_first_phase_enum && result.valid)
+ {
+ result.value += result.section->bfd_section->vma;
+ result.section = abs_output_section;
+ }
+ else
+ result.valid = false;
+ break;
- break;
- case '~':
- make_abs(&result);
- result.value = ~result.value;
- break;
- case '!':
- make_abs(&result);
- result.value = !result.value;
- break;
- case '-':
- make_abs(&result);
- result.value = -result.value;
- break;
- case NEXT:
- if (allocation_done ==lang_allocating_phase_enum) {
- make_abs(&result);
- result.value = ALIGN_N(dot, result.value);
- }
- else {
- /* Return next place aligned to value */
- result.valid = false;
- }
- break;
- default:
- FAIL();
- }
- }
+ case '~':
+ make_abs (&result);
+ result.value = ~result.value;
+ break;
- break;
- case etree_trinary:
+ case '!':
+ make_abs (&result);
+ result.value = !result.value;
+ break;
- result = exp_fold_tree(tree->trinary.cond,
- current_section,
- allocation_done, dot, dotp);
- if (result.valid) {
- result = exp_fold_tree(result.value ?
- tree->trinary.lhs:tree->trinary.rhs,
- current_section,
- allocation_done, dot, dotp);
- }
+ case '-':
+ make_abs (&result);
+ result.value = -result.value;
+ break;
+
+ case NEXT:
+ /* Return next place aligned to value. */
+ if (allocation_done == lang_allocating_phase_enum)
+ {
+ make_abs (&result);
+ result.value = ALIGN_N (dot, result.value);
+ }
+ else
+ result.valid = false;
+ break;
+ default:
+ FAIL ();
+ break;
+ }
+ }
break;
- case etree_binary:
- result = fold_binary(tree, current_section, allocation_done,
- dot, dotp);
+
+ case etree_trinary:
+ result = exp_fold_tree (tree->trinary.cond, current_section,
+ allocation_done, dot, dotp);
+ if (result.valid)
+ result = exp_fold_tree ((result.value
+ ? tree->trinary.lhs
+ : tree->trinary.rhs),
+ current_section,
+ allocation_done, dot, dotp);
break;
- case etree_assign:
- case etree_provide:
- if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0) {
- /* Assignment to dot can only be done during allocation */
- if (tree->type.node_class == etree_provide)
- einfo ("%F%S can not PROVIDE assignment to location counter\n");
- if (allocation_done == lang_allocating_phase_enum) {
- result = exp_fold_tree(tree->assign.src,
- current_section,
- lang_allocating_phase_enum, dot, dotp);
- if (result.valid == false) {
- einfo("%F%S invalid assignment to location counter\n");
- }
- else {
- if (current_section ==
- (lang_output_section_statement_type *)NULL) {
- einfo("%F%S assignment to location counter invalid outside of SECTION\n");
- }
- else {
- bfd_vma nextdot =result.value +
- current_section->bfd_section->vma;
- if (nextdot < dot) {
- einfo("%F%S cannot move location counter backwards (from %V to %V)\n", dot, nextdot);
- }
- else {
- *dotp = nextdot;
- }
+
+ case etree_binary:
+ result = fold_binary (tree, current_section, allocation_done,
+ dot, dotp);
+ break;
+
+ case etree_assign:
+ case etree_provide:
+ if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
+ {
+ /* Assignment to dot can only be done during allocation */
+ if (tree->type.node_class == etree_provide)
+ einfo ("%F%S can not PROVIDE assignment to location counter\n");
+ if (allocation_done == lang_allocating_phase_enum
+ || (allocation_done == lang_final_phase_enum
+ && current_section == abs_output_section))
+ {
+ result = exp_fold_tree (tree->assign.src,
+ current_section,
+ lang_allocating_phase_enum, dot,
+ dotp);
+ if (! result.valid)
+ einfo ("%F%S invalid assignment to location counter\n");
+ else
+ {
+ if (current_section == NULL)
+ einfo ("%F%S assignment to location counter invalid outside of SECTION\n");
+ else
+ {
+ bfd_vma nextdot;
+
+ nextdot = (result.value
+ + current_section->bfd_section->vma);
+ if (nextdot < dot
+ && current_section != abs_output_section)
+ {
+ einfo ("%F%S cannot move location counter backwards (from %V to %V)\n",
+ dot, nextdot);
+ }
+ else
+ *dotp = nextdot;
+ }
+ }
}
- }
}
- }
else
{
result = exp_fold_tree (tree->assign.src,
dot, dotp);
if (result.valid)
{
+ boolean create;
struct bfd_link_hash_entry *h;
+ if (tree->type.node_class == etree_assign)
+ create = true;
+ else
+ create = false;
h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
- (tree->type.node_class == etree_assign
- ? true : false),
- false, false);
+ create, false, false);
if (h == (struct bfd_link_hash_entry *) NULL)
{
if (tree->type.node_class == etree_assign)
&& h->type != bfd_link_hash_common)
{
/* Do nothing. The symbol was defined by some
- object. */
+ object. */
}
else
{
h->u.def.section = result.section->bfd_section;
}
}
- }
+ }
break;
- case etree_name:
- result = fold_name(tree, current_section, allocation_done, dot);
+
+ case etree_name:
+ result = fold_name (tree, current_section, allocation_done, dot);
break;
- default:
- einfo("%F%S need more of these %d\n",tree->type.node_class );
+ default:
+ FAIL ();
+ break;
}
- }
return result;
}
-
static etree_value_type
exp_fold_tree_no_dot (tree, current_section, allocation_done)
etree_type *tree;
{
return exp_intop(r.value);
}
- new = (etree_type *)stat_alloc((bfd_size_type)(sizeof(new->binary)));
+ new = (etree_type *) stat_alloc (sizeof (new->binary));
memcpy((char *)new, (char *)&value, sizeof(new->binary));
return new;
}
if (r.valid) {
return exp_intop(r.value);
}
- new = (etree_type *)stat_alloc((bfd_size_type)(sizeof(new->trinary)));
+ new = (etree_type *) stat_alloc (sizeof (new->trinary));
memcpy((char *)new,(char *) &value, sizeof(new->trinary));
return new;
}
if (r.valid) {
return exp_intop(r.value);
}
- new = (etree_type *)stat_alloc((bfd_size_type)(sizeof(new->unary)));
+ new = (etree_type *) stat_alloc (sizeof (new->unary));
memcpy((char *)new, (char *)&value, sizeof(new->unary));
return new;
}
if (r.valid) {
return exp_intop(r.value);
}
- new = (etree_type *)stat_alloc((bfd_size_type)(sizeof(new->name)));
+ new = (etree_type *) stat_alloc (sizeof (new->name));
memcpy((char *)new, (char *)&value, sizeof(new->name));
return new;
return exp_intop(result);
}
#endif
- new = (etree_type*)stat_alloc((bfd_size_type)(sizeof(new->assign)));
+ new = (etree_type*) stat_alloc (sizeof (new->assign));
memcpy((char *)new, (char *)&value, sizeof(new->assign));
return new;
}
{
switch (tree->type.node_class) {
case etree_value:
- print_address(tree->value.value);
+ minfo ("0x%v", tree->value.value);
return;
case etree_rel:
if (tree->rel.section->owner != NULL)
- fprintf (config.map_file, "%s:",
- bfd_get_filename (tree->rel.section->owner));
- fprintf (config.map_file, "%s+", tree->rel.section->name);
- print_address (tree->rel.value);
+ minfo ("%B:", tree->rel.section->owner);
+ minfo ("%s+0x%v", tree->rel.section->name, tree->rel.value);
return;
case etree_assign:
#if 0
fprintf(config.map_file,"%s (UNDEFINED)",tree->assign.dst->name);
}
#endif
- fprintf(config.map_file,"%s ",tree->assign.dst);
+ fprintf(config.map_file,"%s",tree->assign.dst);
exp_print_token(tree->type.node_code);
exp_print_tree(tree->assign.src);
break;
}
}
-
-
-
bfd_vma
exp_get_vma (tree, def, name, allocation_done)
etree_type *tree;
- bfd_vma def;
+ bfd_vma def;
char *name;
lang_phase_type allocation_done;
{
etree_value_type r;
- if (tree != (etree_type *)NULL) {
- r = exp_fold_tree_no_dot(tree,
- abs_output_section,
- allocation_done);
- if (r.valid == false && name) {
- einfo("%F%S nonconstant expression for %s\n",name);
+ if (tree != NULL)
+ {
+ r = exp_fold_tree_no_dot (tree, abs_output_section, allocation_done);
+ if (! r.valid && name != NULL)
+ einfo ("%F%S nonconstant expression for %s\n", name);
+ return r.value;
}
- return r.value;
- }
- else {
+ else
return def;
- }
}
int
}
-int
+bfd_vma
exp_get_abs_int (tree, def, name, allocation_done)
etree_type *tree;
int def;