1991-04-04 20:19:53 +02:00
|
|
|
|
/* symbols.c -symbol table-
|
1994-09-13 03:50:02 +02:00
|
|
|
|
Copyright (C) 1987, 1990, 1991, 1992, 1993, 1994
|
|
|
|
|
Free Software Foundation, Inc.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1992-02-13 09:33:54 +01:00
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1992-02-13 09:33:54 +01:00
|
|
|
|
GAS 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.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1992-02-13 09:33:54 +01:00
|
|
|
|
GAS 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.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1992-02-13 09:33:54 +01:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GAS; see the file COPYING. If not, write to
|
|
|
|
|
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1993-09-10 18:01:07 +02:00
|
|
|
|
/* #define DEBUG_SYMS / * to debug symbol list maintenance */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#include "as.h"
|
|
|
|
|
|
|
|
|
|
#include "obstack.h" /* For "symbols.h" */
|
|
|
|
|
#include "subsegs.h"
|
|
|
|
|
|
|
|
|
|
#ifndef WORKING_DOT_WORD
|
|
|
|
|
extern int new_broken_words;
|
|
|
|
|
#endif
|
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
/* symbol-name => struct symbol pointer */
|
|
|
|
|
static struct hash_control *sy_hash;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-02-13 09:33:54 +01:00
|
|
|
|
/* Below are commented in "symbols.h". */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *symbol_rootP;
|
|
|
|
|
symbolS *symbol_lastP;
|
|
|
|
|
symbolS abs_symbol;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
#ifdef DEBUG_SYMS
|
|
|
|
|
#define debug_verify_symchain verify_symbol_chain
|
|
|
|
|
#else
|
|
|
|
|
#define debug_verify_symchain (void)
|
|
|
|
|
#endif
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
struct obstack notes;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
Wed Dec 30 10:18:57 1992 Ian Lance Taylor (ian@cygnus.com)
* app.c, config/tc-*.c: Don't include read.h, since it is already
included by as.h.
* These are based on patches from Minh Tran-le
<mtranle@paris.intellicorp.com>.
* configure.in (i[34]86-ibm-aix*): Accept i486 for host. Use
obj_format coffbfd and gas_target i386coff for target.
(i[34]86-*-isc*): New host (uses sysv).
* config/i386aix.mt: Removed (no longer used).
* config/mh-i386aix (RANLIB): Use true rather than /bin/true.
(MINUS_G): Removed.
(LDFLAGS): Added, defined as -shlib.
* config/te-i386aix.h (REVERSE_SORT_RELOCS): Undefine.
* config/te-sco386.h (LOCAL_LABEL): Don't define.
(DOT_LABEL_PREFIX): Define.
* expr.c (operand): If DOT_LABEL_PREFIX, use .L0\001 as a label
name rather than L0\001.
* read.c (s_lcomm): Make a frag in SEG_BSS rather than using
local_bss_counter.
* symbols.c, symbols.h (local_bss_counter): Removed.
* write.c (write_object_file): bss no longer uses
local_bss_counter. Pass correct data and bss size to
VMS_write_object_file.
* config/obj-vms.c (VMS_write_object_file): Accept bss size as
argument, rather than using local_bss_counter.
* config/tc-m88k.c (s_bss): Don't use local_bss_counter.
* config/tc-sparc.c (s_reserve): Don't use local_bss_counter.
* config/obj-coffbfd.c (had_lineno, had_reloc): Removed.
(size_section): Restored sanity check.
(do_relocs_for): Base section address on s_paddr rather than
computing it. Adjust a29k R_IHIHALF special case to account for
section paddr (used to require paddr to be zero). If there are no
reclos, set s_relptr to 0. Set relocation size in object_headers.
(fill_section): Always set s_vaddr here, removing
ZERO_BASED_SEGMENTS case. Force s_scnptr for bss to 0. Don't set
NOLOAD for i386 .bss, because it confuses the SVR3 native linker.
Set STYP_INFO for .comment.
(coff_header_append): Use object headers and H_{SET,GET}_* macros.
Make aouthdr writing depend on OBJ_COFF_OMIT_OPTIONAL_HEADER.
(crawl_symbols): Handle 8 character section name correctly. Use
H_{SET,GET}_* macros.
(do_linenos_for): Set lineno size in object_headers.
(write_object_file): Use H_{SET,GET}_* macros. Don't bother to
set s_vaddr here. If string_byte_count remains 4, set it back to
0, and only write strings out if there are some. Call
fill_section before do_relocs_for and do_linenos_for.
(obj_coff_section): Handle optional quoted second argument giving
section characteristics.
(obj_coff_bss): Added to handle .bss.
(obj_coff_ident): Added to handle .ident (puts string in .comment
section).
(obj_coff_lcomm): Put common symbols in .bss, not .data.
(fixup_mdeps): Change to segment. Call frag_wane after
md_convert_frag.
(fixup_segment): Explicitly check S_IS_COMMON before making 386
adjustment (already happened only for common symbols, but this is
clearer).
* config/obj-coffbfd.h (OBJ_COFF_OMIT_OPTIONAL_HEADER): Define.
* config/tc-i386.c (s_bss): Don't use if I386COFF.
(md_pseudo_table): Ignore .optim and .noopt.
(tc_coff_sizemachdep): New function.
* config/tc-i386.h (REVERSE_SORT_RELOCS): Undef, for SVR3
compatibility.
(LOCAL_LABEL): Removed definition.
(DOT_LABEL_PREFIX): Defined.
1992-12-30 21:34:14 +01:00
|
|
|
|
static void fb_label_init PARAMS ((void));
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
/* symbol_new()
|
|
|
|
|
|
|
|
|
|
Return a pointer to a new symbol. Die if we can't make a new
|
|
|
|
|
symbol. Fill in the symbol's values. Add symbol to end of symbol
|
|
|
|
|
chain.
|
|
|
|
|
|
|
|
|
|
This function should be called in the general case of creating a
|
|
|
|
|
symbol. However, if the output file symbol table has already been
|
|
|
|
|
set, and you are certain that this symbol won't be wanted in the
|
|
|
|
|
output file, you can call symbol_create. */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *
|
1993-09-13 23:32:07 +02:00
|
|
|
|
symbol_new (name, segment, valu, frag)
|
1994-09-13 03:50:02 +02:00
|
|
|
|
const char *name;
|
|
|
|
|
segT segment;
|
|
|
|
|
valueT valu;
|
|
|
|
|
fragS *frag;
|
|
|
|
|
{
|
|
|
|
|
symbolS *symbolP = symbol_create (name, segment, valu, frag);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Link to end of symbol chain.
|
|
|
|
|
*/
|
|
|
|
|
#ifdef BFD_ASSEMBLER
|
|
|
|
|
{
|
|
|
|
|
extern int symbol_table_frozen;
|
|
|
|
|
if (symbol_table_frozen)
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
symbol_append (symbolP, symbol_lastP, &symbol_rootP, &symbol_lastP);
|
|
|
|
|
debug_verify_symchain (symbol_rootP, symbol_lastP);
|
|
|
|
|
|
|
|
|
|
return symbolP;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
symbolS *
|
|
|
|
|
symbol_create (name, segment, valu, frag)
|
|
|
|
|
const char *name; /* It is copied, the caller can destroy/modify */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
segT segment; /* Segment identifier (SEG_<something>) */
|
1993-09-13 23:32:07 +02:00
|
|
|
|
valueT valu; /* Symbol value */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
fragS *frag; /* Associated fragment */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
unsigned int name_length;
|
|
|
|
|
char *preserved_copy_of_name;
|
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
|
|
|
|
|
name_length = strlen (name) + 1; /* +1 for \0 */
|
|
|
|
|
obstack_grow (¬es, name, name_length);
|
|
|
|
|
preserved_copy_of_name = obstack_finish (¬es);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef STRIP_UNDERSCORE
|
|
|
|
|
if (preserved_copy_of_name[0] == '_')
|
|
|
|
|
preserved_copy_of_name++;
|
|
|
|
|
#endif
|
1994-09-13 03:50:02 +02:00
|
|
|
|
|
|
|
|
|
#ifdef tc_canonicalize_symbol_name
|
|
|
|
|
preserved_copy_of_name =
|
|
|
|
|
tc_canonicalize_symbol_name (preserved_copy_of_name);
|
|
|
|
|
#endif
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolP = (symbolS *) obstack_alloc (¬es, sizeof (symbolS));
|
|
|
|
|
|
|
|
|
|
/* symbol must be born in some fixed state. This seems as good as any. */
|
|
|
|
|
memset (symbolP, 0, sizeof (symbolS));
|
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef BFD_ASSEMBLER
|
|
|
|
|
symbolP->bsym = bfd_make_empty_symbol (stdoutput);
|
|
|
|
|
assert (symbolP->bsym != 0);
|
1994-12-20 23:42:03 +01:00
|
|
|
|
symbolP->bsym->udata.p = (PTR) symbolP;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif
|
1992-11-23 21:39:57 +01:00
|
|
|
|
S_SET_NAME (symbolP, preserved_copy_of_name);
|
|
|
|
|
|
|
|
|
|
S_SET_SEGMENT (symbolP, segment);
|
1993-09-13 23:32:07 +02:00
|
|
|
|
S_SET_VALUE (symbolP, valu);
|
1994-09-13 03:50:02 +02:00
|
|
|
|
symbol_clear_list_pointers (symbolP);
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
symbolP->sy_frag = frag;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifndef BFD_ASSEMBLER
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolP->sy_number = ~0;
|
1994-01-25 01:20:48 +01:00
|
|
|
|
symbolP->sy_name_offset = (unsigned int) ~0;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
obj_symbol_new_hook (symbolP);
|
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
#ifdef tc_symbol_new_hook
|
|
|
|
|
tc_symbol_new_hook (symbolP);
|
|
|
|
|
#endif
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
return symbolP;
|
|
|
|
|
}
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
/*
|
|
|
|
|
* colon()
|
|
|
|
|
*
|
|
|
|
|
* We have just seen "<name>:".
|
|
|
|
|
* Creates a struct symbol unless it already exists.
|
|
|
|
|
*
|
|
|
|
|
* Gripes if we are redefining a symbol incompatibly (and ignores it).
|
|
|
|
|
*
|
|
|
|
|
*/
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
colon (sym_name) /* just seen "x:" - rattle symbols & frags */
|
|
|
|
|
register char *sym_name; /* symbol name, as a cannonical string */
|
|
|
|
|
/* We copy this string: OK to alter later. */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
register symbolS *symbolP; /* symbol we are working with */
|
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef LOCAL_LABELS_DOLLAR
|
1993-07-07 18:25:37 +02:00
|
|
|
|
/* Sun local labels go out of scope whenever a non-local symbol is
|
|
|
|
|
defined. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
if (*sym_name != 'L')
|
|
|
|
|
dollar_label_clear ();
|
|
|
|
|
#endif /* LOCAL_LABELS_DOLLAR */
|
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifndef WORKING_DOT_WORD
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (new_broken_words)
|
|
|
|
|
{
|
|
|
|
|
struct broken_word *a;
|
|
|
|
|
int possible_bytes;
|
|
|
|
|
fragS *frag_tmp;
|
|
|
|
|
char *frag_opcode;
|
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
extern const int md_short_jump_size;
|
|
|
|
|
extern const int md_long_jump_size;
|
|
|
|
|
possible_bytes = (md_short_jump_size
|
|
|
|
|
+ new_broken_words * md_long_jump_size);
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
frag_tmp = frag_now;
|
|
|
|
|
frag_opcode = frag_var (rs_broken_word,
|
|
|
|
|
possible_bytes,
|
|
|
|
|
possible_bytes,
|
|
|
|
|
(relax_substateT) 0,
|
|
|
|
|
(symbolS *) broken_words,
|
|
|
|
|
0L,
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
/* We want to store the pointer to where to insert the jump table in the
|
1993-07-07 18:25:37 +02:00
|
|
|
|
fr_opcode of the rs_broken_word frag. This requires a little
|
|
|
|
|
hackery. */
|
|
|
|
|
while (frag_tmp
|
|
|
|
|
&& (frag_tmp->fr_type != rs_broken_word
|
|
|
|
|
|| frag_tmp->fr_opcode))
|
1992-11-23 21:39:57 +01:00
|
|
|
|
frag_tmp = frag_tmp->fr_next;
|
|
|
|
|
know (frag_tmp);
|
|
|
|
|
frag_tmp->fr_opcode = frag_opcode;
|
|
|
|
|
new_broken_words = 0;
|
|
|
|
|
|
|
|
|
|
for (a = broken_words; a && a->dispfrag == 0; a = a->next_broken_word)
|
|
|
|
|
a->dispfrag = frag_tmp;
|
|
|
|
|
}
|
|
|
|
|
#endif /* WORKING_DOT_WORD */
|
|
|
|
|
|
|
|
|
|
if ((symbolP = symbol_find (sym_name)) != 0)
|
|
|
|
|
{
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef RESOLVE_SYMBOL_REDEFINITION
|
|
|
|
|
if (RESOLVE_SYMBOL_REDEFINITION (symbolP))
|
1992-11-23 21:39:57 +01:00
|
|
|
|
return;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif
|
1992-11-23 21:39:57 +01:00
|
|
|
|
/*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* Now check for undefined symbols
|
|
|
|
|
*/
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (!S_IS_DEFINED (symbolP))
|
|
|
|
|
{
|
|
|
|
|
if (S_GET_VALUE (symbolP) == 0)
|
|
|
|
|
{
|
|
|
|
|
symbolP->sy_frag = frag_now;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef OBJ_VMS
|
|
|
|
|
S_GET_OTHER(symbolP) = const_flag;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif
|
1994-12-20 23:42:03 +01:00
|
|
|
|
S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
|
1992-11-23 21:39:57 +01:00
|
|
|
|
S_SET_SEGMENT (symbolP, now_seg);
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef N_UNDF
|
1992-11-23 21:39:57 +01:00
|
|
|
|
know (N_UNDF == 0);
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* if we have one, it better be zero. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* There are still several cases to check:
|
|
|
|
|
* A .comm/.lcomm symbol being redefined as
|
|
|
|
|
* initialized data is OK
|
|
|
|
|
* A .comm/.lcomm symbol being redefined with
|
|
|
|
|
* a larger size is also OK
|
|
|
|
|
*
|
|
|
|
|
* This only used to be allowed on VMS gas, but Sun cc
|
|
|
|
|
* on the sparc also depends on it.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if (((!S_IS_DEBUG (symbolP)
|
|
|
|
|
&& !S_IS_DEFINED (symbolP)
|
|
|
|
|
&& S_IS_EXTERNAL (symbolP))
|
|
|
|
|
|| S_GET_SEGMENT (symbolP) == bss_section)
|
|
|
|
|
&& (now_seg == data_section
|
|
|
|
|
|| now_seg == S_GET_SEGMENT (symbolP)))
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
|
|
|
|
/*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* Select which of the 2 cases this is
|
|
|
|
|
*/
|
|
|
|
|
if (now_seg != data_section)
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
|
|
|
|
/*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* New .comm for prev .comm symbol.
|
|
|
|
|
* If the new size is larger we just
|
|
|
|
|
* change its value. If the new size
|
|
|
|
|
* is smaller, we ignore this symbol
|
|
|
|
|
*/
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (S_GET_VALUE (symbolP)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
< ((unsigned) frag_now_fix ()))
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
1993-07-07 18:25:37 +02:00
|
|
|
|
S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
|
1992-11-23 21:39:57 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
Wed Dec 30 10:18:57 1992 Ian Lance Taylor (ian@cygnus.com)
* app.c, config/tc-*.c: Don't include read.h, since it is already
included by as.h.
* These are based on patches from Minh Tran-le
<mtranle@paris.intellicorp.com>.
* configure.in (i[34]86-ibm-aix*): Accept i486 for host. Use
obj_format coffbfd and gas_target i386coff for target.
(i[34]86-*-isc*): New host (uses sysv).
* config/i386aix.mt: Removed (no longer used).
* config/mh-i386aix (RANLIB): Use true rather than /bin/true.
(MINUS_G): Removed.
(LDFLAGS): Added, defined as -shlib.
* config/te-i386aix.h (REVERSE_SORT_RELOCS): Undefine.
* config/te-sco386.h (LOCAL_LABEL): Don't define.
(DOT_LABEL_PREFIX): Define.
* expr.c (operand): If DOT_LABEL_PREFIX, use .L0\001 as a label
name rather than L0\001.
* read.c (s_lcomm): Make a frag in SEG_BSS rather than using
local_bss_counter.
* symbols.c, symbols.h (local_bss_counter): Removed.
* write.c (write_object_file): bss no longer uses
local_bss_counter. Pass correct data and bss size to
VMS_write_object_file.
* config/obj-vms.c (VMS_write_object_file): Accept bss size as
argument, rather than using local_bss_counter.
* config/tc-m88k.c (s_bss): Don't use local_bss_counter.
* config/tc-sparc.c (s_reserve): Don't use local_bss_counter.
* config/obj-coffbfd.c (had_lineno, had_reloc): Removed.
(size_section): Restored sanity check.
(do_relocs_for): Base section address on s_paddr rather than
computing it. Adjust a29k R_IHIHALF special case to account for
section paddr (used to require paddr to be zero). If there are no
reclos, set s_relptr to 0. Set relocation size in object_headers.
(fill_section): Always set s_vaddr here, removing
ZERO_BASED_SEGMENTS case. Force s_scnptr for bss to 0. Don't set
NOLOAD for i386 .bss, because it confuses the SVR3 native linker.
Set STYP_INFO for .comment.
(coff_header_append): Use object headers and H_{SET,GET}_* macros.
Make aouthdr writing depend on OBJ_COFF_OMIT_OPTIONAL_HEADER.
(crawl_symbols): Handle 8 character section name correctly. Use
H_{SET,GET}_* macros.
(do_linenos_for): Set lineno size in object_headers.
(write_object_file): Use H_{SET,GET}_* macros. Don't bother to
set s_vaddr here. If string_byte_count remains 4, set it back to
0, and only write strings out if there are some. Call
fill_section before do_relocs_for and do_linenos_for.
(obj_coff_section): Handle optional quoted second argument giving
section characteristics.
(obj_coff_bss): Added to handle .bss.
(obj_coff_ident): Added to handle .ident (puts string in .comment
section).
(obj_coff_lcomm): Put common symbols in .bss, not .data.
(fixup_mdeps): Change to segment. Call frag_wane after
md_convert_frag.
(fixup_segment): Explicitly check S_IS_COMMON before making 386
adjustment (already happened only for common symbols, but this is
clearer).
* config/obj-coffbfd.h (OBJ_COFF_OMIT_OPTIONAL_HEADER): Define.
* config/tc-i386.c (s_bss): Don't use if I386COFF.
(md_pseudo_table): Ignore .optim and .noopt.
(tc_coff_sizemachdep): New function.
* config/tc-i386.h (REVERSE_SORT_RELOCS): Undef, for SVR3
compatibility.
(LOCAL_LABEL): Removed definition.
(DOT_LABEL_PREFIX): Defined.
1992-12-30 21:34:14 +01:00
|
|
|
|
/* It is a .comm/.lcomm being converted to initialized
|
|
|
|
|
data. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolP->sy_frag = frag_now;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef OBJ_VMS
|
|
|
|
|
S_GET_OTHER(symbolP) = const_flag;
|
|
|
|
|
#endif /* OBJ_VMS */
|
|
|
|
|
S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
|
1992-11-23 21:39:57 +01:00
|
|
|
|
S_SET_SEGMENT (symbolP, now_seg); /* keep N_EXT bit */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#if defined (S_GET_OTHER) && defined (S_GET_DESC)
|
|
|
|
|
as_fatal ("Symbol \"%s\" is already defined as \"%s\"/%d.%d.%ld.",
|
1992-11-23 21:39:57 +01:00
|
|
|
|
sym_name,
|
|
|
|
|
segment_name (S_GET_SEGMENT (symbolP)),
|
1993-07-07 18:25:37 +02:00
|
|
|
|
S_GET_OTHER (symbolP), S_GET_DESC (symbolP),
|
|
|
|
|
(long) S_GET_VALUE (symbolP));
|
|
|
|
|
#else
|
1993-09-10 18:01:07 +02:00
|
|
|
|
as_fatal ("Symbol \"%s\" is already defined as \"%s\"/%ld.",
|
1992-11-23 21:39:57 +01:00
|
|
|
|
sym_name,
|
|
|
|
|
segment_name (S_GET_SEGMENT (symbolP)),
|
1993-09-10 18:01:07 +02:00
|
|
|
|
(long) S_GET_VALUE (symbolP));
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif
|
1992-11-23 21:39:57 +01:00
|
|
|
|
}
|
|
|
|
|
} /* if the undefined symbol has no value */
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Don't blow up if the definition is the same */
|
|
|
|
|
if (!(frag_now == symbolP->sy_frag
|
1994-12-20 23:42:03 +01:00
|
|
|
|
&& S_GET_VALUE (symbolP) == frag_now_fix ()
|
1992-11-23 21:39:57 +01:00
|
|
|
|
&& S_GET_SEGMENT (symbolP) == now_seg))
|
|
|
|
|
as_fatal ("Symbol %s already defined.", sym_name);
|
|
|
|
|
} /* if this symbol is not yet defined */
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1994-12-20 23:42:03 +01:00
|
|
|
|
symbolP = symbol_new (sym_name, now_seg, (valueT) frag_now_fix (),
|
1992-11-23 21:39:57 +01:00
|
|
|
|
frag_now);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef OBJ_VMS
|
1992-11-23 21:39:57 +01:00
|
|
|
|
S_SET_OTHER (symbolP, const_flag);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif /* OBJ_VMS */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbol_table_insert (symbolP);
|
|
|
|
|
} /* if we have seen this symbol before */
|
1993-07-16 18:26:03 +02:00
|
|
|
|
|
|
|
|
|
#ifdef tc_frob_label
|
|
|
|
|
tc_frob_label (symbolP);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#endif
|
1993-09-01 21:29:02 +02:00
|
|
|
|
}
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
/*
|
|
|
|
|
* symbol_table_insert()
|
|
|
|
|
*
|
|
|
|
|
* Die if we can't insert the symbol.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
symbol_table_insert (symbolP)
|
|
|
|
|
symbolS *symbolP;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1993-09-13 23:32:07 +02:00
|
|
|
|
register const char *error_string;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
know (symbolP);
|
|
|
|
|
know (S_GET_NAME (symbolP));
|
|
|
|
|
|
1994-01-25 01:20:48 +01:00
|
|
|
|
if ((error_string = hash_jam (sy_hash, S_GET_NAME (symbolP), (PTR) symbolP)))
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
|
|
|
|
as_fatal ("Inserting \"%s\" into symbol table failed: %s",
|
|
|
|
|
S_GET_NAME (symbolP), error_string);
|
|
|
|
|
} /* on error */
|
|
|
|
|
} /* symbol_table_insert() */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* symbol_find_or_make()
|
|
|
|
|
*
|
|
|
|
|
* If a symbol name does not exist, create it as undefined, and insert
|
|
|
|
|
* it into the symbol table. Return a pointer to it.
|
|
|
|
|
*/
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *
|
|
|
|
|
symbol_find_or_make (name)
|
|
|
|
|
char *name;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
register symbolS *symbolP;
|
|
|
|
|
|
|
|
|
|
symbolP = symbol_find (name);
|
|
|
|
|
|
|
|
|
|
if (symbolP == NULL)
|
|
|
|
|
{
|
|
|
|
|
symbolP = symbol_make (name);
|
|
|
|
|
|
|
|
|
|
symbol_table_insert (symbolP);
|
|
|
|
|
} /* if symbol wasn't found */
|
|
|
|
|
|
|
|
|
|
return (symbolP);
|
|
|
|
|
} /* symbol_find_or_make() */
|
|
|
|
|
|
|
|
|
|
symbolS *
|
|
|
|
|
symbol_make (name)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
CONST char *name;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
|
|
|
|
|
/* Let the machine description default it, e.g. for register names. */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
symbolP = md_undefined_symbol ((char *) name);
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
if (!symbolP)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
symbolP = symbol_new (name, undefined_section, (valueT) 0, &zero_address_frag);
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
return (symbolP);
|
|
|
|
|
} /* symbol_make() */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* symbol_find()
|
1992-11-23 21:39:57 +01:00
|
|
|
|
*
|
1991-04-04 20:19:53 +02:00
|
|
|
|
* Implement symbol table lookup.
|
|
|
|
|
* In: A symbol's name as a string: '\0' can't be part of a symbol name.
|
|
|
|
|
* Out: NULL if the name was not in the symbol table, else the address
|
|
|
|
|
* of a struct symbol associated with that name.
|
|
|
|
|
*/
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *
|
|
|
|
|
symbol_find (name)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
CONST char *name;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1991-11-06 03:27:02 +01:00
|
|
|
|
#ifdef STRIP_UNDERSCORE
|
1992-11-23 21:39:57 +01:00
|
|
|
|
return (symbol_find_base (name, 1));
|
1991-11-06 03:27:02 +01:00
|
|
|
|
#else /* STRIP_UNDERSCORE */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
return (symbol_find_base (name, 0));
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* STRIP_UNDERSCORE */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
} /* symbol_find() */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *
|
|
|
|
|
symbol_find_base (name, strip_underscore)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
CONST char *name;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
int strip_underscore;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (strip_underscore && *name == '_')
|
|
|
|
|
name++;
|
1994-09-13 03:50:02 +02:00
|
|
|
|
|
|
|
|
|
#ifdef tc_canonicalize_symbol_name
|
|
|
|
|
{
|
|
|
|
|
char *copy;
|
|
|
|
|
|
|
|
|
|
copy = (char *) alloca (strlen (name) + 1);
|
|
|
|
|
strcpy (copy, name);
|
|
|
|
|
name = tc_canonicalize_symbol_name (copy);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
return ((symbolS *) hash_find (sy_hash, name));
|
1991-04-04 20:19:53 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Once upon a time, symbols were kept in a singly linked list. At
|
|
|
|
|
* least coff needs to be able to rearrange them from time to time, for
|
|
|
|
|
* which a doubly linked list is much more convenient. Loic did these
|
|
|
|
|
* as macros which seemed dangerous to me so they're now functions.
|
|
|
|
|
* xoxorich.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Link symbol ADDME after symbol TARGET in the chain. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
symbol_append (addme, target, rootPP, lastPP)
|
|
|
|
|
symbolS *addme;
|
|
|
|
|
symbolS *target;
|
|
|
|
|
symbolS **rootPP;
|
|
|
|
|
symbolS **lastPP;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (target == NULL)
|
|
|
|
|
{
|
|
|
|
|
know (*rootPP == NULL);
|
|
|
|
|
know (*lastPP == NULL);
|
|
|
|
|
*rootPP = addme;
|
|
|
|
|
*lastPP = addme;
|
|
|
|
|
return;
|
|
|
|
|
} /* if the list is empty */
|
|
|
|
|
|
|
|
|
|
if (target->sy_next != NULL)
|
|
|
|
|
{
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
1992-11-23 21:39:57 +01:00
|
|
|
|
target->sy_next->sy_previous = addme;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* SYMBOLS_NEED_BACKPOINTERS */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
know (*lastPP == target);
|
|
|
|
|
*lastPP = addme;
|
|
|
|
|
} /* if we have a next */
|
|
|
|
|
|
|
|
|
|
addme->sy_next = target->sy_next;
|
|
|
|
|
target->sy_next = addme;
|
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
1992-11-23 21:39:57 +01:00
|
|
|
|
addme->sy_previous = target;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* SYMBOLS_NEED_BACKPOINTERS */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
/* Set the chain pointers of SYMBOL to null. */
|
|
|
|
|
void
|
|
|
|
|
symbol_clear_list_pointers (symbolP)
|
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
{
|
|
|
|
|
symbolP->sy_next = NULL;
|
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
|
|
|
|
symbolP->sy_previous = NULL;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
|
|
|
|
/* Remove SYMBOLP from the list. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
symbol_remove (symbolP, rootPP, lastPP)
|
|
|
|
|
symbolS *symbolP;
|
|
|
|
|
symbolS **rootPP;
|
|
|
|
|
symbolS **lastPP;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (symbolP == *rootPP)
|
|
|
|
|
{
|
|
|
|
|
*rootPP = symbolP->sy_next;
|
|
|
|
|
} /* if it was the root */
|
|
|
|
|
|
|
|
|
|
if (symbolP == *lastPP)
|
|
|
|
|
{
|
|
|
|
|
*lastPP = symbolP->sy_previous;
|
|
|
|
|
} /* if it was the tail */
|
|
|
|
|
|
|
|
|
|
if (symbolP->sy_next != NULL)
|
|
|
|
|
{
|
|
|
|
|
symbolP->sy_next->sy_previous = symbolP->sy_previous;
|
|
|
|
|
} /* if not last */
|
|
|
|
|
|
|
|
|
|
if (symbolP->sy_previous != NULL)
|
|
|
|
|
{
|
|
|
|
|
symbolP->sy_previous->sy_next = symbolP->sy_next;
|
|
|
|
|
} /* if not first */
|
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
debug_verify_symchain (*rootPP, *lastPP);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
|
|
|
|
/* Link symbol ADDME before symbol TARGET in the chain. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
symbol_insert (addme, target, rootPP, lastPP)
|
|
|
|
|
symbolS *addme;
|
|
|
|
|
symbolS *target;
|
|
|
|
|
symbolS **rootPP;
|
|
|
|
|
symbolS **lastPP;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
if (target->sy_previous != NULL)
|
|
|
|
|
{
|
|
|
|
|
target->sy_previous->sy_next = addme;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
know (*rootPP == target);
|
|
|
|
|
*rootPP = addme;
|
|
|
|
|
} /* if not first */
|
|
|
|
|
|
|
|
|
|
addme->sy_previous = target->sy_previous;
|
|
|
|
|
target->sy_previous = addme;
|
|
|
|
|
addme->sy_next = target;
|
|
|
|
|
|
1994-09-13 03:50:02 +02:00
|
|
|
|
debug_verify_symchain (*rootPP, *lastPP);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* SYMBOLS_NEED_BACKPOINTERS */
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
void
|
|
|
|
|
verify_symbol_chain (rootP, lastP)
|
|
|
|
|
symbolS *rootP;
|
|
|
|
|
symbolS *lastP;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
symbolS *symbolP = rootP;
|
|
|
|
|
|
|
|
|
|
if (symbolP == NULL)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
return;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP))
|
|
|
|
|
{
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
1992-11-23 21:39:57 +01:00
|
|
|
|
know (symbolP->sy_next->sy_previous == symbolP);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#else
|
|
|
|
|
/* Walk the list anyways, to make sure pointers are still good. */
|
1993-09-13 23:32:07 +02:00
|
|
|
|
;
|
1991-04-04 20:19:53 +02:00
|
|
|
|
#endif /* SYMBOLS_NEED_BACKPOINTERS */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
assert (lastP == symbolP);
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
void
|
|
|
|
|
verify_symbol_chain_2 (sym)
|
|
|
|
|
symbolS *sym;
|
|
|
|
|
{
|
|
|
|
|
symbolS *p = sym, *n = sym;
|
|
|
|
|
#ifdef SYMBOLS_NEED_BACKPOINTERS
|
|
|
|
|
while (symbol_previous (p))
|
|
|
|
|
p = symbol_previous (p);
|
|
|
|
|
#endif
|
|
|
|
|
while (symbol_next (n))
|
|
|
|
|
n = symbol_next (n);
|
|
|
|
|
verify_symbol_chain (p, n);
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1993-07-15 00:21:25 +02:00
|
|
|
|
/* Resolve the value of a symbol. This is called during the final
|
|
|
|
|
pass over the symbol table to resolve any symbols with complex
|
|
|
|
|
values. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
resolve_symbol_value (symp)
|
|
|
|
|
symbolS *symp;
|
|
|
|
|
{
|
1994-01-25 01:20:48 +01:00
|
|
|
|
int resolved;
|
|
|
|
|
|
1993-07-15 00:21:25 +02:00
|
|
|
|
if (symp->sy_resolved)
|
|
|
|
|
return;
|
|
|
|
|
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = 0;
|
|
|
|
|
|
1993-07-15 00:21:25 +02:00
|
|
|
|
if (symp->sy_resolving)
|
|
|
|
|
{
|
|
|
|
|
as_bad ("Symbol definition loop encountered at %s",
|
|
|
|
|
S_GET_NAME (symp));
|
|
|
|
|
S_SET_VALUE (symp, (valueT) 0);
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = 1;
|
1993-07-15 00:21:25 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
offsetT left, right, val;
|
|
|
|
|
segT seg_left, seg_right;
|
|
|
|
|
|
1993-07-15 00:21:25 +02:00
|
|
|
|
symp->sy_resolving = 1;
|
|
|
|
|
|
1994-09-28 21:27:31 +01:00
|
|
|
|
reduce:
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
switch (symp->sy_value.X_op)
|
1993-07-15 00:21:25 +02:00
|
|
|
|
{
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
case O_absent:
|
|
|
|
|
S_SET_VALUE (symp, 0);
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case O_constant:
|
|
|
|
|
S_SET_VALUE (symp, S_GET_VALUE (symp) + symp->sy_frag->fr_address);
|
|
|
|
|
if (S_GET_SEGMENT (symp) == expr_section)
|
|
|
|
|
S_SET_SEGMENT (symp, absolute_section);
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = 1;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case O_symbol:
|
1993-07-15 00:21:25 +02:00
|
|
|
|
resolve_symbol_value (symp->sy_value.X_add_symbol);
|
|
|
|
|
|
1994-12-20 23:42:03 +01:00
|
|
|
|
#if 0 /* I thought this was needed for some of the i386-svr4 PIC
|
|
|
|
|
support, but it appears I was wrong, and it breaks rs6000
|
|
|
|
|
support. */
|
1994-09-28 21:27:31 +01:00
|
|
|
|
if (S_GET_SEGMENT (symp->sy_value.X_add_symbol) != undefined_section
|
|
|
|
|
&& S_GET_SEGMENT (symp->sy_value.X_add_symbol) != expr_section)
|
1994-12-20 23:42:03 +01:00
|
|
|
|
#endif
|
1994-09-28 21:27:31 +01:00
|
|
|
|
{
|
|
|
|
|
if (symp->sy_value.X_add_number == 0)
|
|
|
|
|
copy_symbol_attributes (symp, symp->sy_value.X_add_symbol);
|
|
|
|
|
|
|
|
|
|
S_SET_VALUE (symp,
|
|
|
|
|
(symp->sy_value.X_add_number
|
|
|
|
|
+ symp->sy_frag->fr_address
|
|
|
|
|
+ S_GET_VALUE (symp->sy_value.X_add_symbol)));
|
|
|
|
|
if (S_GET_SEGMENT (symp) == expr_section
|
|
|
|
|
|| S_GET_SEGMENT (symp) == undefined_section)
|
|
|
|
|
S_SET_SEGMENT (symp,
|
|
|
|
|
S_GET_SEGMENT (symp->sy_value.X_add_symbol));
|
|
|
|
|
}
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = symp->sy_value.X_add_symbol->sy_resolved;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case O_uminus:
|
|
|
|
|
case O_bit_not:
|
|
|
|
|
resolve_symbol_value (symp->sy_value.X_add_symbol);
|
|
|
|
|
if (symp->sy_value.X_op == O_uminus)
|
|
|
|
|
val = - S_GET_VALUE (symp->sy_value.X_add_symbol);
|
|
|
|
|
else
|
|
|
|
|
val = ~ S_GET_VALUE (symp->sy_value.X_add_symbol);
|
|
|
|
|
S_SET_VALUE (symp,
|
|
|
|
|
(val
|
|
|
|
|
+ symp->sy_value.X_add_number
|
|
|
|
|
+ symp->sy_frag->fr_address));
|
|
|
|
|
if (S_GET_SEGMENT (symp) == expr_section
|
|
|
|
|
|| S_GET_SEGMENT (symp) == undefined_section)
|
|
|
|
|
S_SET_SEGMENT (symp, absolute_section);
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = symp->sy_value.X_add_symbol->sy_resolved;
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
break;
|
|
|
|
|
|
1994-09-28 21:27:31 +01:00
|
|
|
|
case O_add:
|
|
|
|
|
resolve_symbol_value (symp->sy_value.X_add_symbol);
|
|
|
|
|
resolve_symbol_value (symp->sy_value.X_op_symbol);
|
|
|
|
|
seg_left = S_GET_SEGMENT (symp->sy_value.X_add_symbol);
|
|
|
|
|
seg_right = S_GET_SEGMENT (symp->sy_value.X_op_symbol);
|
|
|
|
|
/* This case comes up with PIC support. */
|
|
|
|
|
{
|
|
|
|
|
symbolS *s_left = symp->sy_value.X_add_symbol;
|
|
|
|
|
symbolS *s_right = symp->sy_value.X_op_symbol;
|
|
|
|
|
|
|
|
|
|
if (seg_left == absolute_section)
|
|
|
|
|
{
|
|
|
|
|
symbolS *t;
|
|
|
|
|
segT ts;
|
|
|
|
|
t = s_left;
|
|
|
|
|
s_left = s_right;
|
|
|
|
|
s_right = t;
|
|
|
|
|
ts = seg_left;
|
|
|
|
|
seg_left = seg_right;
|
|
|
|
|
seg_right = ts;
|
|
|
|
|
}
|
|
|
|
|
if (seg_right == absolute_section
|
|
|
|
|
&& s_right->sy_resolved)
|
|
|
|
|
{
|
|
|
|
|
symp->sy_value.X_add_number += S_GET_VALUE (s_right);
|
|
|
|
|
symp->sy_value.X_op_symbol = 0;
|
|
|
|
|
symp->sy_value.X_add_symbol = s_left;
|
|
|
|
|
symp->sy_value.X_op = O_symbol;
|
|
|
|
|
goto reduce;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* fall through */
|
|
|
|
|
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
case O_multiply:
|
|
|
|
|
case O_divide:
|
|
|
|
|
case O_modulus:
|
|
|
|
|
case O_left_shift:
|
|
|
|
|
case O_right_shift:
|
|
|
|
|
case O_bit_inclusive_or:
|
|
|
|
|
case O_bit_or_not:
|
|
|
|
|
case O_bit_exclusive_or:
|
|
|
|
|
case O_bit_and:
|
|
|
|
|
case O_subtract:
|
1993-07-15 18:02:21 +02:00
|
|
|
|
resolve_symbol_value (symp->sy_value.X_add_symbol);
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
resolve_symbol_value (symp->sy_value.X_op_symbol);
|
|
|
|
|
seg_left = S_GET_SEGMENT (symp->sy_value.X_add_symbol);
|
|
|
|
|
seg_right = S_GET_SEGMENT (symp->sy_value.X_op_symbol);
|
|
|
|
|
if (seg_left != seg_right
|
|
|
|
|
&& seg_left != undefined_section
|
|
|
|
|
&& seg_right != undefined_section)
|
|
|
|
|
as_bad ("%s is operation on symbols in different sections",
|
1993-07-15 18:02:21 +02:00
|
|
|
|
S_GET_NAME (symp));
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
if ((S_GET_SEGMENT (symp->sy_value.X_add_symbol)
|
|
|
|
|
!= absolute_section)
|
|
|
|
|
&& symp->sy_value.X_op != O_subtract)
|
|
|
|
|
as_bad ("%s is illegal operation on non-absolute symbols",
|
|
|
|
|
S_GET_NAME (symp));
|
|
|
|
|
left = S_GET_VALUE (symp->sy_value.X_add_symbol);
|
|
|
|
|
right = S_GET_VALUE (symp->sy_value.X_op_symbol);
|
|
|
|
|
switch (symp->sy_value.X_op)
|
|
|
|
|
{
|
|
|
|
|
case O_multiply: val = left * right; break;
|
|
|
|
|
case O_divide: val = left / right; break;
|
|
|
|
|
case O_modulus: val = left % right; break;
|
|
|
|
|
case O_left_shift: val = left << right; break;
|
|
|
|
|
case O_right_shift: val = left >> right; break;
|
|
|
|
|
case O_bit_inclusive_or: val = left | right; break;
|
|
|
|
|
case O_bit_or_not: val = left |~ right; break;
|
|
|
|
|
case O_bit_exclusive_or: val = left ^ right; break;
|
|
|
|
|
case O_bit_and: val = left & right; break;
|
|
|
|
|
case O_add: val = left + right; break;
|
|
|
|
|
case O_subtract: val = left - right; break;
|
|
|
|
|
default: abort ();
|
|
|
|
|
}
|
1993-07-15 18:02:21 +02:00
|
|
|
|
S_SET_VALUE (symp,
|
|
|
|
|
(symp->sy_value.X_add_number
|
|
|
|
|
+ symp->sy_frag->fr_address
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
+ val));
|
|
|
|
|
if (S_GET_SEGMENT (symp) == expr_section
|
|
|
|
|
|| S_GET_SEGMENT (symp) == undefined_section)
|
|
|
|
|
S_SET_SEGMENT (symp, absolute_section);
|
1994-01-25 01:20:48 +01:00
|
|
|
|
resolved = (symp->sy_value.X_add_symbol->sy_resolved
|
|
|
|
|
&& symp->sy_value.X_op_symbol->sy_resolved);
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case O_register:
|
|
|
|
|
case O_big:
|
|
|
|
|
case O_illegal:
|
1994-01-25 01:20:48 +01:00
|
|
|
|
/* Give an error (below) if not in expr_section. We don't
|
|
|
|
|
want to worry about expr_section symbols, because they
|
|
|
|
|
are fictional (they are created as part of expression
|
|
|
|
|
resolution), and any problems may not actually mean
|
|
|
|
|
anything. */
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
break;
|
1993-07-15 00:21:25 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 01:20:48 +01:00
|
|
|
|
/* Don't worry if we can't resolve an expr_section symbol. */
|
|
|
|
|
if (resolved)
|
|
|
|
|
symp->sy_resolved = 1;
|
|
|
|
|
else if (S_GET_SEGMENT (symp) != expr_section)
|
|
|
|
|
{
|
|
|
|
|
as_bad ("can't resolve value for symbol \"%s\"", S_GET_NAME (symp));
|
|
|
|
|
symp->sy_resolved = 1;
|
|
|
|
|
}
|
1993-07-15 00:21:25 +02:00
|
|
|
|
}
|
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
#ifdef LOCAL_LABELS_DOLLAR
|
|
|
|
|
|
|
|
|
|
/* Dollar labels look like a number followed by a dollar sign. Eg, "42$".
|
|
|
|
|
They are *really* local. That is, they go out of scope whenever we see a
|
|
|
|
|
label that isn't local. Also, like fb labels, there can be multiple
|
|
|
|
|
instances of a dollar label. Therefor, we name encode each instance with
|
|
|
|
|
the instance number, keep a list of defined symbols separate from the real
|
|
|
|
|
symbol table, and we treat these buggers as a sparse array. */
|
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
static long *dollar_labels;
|
|
|
|
|
static long *dollar_label_instances;
|
|
|
|
|
static char *dollar_label_defines;
|
|
|
|
|
static long dollar_label_count;
|
1993-09-13 23:32:07 +02:00
|
|
|
|
static unsigned long dollar_label_max;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
dollar_label_defined (label)
|
|
|
|
|
long label;
|
|
|
|
|
{
|
|
|
|
|
long *i;
|
|
|
|
|
|
|
|
|
|
know ((dollar_labels != NULL) || (dollar_label_count == 0));
|
|
|
|
|
|
|
|
|
|
for (i = dollar_labels; i < dollar_labels + dollar_label_count; ++i)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
if (*i == label)
|
|
|
|
|
return dollar_label_defines[i - dollar_labels];
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/* if we get here, label isn't defined */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
return 0;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
} /* dollar_label_defined() */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dollar_label_instance (label)
|
|
|
|
|
long label;
|
|
|
|
|
{
|
|
|
|
|
long *i;
|
|
|
|
|
|
|
|
|
|
know ((dollar_labels != NULL) || (dollar_label_count == 0));
|
|
|
|
|
|
|
|
|
|
for (i = dollar_labels; i < dollar_labels + dollar_label_count; ++i)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
if (*i == label)
|
|
|
|
|
return (dollar_label_instances[i - dollar_labels]);
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
/* If we get here, we haven't seen the label before, therefore its instance
|
|
|
|
|
count is zero. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dollar_label_clear ()
|
|
|
|
|
{
|
1993-09-13 23:32:07 +02:00
|
|
|
|
memset (dollar_label_defines, '\0', (unsigned int) dollar_label_count);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
#define DOLLAR_LABEL_BUMP_BY 10
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
define_dollar_label (label)
|
|
|
|
|
long label;
|
|
|
|
|
{
|
|
|
|
|
long *i;
|
|
|
|
|
|
|
|
|
|
for (i = dollar_labels; i < dollar_labels + dollar_label_count; ++i)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
if (*i == label)
|
|
|
|
|
{
|
|
|
|
|
++dollar_label_instances[i - dollar_labels];
|
|
|
|
|
dollar_label_defines[i - dollar_labels] = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/* if we get to here, we don't have label listed yet. */
|
|
|
|
|
|
|
|
|
|
if (dollar_labels == NULL)
|
|
|
|
|
{
|
|
|
|
|
dollar_labels = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));
|
|
|
|
|
dollar_label_instances = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));
|
|
|
|
|
dollar_label_defines = xmalloc (DOLLAR_LABEL_BUMP_BY);
|
|
|
|
|
dollar_label_max = DOLLAR_LABEL_BUMP_BY;
|
|
|
|
|
dollar_label_count = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (dollar_label_count == dollar_label_max)
|
|
|
|
|
{
|
|
|
|
|
dollar_label_max += DOLLAR_LABEL_BUMP_BY;
|
|
|
|
|
dollar_labels = (long *) xrealloc ((char *) dollar_labels,
|
|
|
|
|
dollar_label_max * sizeof (long));
|
|
|
|
|
dollar_label_instances = (long *) xrealloc ((char *) dollar_label_instances,
|
|
|
|
|
dollar_label_max * sizeof (long));
|
|
|
|
|
dollar_label_defines = xrealloc (dollar_label_defines, dollar_label_max);
|
|
|
|
|
} /* if we needed to grow */
|
|
|
|
|
|
|
|
|
|
dollar_labels[dollar_label_count] = label;
|
|
|
|
|
dollar_label_instances[dollar_label_count] = 1;
|
|
|
|
|
dollar_label_defines[dollar_label_count] = 1;
|
|
|
|
|
++dollar_label_count;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* dollar_label_name()
|
|
|
|
|
*
|
|
|
|
|
* Caller must copy returned name: we re-use the area for the next name.
|
|
|
|
|
*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* The mth occurence of label n: is turned into the symbol "Ln^Am"
|
|
|
|
|
* where n is the label number and m is the instance number. "L" makes
|
|
|
|
|
* it a label discarded unless debugging and "^A"('\1') ensures no
|
|
|
|
|
* ordinary symbol SHOULD get the same name as a local label
|
|
|
|
|
* symbol. The first "4:" is "L4^A1" - the m numbers begin at 1.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
*
|
|
|
|
|
* fb labels get the same treatment, except that ^B is used in place of ^A.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
char * /* Return local label name. */
|
|
|
|
|
dollar_label_name (n, augend)
|
|
|
|
|
register long n; /* we just saw "n$:" : n a number */
|
|
|
|
|
register int augend; /* 0 for current instance, 1 for new instance */
|
|
|
|
|
{
|
|
|
|
|
long i;
|
|
|
|
|
/* Returned to caller, then copied. used for created names ("4f") */
|
|
|
|
|
static char symbol_name_build[24];
|
|
|
|
|
register char *p;
|
|
|
|
|
register char *q;
|
|
|
|
|
char symbol_name_temporary[20]; /* build up a number, BACKWARDS */
|
|
|
|
|
|
|
|
|
|
know (n >= 0);
|
|
|
|
|
know (augend == 0 || augend == 1);
|
|
|
|
|
p = symbol_name_build;
|
|
|
|
|
*p++ = 'L';
|
|
|
|
|
|
|
|
|
|
/* Next code just does sprintf( {}, "%d", n); */
|
|
|
|
|
/* label number */
|
|
|
|
|
q = symbol_name_temporary;
|
|
|
|
|
for (*q++ = 0, i = n; i; ++q)
|
|
|
|
|
{
|
|
|
|
|
*q = i % 10 + '0';
|
|
|
|
|
i /= 10;
|
|
|
|
|
}
|
|
|
|
|
while ((*p = *--q) != '\0')
|
|
|
|
|
++p;
|
|
|
|
|
|
|
|
|
|
*p++ = 1; /* ^A */
|
|
|
|
|
|
|
|
|
|
/* instance number */
|
|
|
|
|
q = symbol_name_temporary;
|
|
|
|
|
for (*q++ = 0, i = dollar_label_instance (n) + augend; i; ++q)
|
|
|
|
|
{
|
|
|
|
|
*q = i % 10 + '0';
|
|
|
|
|
i /= 10;
|
|
|
|
|
}
|
|
|
|
|
while ((*p++ = *--q) != '\0');;
|
|
|
|
|
|
|
|
|
|
/* The label, as a '\0' ended string, starts at symbol_name_build. */
|
1993-07-07 18:25:37 +02:00
|
|
|
|
return symbol_name_build;
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
#endif /* LOCAL_LABELS_DOLLAR */
|
|
|
|
|
|
|
|
|
|
#ifdef LOCAL_LABELS_FB
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Sombody else's idea of local labels. They are made by "n:" where n
|
|
|
|
|
* is any decimal digit. Refer to them with
|
|
|
|
|
* "nb" for previous (backward) n:
|
|
|
|
|
* or "nf" for next (forward) n:.
|
|
|
|
|
*
|
|
|
|
|
* We do a little better and let n be any number, not just a single digit, but
|
|
|
|
|
* since the other guy's assembler only does ten, we treat the first ten
|
|
|
|
|
* specially.
|
|
|
|
|
*
|
|
|
|
|
* Like someone else's assembler, we have one set of local label counters for
|
|
|
|
|
* entire assembly, not one set per (sub)segment like in most assemblers. This
|
|
|
|
|
* implies that one can refer to a label in another segment, and indeed some
|
|
|
|
|
* crufty compilers have done just that.
|
|
|
|
|
*
|
|
|
|
|
* Since there could be a LOT of these things, treat them as a sparse array.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define FB_LABEL_SPECIAL (10)
|
|
|
|
|
|
|
|
|
|
static long fb_low_counter[FB_LABEL_SPECIAL];
|
|
|
|
|
static long *fb_labels;
|
|
|
|
|
static long *fb_label_instances;
|
1994-01-28 01:03:38 +01:00
|
|
|
|
static long fb_label_count;
|
|
|
|
|
static long fb_label_max;
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/* this must be more than FB_LABEL_SPECIAL */
|
|
|
|
|
#define FB_LABEL_BUMP_BY (FB_LABEL_SPECIAL + 6)
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
fb_label_init ()
|
|
|
|
|
{
|
|
|
|
|
memset ((void *) fb_low_counter, '\0', sizeof (fb_low_counter));
|
|
|
|
|
} /* fb_label_init() */
|
|
|
|
|
|
|
|
|
|
/* add one to the instance number of this fb label */
|
|
|
|
|
void
|
|
|
|
|
fb_label_instance_inc (label)
|
|
|
|
|
long label;
|
|
|
|
|
{
|
|
|
|
|
long *i;
|
|
|
|
|
|
|
|
|
|
if (label < FB_LABEL_SPECIAL)
|
|
|
|
|
{
|
|
|
|
|
++fb_low_counter[label];
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-07 22:07:12 +02:00
|
|
|
|
if (fb_labels != NULL)
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
1993-07-07 22:07:12 +02:00
|
|
|
|
for (i = fb_labels + FB_LABEL_SPECIAL;
|
|
|
|
|
i < fb_labels + fb_label_count; ++i)
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
1993-07-07 22:07:12 +02:00
|
|
|
|
if (*i == label)
|
|
|
|
|
{
|
|
|
|
|
++fb_label_instances[i - fb_labels];
|
|
|
|
|
return;
|
|
|
|
|
} /* if we find it */
|
|
|
|
|
} /* for each existing label */
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/* if we get to here, we don't have label listed yet. */
|
|
|
|
|
|
|
|
|
|
if (fb_labels == NULL)
|
|
|
|
|
{
|
|
|
|
|
fb_labels = (long *) xmalloc (FB_LABEL_BUMP_BY * sizeof (long));
|
|
|
|
|
fb_label_instances = (long *) xmalloc (FB_LABEL_BUMP_BY * sizeof (long));
|
|
|
|
|
fb_label_max = FB_LABEL_BUMP_BY;
|
|
|
|
|
fb_label_count = FB_LABEL_SPECIAL;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (fb_label_count == fb_label_max)
|
|
|
|
|
{
|
|
|
|
|
fb_label_max += FB_LABEL_BUMP_BY;
|
|
|
|
|
fb_labels = (long *) xrealloc ((char *) fb_labels,
|
|
|
|
|
fb_label_max * sizeof (long));
|
|
|
|
|
fb_label_instances = (long *) xrealloc ((char *) fb_label_instances,
|
|
|
|
|
fb_label_max * sizeof (long));
|
|
|
|
|
} /* if we needed to grow */
|
|
|
|
|
|
|
|
|
|
fb_labels[fb_label_count] = label;
|
|
|
|
|
fb_label_instances[fb_label_count] = 1;
|
|
|
|
|
++fb_label_count;
|
1993-09-01 21:29:02 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
static long
|
|
|
|
|
fb_label_instance (label)
|
|
|
|
|
long label;
|
|
|
|
|
{
|
|
|
|
|
long *i;
|
|
|
|
|
|
|
|
|
|
if (label < FB_LABEL_SPECIAL)
|
|
|
|
|
{
|
|
|
|
|
return (fb_low_counter[label]);
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-07 22:07:12 +02:00
|
|
|
|
if (fb_labels != NULL)
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
1993-07-07 22:07:12 +02:00
|
|
|
|
for (i = fb_labels + FB_LABEL_SPECIAL;
|
|
|
|
|
i < fb_labels + fb_label_count; ++i)
|
1992-11-23 21:39:57 +01:00
|
|
|
|
{
|
1993-07-07 22:07:12 +02:00
|
|
|
|
if (*i == label)
|
|
|
|
|
{
|
|
|
|
|
return (fb_label_instances[i - fb_labels]);
|
|
|
|
|
} /* if we find it */
|
|
|
|
|
} /* for each existing label */
|
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
1993-07-07 22:07:12 +02:00
|
|
|
|
/* We didn't find the label, so this must be a reference to the
|
|
|
|
|
first instance. */
|
|
|
|
|
return 0;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* fb_label_name()
|
|
|
|
|
*
|
|
|
|
|
* Caller must copy returned name: we re-use the area for the next name.
|
|
|
|
|
*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* The mth occurence of label n: is turned into the symbol "Ln^Bm"
|
|
|
|
|
* where n is the label number and m is the instance number. "L" makes
|
|
|
|
|
* it a label discarded unless debugging and "^B"('\2') ensures no
|
|
|
|
|
* ordinary symbol SHOULD get the same name as a local label
|
|
|
|
|
* symbol. The first "4:" is "L4^B1" - the m numbers begin at 1.
|
1992-11-23 21:39:57 +01:00
|
|
|
|
*
|
1993-07-07 18:25:37 +02:00
|
|
|
|
* dollar labels get the same treatment, except that ^A is used in place of ^B. */
|
1992-11-23 21:39:57 +01:00
|
|
|
|
|
|
|
|
|
char * /* Return local label name. */
|
|
|
|
|
fb_label_name (n, augend)
|
|
|
|
|
long n; /* we just saw "n:", "nf" or "nb" : n a number */
|
|
|
|
|
long augend; /* 0 for nb, 1 for n:, nf */
|
|
|
|
|
{
|
|
|
|
|
long i;
|
|
|
|
|
/* Returned to caller, then copied. used for created names ("4f") */
|
|
|
|
|
static char symbol_name_build[24];
|
|
|
|
|
register char *p;
|
|
|
|
|
register char *q;
|
|
|
|
|
char symbol_name_temporary[20]; /* build up a number, BACKWARDS */
|
|
|
|
|
|
|
|
|
|
know (n >= 0);
|
|
|
|
|
know (augend == 0 || augend == 1);
|
|
|
|
|
p = symbol_name_build;
|
|
|
|
|
*p++ = 'L';
|
|
|
|
|
|
|
|
|
|
/* Next code just does sprintf( {}, "%d", n); */
|
|
|
|
|
/* label number */
|
|
|
|
|
q = symbol_name_temporary;
|
|
|
|
|
for (*q++ = 0, i = n; i; ++q)
|
|
|
|
|
{
|
|
|
|
|
*q = i % 10 + '0';
|
|
|
|
|
i /= 10;
|
|
|
|
|
}
|
|
|
|
|
while ((*p = *--q) != '\0')
|
|
|
|
|
++p;
|
|
|
|
|
|
|
|
|
|
*p++ = 2; /* ^B */
|
|
|
|
|
|
|
|
|
|
/* instance number */
|
|
|
|
|
q = symbol_name_temporary;
|
|
|
|
|
for (*q++ = 0, i = fb_label_instance (n) + augend; i; ++q)
|
|
|
|
|
{
|
|
|
|
|
*q = i % 10 + '0';
|
|
|
|
|
i /= 10;
|
|
|
|
|
}
|
|
|
|
|
while ((*p++ = *--q) != '\0');;
|
|
|
|
|
|
|
|
|
|
/* The label, as a '\0' ended string, starts at symbol_name_build. */
|
|
|
|
|
return (symbol_name_build);
|
|
|
|
|
} /* fb_label_name() */
|
|
|
|
|
|
|
|
|
|
#endif /* LOCAL_LABELS_FB */
|
1991-04-04 20:19:53 +02:00
|
|
|
|
|
|
|
|
|
|
1991-11-06 03:27:02 +01:00
|
|
|
|
/*
|
1992-11-23 21:39:57 +01:00
|
|
|
|
* decode name that may have been generated by foo_label_name() above. If
|
|
|
|
|
* the name wasn't generated by foo_label_name(), then return it unaltered.
|
1991-11-06 03:27:02 +01:00
|
|
|
|
* This is used for error messages.
|
|
|
|
|
*/
|
1992-02-13 09:33:54 +01:00
|
|
|
|
|
1992-11-23 21:39:57 +01:00
|
|
|
|
char *
|
|
|
|
|
decode_local_label_name (s)
|
|
|
|
|
char *s;
|
1991-11-06 03:27:02 +01:00
|
|
|
|
{
|
1992-11-23 21:39:57 +01:00
|
|
|
|
char *p;
|
|
|
|
|
char *symbol_decode;
|
|
|
|
|
int label_number;
|
|
|
|
|
int instance_number;
|
|
|
|
|
char *type;
|
|
|
|
|
const char *message_format = "\"%d\" (instance number %d of a %s label)";
|
|
|
|
|
|
|
|
|
|
if (s[0] != 'L')
|
|
|
|
|
return (s);
|
|
|
|
|
|
|
|
|
|
for (label_number = 0, p = s + 1; isdigit (*p); ++p)
|
|
|
|
|
{
|
|
|
|
|
label_number = (10 * label_number) + *p - '0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*p == 1)
|
|
|
|
|
{
|
|
|
|
|
type = "dollar";
|
|
|
|
|
}
|
|
|
|
|
else if (*p == 2)
|
|
|
|
|
{
|
|
|
|
|
type = "fb";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
return (s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (instance_number = 0, p = s + 1; isdigit (*p); ++p)
|
|
|
|
|
{
|
|
|
|
|
instance_number = (10 * instance_number) + *p - '0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
symbol_decode = obstack_alloc (¬es, strlen (message_format) + 30);
|
|
|
|
|
(void) sprintf (symbol_decode, message_format, label_number,
|
|
|
|
|
instance_number, type);
|
|
|
|
|
|
|
|
|
|
return (symbol_decode);
|
|
|
|
|
} /* decode_local_label_name() */
|
1991-11-06 03:27:02 +01:00
|
|
|
|
|
* Changes to keep a full expression as the value of a symbol, not
just a longword:
* struc-symbol.h: New field sy_value.
* as.h: Include expr.h before struc-symbol.h.
* expr.h: Use struct symbol rather than symbolS.
* symbols.c (S_GET_VALUE, S_SET_VALUE): Rewrote to retrieve value
of sy_value field; compile unconditionally, not just if
BFD_ASSEMBLER.
* symbols.h: Compile S_{SG}ET_VALUE prototypes unconditionally.
* write.c (write_object_file): Set BFD symbol value to gas symbol
value.
* config/obj-aout.h, config/obj-bout.h, config/obj-coff.h,
config/obj-coffbfd.h, config/obj-generic.h, config/obj-vms.h
(S_GET_VALUE, S_SET_VALUE): Removed macro definitions.
* config/obj-ieee.c (S_GET_VALUE, S_SET_VALUE): Removed.
* config/obj-coff.h, obj-coffbfd.h: Rewrote several macros to use
S_GET_VALUE rather than ost_entry.n_value.
* config/obj-aout.c (obj_symbol_to_chars), config/obj-bout.c
(obj_symbol_to_chars), config/obj-coff.c (obj_symbol_to_chars),
config/obj-coffbfd.c (symbol_to_chars): Get value to write out
using S_GET_VALUE--don't assume it is already set.
* config/obj-ieee.c (do_symbols): Set BFD symbol value to gas
symbol value.
* config/obj-vms.c (various): Don't assign directly to
S_GET_VALUE; use S_SET_VALUE instead.
1993-07-14 21:35:45 +02:00
|
|
|
|
/* Get the value of a symbol. */
|
|
|
|
|
|
|
|
|
|
valueT
|
|
|
|
|
S_GET_VALUE (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
1994-09-28 21:27:31 +01:00
|
|
|
|
if (!s->sy_resolved && !s->sy_resolving && s->sy_value.X_op != O_constant)
|
|
|
|
|
resolve_symbol_value (s);
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
if (s->sy_value.X_op != O_constant)
|
1993-07-15 00:21:25 +02:00
|
|
|
|
as_bad ("Attempt to get value of unresolved symbol %s", S_GET_NAME (s));
|
* Changes to keep a full expression as the value of a symbol, not
just a longword:
* struc-symbol.h: New field sy_value.
* as.h: Include expr.h before struc-symbol.h.
* expr.h: Use struct symbol rather than symbolS.
* symbols.c (S_GET_VALUE, S_SET_VALUE): Rewrote to retrieve value
of sy_value field; compile unconditionally, not just if
BFD_ASSEMBLER.
* symbols.h: Compile S_{SG}ET_VALUE prototypes unconditionally.
* write.c (write_object_file): Set BFD symbol value to gas symbol
value.
* config/obj-aout.h, config/obj-bout.h, config/obj-coff.h,
config/obj-coffbfd.h, config/obj-generic.h, config/obj-vms.h
(S_GET_VALUE, S_SET_VALUE): Removed macro definitions.
* config/obj-ieee.c (S_GET_VALUE, S_SET_VALUE): Removed.
* config/obj-coff.h, obj-coffbfd.h: Rewrote several macros to use
S_GET_VALUE rather than ost_entry.n_value.
* config/obj-aout.c (obj_symbol_to_chars), config/obj-bout.c
(obj_symbol_to_chars), config/obj-coff.c (obj_symbol_to_chars),
config/obj-coffbfd.c (symbol_to_chars): Get value to write out
using S_GET_VALUE--don't assume it is already set.
* config/obj-ieee.c (do_symbols): Set BFD symbol value to gas
symbol value.
* config/obj-vms.c (various): Don't assign directly to
S_GET_VALUE; use S_SET_VALUE instead.
1993-07-14 21:35:45 +02:00
|
|
|
|
return (valueT) s->sy_value.X_add_number;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the value of a symbol. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_SET_VALUE (s, val)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
valueT val;
|
|
|
|
|
{
|
* Extensive changes to permit symbols to contain any expression
type and to delay the computation of the expression until the
value is actually needed. This permits setting symbols to values
calculated based on object code size. Expressions were changed to
no longer be in a section, to stop the overloading of segment and
expression type that previously occurred.
* as.c (big_section, pass1_section, diff_section, absent_section):
Removed.
(expr_section): Added (used for dummy symbols which hold
intermediate expression values).
(perform_an_assembly_pass): Create expr_section, do not create the
sections now removed.
* as.h (segT): Removed SEG_ABSENT, SEG_PASS1, SEG_BIG, and
SEG_DIFFERENCE. Added SEG_EXPR.
(SEG_NORMAL): Corresponding changes.
* subsegs.c (seg_name, subsegs_begin): Changed accordingly.
* write.c (write_object_file): Ditto.
* config/obj-aout.c (seg_N_TYPE): Ditto.
* config/obj-bout.c (seg_N_TYPE): Ditto.
* config/obj-coff.c (seg_N_TYPE): Ditto.
* config/obj-coffbfd.c (seg_N_TYPE): Ditto.
* config/obj-vms.c (seg_N_TYPE): Ditto.
* expr.h (operatorT): Moved in from expr.c, added some values.
(expressionS): Added X_op field, removed X_seg field; renamed
X_subtract_symbol to X_op_symbol.
* expr.c: Extensive changes to assign expression types rather than
sections and to simplify the parsing.
* write.c (fix_new_internal): New static function.
(fix_new): Removed sub_symbol argument.
(fix_new_exp): New function, takes expression argument.
* write.h: Prototype changes for fix_new and fix_new_exp.
* cond.c (s_if): Changed accordingly.
* read.c (s_lsym, pseudo_set, emit_expr, parse_bitfield_cons,
parse_repeat_cons, get_segmented_expression,
get_known_segmented_expression, get_absolute_expression): Ditto.
* symbols.c (resolve_symbol_value, S_GET_VALUE, S_SET_VALUE):
Ditto.
* write.c (write_object_file): Ditto.
* config/obj-coff.c (obj_coff_def, obj_coff_val): Ditto.
* config/obj-coffbfd.c (obj_coff_def, obj_coff_val,
obj_coff_endef, yank_symbols): Ditto.
* config/obj-elf.c (obj_elf_stab_generic, obj_elf_size): Ditto.
* config/tc-a29k.c (md_assemble, parse_operand, machine_ip,
print_insn, md_operand): Ditto.
* config/tc-h8300.c (parse_exp, colonmod24, check_operand,
do_a_fix_imm, build_bytes): Ditto.
* config/tc-h8500.c (parse_exp, skip_colonthing, parse_reglist,
get_specific, check, insert, md_convert_frag): Ditto.
* config/tc-hppa.c (the_insn, fix_new_hppa, cons_fix_new_hppa,
md_assemble, pa_ip, getExpression, getAbsoluteExpression,
evaluateAbsolute, pa_build_unwind_subspace, pa_entry,
process_exit): Ditto.
* config/tc-hppa.h (STAB_FIXUP, is_DP_relative, is_PC_relative,
is_complex): Ditto.
* config/tc-i386.c (pe, md_assemble, i386_operand,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-i860.c (md_assemble, getExpression, print_insn):
Ditto.
* config/tc-i960.c (parse_expr, subs, segs, md_convert_frag,
get_cdisp, mem_fmt, parse_ldconst, relax_cobr, s_sysproc,
i960_handle_align): Ditto.
* config/tc-m68k.c (struct m68k_exp, struct m68k_it, seg, op,
subs, add_fix, isvar, m68k_ip, md_assemble, md_convert_frag_1,
md_estimate_size_before_relax, md_create_long_jump, get_num):
Ditto.
* config/tc-m88k.c (md_assemble, get_imm16, get_pcr,
md_create_short_jump, md_create_long_jump): Ditto.
* config/tc-mips.c (md_assemble, append_insn, gp_reference,
macro_build, macro, my_getExpression): Ditto. Also removed
get_optional_absolute_expression; just use get_absolute_expression
instead.
* config/tc-ns32k.c (get_addr_mode, evaluate_expr, convert_iif,
fix_new_ns32k, fix_new_ns32k_exp, cons_fix_new_ns32k): Ditto.
* config/tc-ns32k.h (fix_new_ns32k prototype): Ditto.
* config/tc-sh.c (parse_exp, check, insert, md_convert_frag):
Ditto.
* config/tc-sparc.c (md_assemble, sparc_ip, getExpression,
print_insn): Ditto.
* config/tc-tahoe.c (struct top, md_estimate_size_before_relax,
tip_op, md_assemble): Ditto.
* config/tc-vax.c (seg_of_operand, md_assemble,
md_estimate_size_before_relax, md_create_long_jump): Ditto.
* config/tc-z8k.c (parse_exp, check_operand, newfix): Ditto.
1993-07-21 02:41:42 +02:00
|
|
|
|
s->sy_value.X_op = O_constant;
|
* Changes to keep a full expression as the value of a symbol, not
just a longword:
* struc-symbol.h: New field sy_value.
* as.h: Include expr.h before struc-symbol.h.
* expr.h: Use struct symbol rather than symbolS.
* symbols.c (S_GET_VALUE, S_SET_VALUE): Rewrote to retrieve value
of sy_value field; compile unconditionally, not just if
BFD_ASSEMBLER.
* symbols.h: Compile S_{SG}ET_VALUE prototypes unconditionally.
* write.c (write_object_file): Set BFD symbol value to gas symbol
value.
* config/obj-aout.h, config/obj-bout.h, config/obj-coff.h,
config/obj-coffbfd.h, config/obj-generic.h, config/obj-vms.h
(S_GET_VALUE, S_SET_VALUE): Removed macro definitions.
* config/obj-ieee.c (S_GET_VALUE, S_SET_VALUE): Removed.
* config/obj-coff.h, obj-coffbfd.h: Rewrote several macros to use
S_GET_VALUE rather than ost_entry.n_value.
* config/obj-aout.c (obj_symbol_to_chars), config/obj-bout.c
(obj_symbol_to_chars), config/obj-coff.c (obj_symbol_to_chars),
config/obj-coffbfd.c (symbol_to_chars): Get value to write out
using S_GET_VALUE--don't assume it is already set.
* config/obj-ieee.c (do_symbols): Set BFD symbol value to gas
symbol value.
* config/obj-vms.c (various): Don't assign directly to
S_GET_VALUE; use S_SET_VALUE instead.
1993-07-14 21:35:45 +02:00
|
|
|
|
s->sy_value.X_add_number = (offsetT) val;
|
1994-01-25 01:20:48 +01:00
|
|
|
|
s->sy_value.X_unsigned = 0;
|
* Changes to keep a full expression as the value of a symbol, not
just a longword:
* struc-symbol.h: New field sy_value.
* as.h: Include expr.h before struc-symbol.h.
* expr.h: Use struct symbol rather than symbolS.
* symbols.c (S_GET_VALUE, S_SET_VALUE): Rewrote to retrieve value
of sy_value field; compile unconditionally, not just if
BFD_ASSEMBLER.
* symbols.h: Compile S_{SG}ET_VALUE prototypes unconditionally.
* write.c (write_object_file): Set BFD symbol value to gas symbol
value.
* config/obj-aout.h, config/obj-bout.h, config/obj-coff.h,
config/obj-coffbfd.h, config/obj-generic.h, config/obj-vms.h
(S_GET_VALUE, S_SET_VALUE): Removed macro definitions.
* config/obj-ieee.c (S_GET_VALUE, S_SET_VALUE): Removed.
* config/obj-coff.h, obj-coffbfd.h: Rewrote several macros to use
S_GET_VALUE rather than ost_entry.n_value.
* config/obj-aout.c (obj_symbol_to_chars), config/obj-bout.c
(obj_symbol_to_chars), config/obj-coff.c (obj_symbol_to_chars),
config/obj-coffbfd.c (symbol_to_chars): Get value to write out
using S_GET_VALUE--don't assume it is already set.
* config/obj-ieee.c (do_symbols): Set BFD symbol value to gas
symbol value.
* config/obj-vms.c (various): Don't assign directly to
S_GET_VALUE; use S_SET_VALUE instead.
1993-07-14 21:35:45 +02:00
|
|
|
|
}
|
|
|
|
|
|
1994-09-28 21:27:31 +01:00
|
|
|
|
void
|
|
|
|
|
copy_symbol_attributes (dest, src)
|
|
|
|
|
symbolS *dest, *src;
|
|
|
|
|
{
|
|
|
|
|
#ifdef BFD_ASSEMBLER
|
|
|
|
|
/* In an expression, transfer the settings of these flags.
|
|
|
|
|
The user can override later, of course. */
|
|
|
|
|
#define COPIED_SYMFLAGS (BSF_FUNCTION)
|
|
|
|
|
dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef OBJ_COPY_SYMBOL_ATTRIBUTES
|
|
|
|
|
OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
1993-07-07 18:25:37 +02:00
|
|
|
|
#ifdef BFD_ASSEMBLER
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_EXTERNAL (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
flagword flags = s->bsym->flags;
|
|
|
|
|
|
|
|
|
|
/* sanity check */
|
1994-01-25 01:20:48 +01:00
|
|
|
|
if (flags & BSF_LOCAL && flags & BSF_GLOBAL)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
abort ();
|
|
|
|
|
|
1994-01-25 01:20:48 +01:00
|
|
|
|
return (flags & BSF_GLOBAL) != 0;
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_COMMON (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
1994-01-25 01:20:48 +01:00
|
|
|
|
return bfd_is_com_section (s->bsym->section);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_DEFINED (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
return s->bsym->section != undefined_section;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_DEBUG (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
if (s->bsym->flags & BSF_DEBUGGING)
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_LOCAL (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
flagword flags = s->bsym->flags;
|
|
|
|
|
|
|
|
|
|
/* sanity check */
|
1994-01-25 01:20:48 +01:00
|
|
|
|
if (flags & BSF_LOCAL && flags & BSF_GLOBAL)
|
1993-07-07 18:25:37 +02:00
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
return (S_GET_NAME (s)
|
|
|
|
|
&& ! S_IS_DEBUG (s)
|
|
|
|
|
&& (strchr (S_GET_NAME (s), '\001')
|
|
|
|
|
|| strchr (S_GET_NAME (s), '\002')
|
|
|
|
|
|| (S_LOCAL_NAME (s)
|
1994-09-13 03:50:02 +02:00
|
|
|
|
&& !flag_keep_locals)));
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_EXTERN (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
return S_IS_EXTERNAL (s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
S_IS_STABD (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
return S_GET_NAME (s) == 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CONST char *
|
|
|
|
|
S_GET_NAME (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
return s->bsym->name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
segT
|
|
|
|
|
S_GET_SEGMENT (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
return s->bsym->section;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_SET_SEGMENT (s, seg)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
segT seg;
|
|
|
|
|
{
|
|
|
|
|
s->bsym->section = seg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_SET_EXTERNAL (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
1993-09-01 21:29:02 +02:00
|
|
|
|
s->bsym->flags |= BSF_GLOBAL;
|
|
|
|
|
s->bsym->flags &= ~(BSF_LOCAL|BSF_WEAK);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_CLEAR_EXTERNAL (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
s->bsym->flags |= BSF_LOCAL;
|
1993-09-01 21:29:02 +02:00
|
|
|
|
s->bsym->flags &= ~(BSF_GLOBAL|BSF_WEAK);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_SET_WEAK (s)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
{
|
|
|
|
|
s->bsym->flags |= BSF_WEAK;
|
|
|
|
|
s->bsym->flags &= ~(BSF_GLOBAL|BSF_LOCAL);
|
1993-07-07 18:25:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
S_SET_NAME (s, name)
|
|
|
|
|
symbolS *s;
|
|
|
|
|
char *name;
|
|
|
|
|
{
|
|
|
|
|
s->bsym->name = name;
|
|
|
|
|
}
|
|
|
|
|
#endif /* BFD_ASSEMBLER */
|
|
|
|
|
|
1994-01-28 01:03:38 +01:00
|
|
|
|
void
|
|
|
|
|
symbol_begin ()
|
|
|
|
|
{
|
|
|
|
|
symbol_lastP = NULL;
|
|
|
|
|
symbol_rootP = NULL; /* In case we have 0 symbols (!!) */
|
|
|
|
|
sy_hash = hash_new ();
|
1994-09-13 03:50:02 +02:00
|
|
|
|
|
1994-01-28 01:03:38 +01:00
|
|
|
|
memset ((char *) (&abs_symbol), '\0', sizeof (abs_symbol));
|
|
|
|
|
#ifdef BFD_ASSEMBLER
|
1994-09-13 03:50:02 +02:00
|
|
|
|
#if defined (EMIT_SECTION_SYMBOLS) || !defined (RELOC_REQUIRES_SYMBOL)
|
1994-01-28 01:03:38 +01:00
|
|
|
|
abs_symbol.bsym = bfd_abs_section.symbol;
|
1994-09-13 03:50:02 +02:00
|
|
|
|
#endif
|
1994-01-28 01:03:38 +01:00
|
|
|
|
#else
|
|
|
|
|
/* Can't initialise a union. Sigh. */
|
|
|
|
|
S_SET_SEGMENT (&abs_symbol, absolute_section);
|
|
|
|
|
#endif
|
1994-09-13 03:50:02 +02:00
|
|
|
|
abs_symbol.sy_value.X_op = O_constant;
|
|
|
|
|
|
1994-01-28 01:03:38 +01:00
|
|
|
|
#ifdef LOCAL_LABELS_FB
|
|
|
|
|
fb_label_init ();
|
|
|
|
|
#endif /* LOCAL_LABELS_FB */
|
|
|
|
|
}
|
|
|
|
|
|
1994-09-28 21:27:31 +01:00
|
|
|
|
|
|
|
|
|
int indent_level;
|
1994-09-13 03:50:02 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
indent ()
|
|
|
|
|
{
|
|
|
|
|
printf ("%*s", indent_level * 4, "");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void print_expr_1 PARAMS ((FILE *, expressionS *));
|
|
|
|
|
void print_symbol_value_1 PARAMS ((FILE *, symbolS *));
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_symbol_value_1 (file, sym)
|
|
|
|
|
FILE *file;
|
|
|
|
|
symbolS *sym;
|
|
|
|
|
{
|
|
|
|
|
const char *name = S_GET_NAME (sym);
|
|
|
|
|
if (!name || !name[0])
|
|
|
|
|
name = "(unnamed)";
|
1994-09-28 21:27:31 +01:00
|
|
|
|
fprintf (file, "sym %lx %s", sym, name);
|
|
|
|
|
if (sym->sy_frag != &zero_address_frag)
|
|
|
|
|
fprintf (file, " frag %lx", (long) sym->sy_frag);
|
1994-09-13 03:50:02 +02:00
|
|
|
|
if (sym->written)
|
|
|
|
|
fprintf (file, " written");
|
|
|
|
|
if (sym->sy_resolved)
|
|
|
|
|
fprintf (file, " resolved");
|
1994-09-28 21:27:31 +01:00
|
|
|
|
else if (sym->sy_resolving)
|
1994-09-13 03:50:02 +02:00
|
|
|
|
fprintf (file, " resolving");
|
|
|
|
|
if (sym->sy_used_in_reloc)
|
|
|
|
|
fprintf (file, " used-in-reloc");
|
|
|
|
|
if (sym->sy_used)
|
|
|
|
|
fprintf (file, " used");
|
1994-12-20 23:42:03 +01:00
|
|
|
|
if (S_IS_LOCAL (sym))
|
|
|
|
|
fprintf (file, " local");
|
|
|
|
|
if (S_IS_EXTERN (sym))
|
|
|
|
|
fprintf (file, " extern");
|
|
|
|
|
if (S_IS_DEBUG (sym))
|
|
|
|
|
fprintf (file, " debug");
|
|
|
|
|
if (S_IS_DEFINED (sym))
|
|
|
|
|
fprintf (file, " defined");
|
1994-09-28 21:27:31 +01:00
|
|
|
|
fprintf (file, " %s", segment_name (S_GET_SEGMENT (sym)));
|
1994-09-13 03:50:02 +02:00
|
|
|
|
if (sym->sy_resolved)
|
|
|
|
|
{
|
1994-09-28 21:27:31 +01:00
|
|
|
|
segT s = S_GET_SEGMENT (sym);
|
|
|
|
|
|
|
|
|
|
if (s != undefined_section
|
|
|
|
|
&& s != expr_section)
|
|
|
|
|
fprintf (file, " %lx", (long) S_GET_VALUE (sym));
|
1994-09-13 03:50:02 +02:00
|
|
|
|
}
|
1994-09-28 21:27:31 +01:00
|
|
|
|
else if (indent_level < 8 && S_GET_SEGMENT (sym) != undefined_section)
|
1994-09-13 03:50:02 +02:00
|
|
|
|
{
|
|
|
|
|
indent_level++;
|
|
|
|
|
fprintf (file, "\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_expr_1 (file, &sym->sy_value);
|
|
|
|
|
fprintf (file, ">");
|
|
|
|
|
indent_level--;
|
|
|
|
|
}
|
|
|
|
|
fflush (file);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_symbol_value (sym)
|
|
|
|
|
symbolS *sym;
|
|
|
|
|
{
|
|
|
|
|
indent_level = 0;
|
|
|
|
|
print_symbol_value_1 (stderr, sym);
|
|
|
|
|
fprintf (stderr, "\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_expr_1 (file, exp)
|
|
|
|
|
FILE *file;
|
|
|
|
|
expressionS *exp;
|
|
|
|
|
{
|
|
|
|
|
fprintf (file, "expr %lx ", (long) exp);
|
|
|
|
|
switch (exp->X_op)
|
|
|
|
|
{
|
|
|
|
|
case O_illegal:
|
|
|
|
|
fprintf (file, "illegal");
|
|
|
|
|
break;
|
|
|
|
|
case O_absent:
|
|
|
|
|
fprintf (file, "absent");
|
|
|
|
|
break;
|
|
|
|
|
case O_constant:
|
|
|
|
|
fprintf (file, "constant %lx", (long) exp->X_add_number);
|
|
|
|
|
break;
|
|
|
|
|
case O_symbol:
|
|
|
|
|
indent_level++;
|
|
|
|
|
fprintf (file, "symbol\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_symbol_value_1 (file, exp->X_add_symbol);
|
|
|
|
|
fprintf (file, ">");
|
|
|
|
|
maybe_print_addnum:
|
|
|
|
|
if (exp->X_add_number)
|
1994-09-28 21:27:31 +01:00
|
|
|
|
fprintf (file, "\n%*s%lx", indent_level * 4, "",
|
1994-09-13 03:50:02 +02:00
|
|
|
|
(long) exp->X_add_number);
|
1994-09-28 21:27:31 +01:00
|
|
|
|
indent_level--;
|
1994-09-13 03:50:02 +02:00
|
|
|
|
break;
|
|
|
|
|
case O_register:
|
|
|
|
|
fprintf (file, "register #%d", (int) exp->X_add_number);
|
|
|
|
|
break;
|
|
|
|
|
case O_big:
|
|
|
|
|
fprintf (file, "big");
|
|
|
|
|
break;
|
|
|
|
|
case O_uminus:
|
|
|
|
|
fprintf (file, "uminus -<");
|
|
|
|
|
indent_level++;
|
|
|
|
|
print_symbol_value_1 (file, exp->X_add_symbol);
|
|
|
|
|
fprintf (file, ">");
|
|
|
|
|
goto maybe_print_addnum;
|
|
|
|
|
case O_bit_not:
|
|
|
|
|
fprintf (file, "bit_not");
|
|
|
|
|
break;
|
|
|
|
|
case O_multiply:
|
|
|
|
|
fprintf (file, "multiply");
|
|
|
|
|
break;
|
|
|
|
|
case O_divide:
|
|
|
|
|
fprintf (file, "divide");
|
|
|
|
|
break;
|
|
|
|
|
case O_modulus:
|
|
|
|
|
fprintf (file, "modulus");
|
|
|
|
|
break;
|
|
|
|
|
case O_left_shift:
|
|
|
|
|
fprintf (file, "lshift");
|
|
|
|
|
break;
|
|
|
|
|
case O_right_shift:
|
|
|
|
|
fprintf (file, "rshift");
|
|
|
|
|
break;
|
|
|
|
|
case O_bit_inclusive_or:
|
|
|
|
|
fprintf (file, "bit_ior");
|
|
|
|
|
break;
|
|
|
|
|
case O_bit_exclusive_or:
|
|
|
|
|
fprintf (file, "bit_xor");
|
|
|
|
|
break;
|
|
|
|
|
case O_bit_and:
|
|
|
|
|
fprintf (file, "bit_and");
|
|
|
|
|
break;
|
|
|
|
|
case O_add:
|
|
|
|
|
indent_level++;
|
|
|
|
|
fprintf (file, "add\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_symbol_value_1 (file, exp->X_add_symbol);
|
|
|
|
|
fprintf (file, ">\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_symbol_value_1 (file, exp->X_op_symbol);
|
|
|
|
|
fprintf (file, ">");
|
|
|
|
|
goto maybe_print_addnum;
|
|
|
|
|
case O_subtract:
|
|
|
|
|
indent_level++;
|
|
|
|
|
fprintf (file, "subtract\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_symbol_value_1 (file, exp->X_add_symbol);
|
|
|
|
|
fprintf (file, ">\n%*s<", indent_level * 4, "");
|
|
|
|
|
print_symbol_value_1 (file, exp->X_op_symbol);
|
|
|
|
|
fprintf (file, ">");
|
|
|
|
|
goto maybe_print_addnum;
|
|
|
|
|
default:
|
|
|
|
|
fprintf (file, "{unknown opcode %d}", (int) exp->X_op);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
fflush (stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_expr (exp)
|
|
|
|
|
expressionS *exp;
|
|
|
|
|
{
|
|
|
|
|
print_expr_1 (stderr, exp);
|
|
|
|
|
fprintf (stderr, "\n");
|
|
|
|
|
}
|
|
|
|
|
|
1992-02-13 10:13:54 +01:00
|
|
|
|
/* end of symbols.c */
|