espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 19:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Thu Mar 20 13:42:01 1997 H.J. Lu <hjl@lucon.org>

Browse Source 
* frags.c (frag_var): Change offset parameter to offsetT.
	(frag_variant): Likewise.
	* frags.h (frag_variant, frag_var): Update declarations.
	* config/tc-m68k.c (struct m68k_it): Change foff field to
	offsetT.
	(add_frag): Change off parameter to offsetT.
	* Several files: Add casts to calls to frag_var.
This commit is contained in:
Ian Lance Taylor
1997-03-20 19:08:35 +00:00
parent 65b784d8a5
commit f59fb6cac7
7 changed files with 101 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -1,5 +1,13 @@
Thu Mar 20 13:42:01 1997 H.J. Lu <hjl@lucon.org> Thu Mar 20 13:42:01 1997 H.J. Lu <hjl@lucon.org>
* frags.c (frag_var): Change offset parameter to offsetT.
(frag_variant): Likewise.
* frags.h (frag_variant, frag_var): Update declarations.
* config/tc-m68k.c (struct m68k_it): Change foff field to
offsetT.
(add_frag): Change off parameter to offsetT.
* Several files: Add casts to calls to frag_var.
* Makefile.in (m68k-parse.c): Depend upon itbl-parse.c, to * Makefile.in (m68k-parse.c): Depend upon itbl-parse.c, to
serialize a parallel make. serialize a parallel make.
(itbl-parse.h): Split target out from itbl-parse.c. (itbl-parse.h): Split target out from itbl-parse.c.

17
gas/config/tc-i386.c
View File

@ -37,6 +37,18 @@
#define TC_RELOC(X,Y) (Y) #define TC_RELOC(X,Y) (Y)
#endif #endif
static unsigned long mode_from_disp_size PARAMS ((unsigned long));
static int fits_in_signed_byte PARAMS ((long));
static int fits_in_unsigned_byte PARAMS ((long));
static int fits_in_unsigned_word PARAMS ((long));
static int fits_in_signed_word PARAMS ((long));
static int smallest_imm_type PARAMS ((long));
static void set_16bit_code_flag PARAMS ((int));
#ifdef BFD_ASSEMBLER
static bfd_reloc_code_real_type reloc
PARAMS ((int, int, bfd_reloc_code_real_type));
#endif
/* 'md_assemble ()' gathers together information and puts it into a /* 'md_assemble ()' gathers together information and puts it into a
i386_insn. */ i386_insn. */
@ -409,7 +421,8 @@ smallest_imm_type (num)
: (Imm32)); : (Imm32));
} /* smallest_imm_type() */ } /* smallest_imm_type() */
void set_16bit_code_flag(new_16bit_code_flag) static void
set_16bit_code_flag (new_16bit_code_flag)
int new_16bit_code_flag; int new_16bit_code_flag;
{ {
flag_16bit_code = new_16bit_code_flag; flag_16bit_code = new_16bit_code_flag;
@ -1679,7 +1692,7 @@ md_assemble (line)
? ENCODE_RELAX_STATE (UNCOND_JUMP, BYTE) ? ENCODE_RELAX_STATE (UNCOND_JUMP, BYTE)
: ENCODE_RELAX_STATE (COND_JUMP, BYTE)), : ENCODE_RELAX_STATE (COND_JUMP, BYTE)),
i.disps[0]->X_add_symbol, i.disps[0]->X_add_symbol,
(long) n, p); (offsetT) n, p);
} }
} }
else if (t->opcode_modifier & (JumpByte | JumpDword)) else if (t->opcode_modifier & (JumpByte | JumpDword))

25
gas/config/tc-i386.h
View File

@ -21,6 +21,10 @@
#ifndef TC_I386 #ifndef TC_I386
#define TC_I386 1 #define TC_I386 1
#ifdef ANSI_PROTOTYPES
struct fix;
#endif
#define TARGET_BYTES_BIG_ENDIAN 0 #define TARGET_BYTES_BIG_ENDIAN 0
#ifdef TE_LYNX #ifdef TE_LYNX
@ -39,6 +43,7 @@
(X) != BFD_RELOC_386_GOTPC) ? Y : X) (X) != BFD_RELOC_386_GOTPC) ? Y : X)
#define tc_fix_adjustable(X) tc_i386_fix_adjustable(X) #define tc_fix_adjustable(X) tc_i386_fix_adjustable(X)
extern int tc_i386_fix_adjustable PARAMS ((struct fix *));
/* This is the relocation type for direct references to GLOBAL_OFFSET_TABLE. /* This is the relocation type for direct references to GLOBAL_OFFSET_TABLE.
* It comes up in complicated expressions such as * It comes up in complicated expressions such as
@ -76,6 +81,9 @@
#ifdef TE_Mach #ifdef TE_Mach
#define TARGET_FORMAT "a.out-mach3" #define TARGET_FORMAT "a.out-mach3"
#endif #endif
#ifdef TE_DYNIX
#define TARGET_FORMAT "a.out-i386-dynix"
#endif
#ifndef TARGET_FORMAT #ifndef TARGET_FORMAT
#define TARGET_FORMAT "a.out-i386" #define TARGET_FORMAT "a.out-i386"
#endif #endif
@ -85,6 +93,13 @@
#define TARGET_FORMAT "elf32-i386" #define TARGET_FORMAT "elf32-i386"
#endif #endif
#ifdef OBJ_MAYBE_ELF
#ifdef OBJ_MAYBE_COFF
extern const char *i386_target_format PARAMS ((void));
#define TARGET_FORMAT i386_target_format ()
#endif
#endif
#else /* ! BFD_ASSEMBLER */ #else /* ! BFD_ASSEMBLER */
/* COFF STUFF */ /* COFF STUFF */
@ -95,7 +110,7 @@
#define TC_COUNT_RELOC(x) ((x)->fx_addsy || (x)->fx_r_type==7) #define TC_COUNT_RELOC(x) ((x)->fx_addsy || (x)->fx_r_type==7)
#define TC_FORCE_RELOCATION(x) ((x)->fx_r_type==7) #define TC_FORCE_RELOCATION(x) ((x)->fx_r_type==7)
#define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype(fixP) #define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype(fixP)
extern short tc_coff_fix2rtype (); extern short tc_coff_fix2rtype PARAMS ((struct fix *));
#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep(frag) #define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep(frag)
extern int tc_coff_sizemachdep PARAMS ((fragS *frag)); extern int tc_coff_sizemachdep PARAMS ((fragS *frag));
#define SUB_SEGMENT_ALIGN(SEG) 2 #define SUB_SEGMENT_ALIGN(SEG) 2
@ -123,14 +138,16 @@ extern int tc_coff_sizemachdep PARAMS ((fragS *frag));
#endif #endif
#define tc_coff_symbol_emit_hook(a) ; /* not used */ #define tc_coff_symbol_emit_hook(a) ; /* not used */
#ifndef BFD_ASSEMBLER
#ifndef OBJ_AOUT #ifndef OBJ_AOUT
#ifndef TE_PE #ifndef TE_PE
/* Local labels starts with .L */ /* Local labels starts with .L */
#define LOCAL_LABEL(name) (name[0] == '.' \ #define LOCAL_LABEL(name) (name[0] == '.' \
&& (name[1] == 'L' || name[1] == 'X' || name[1] == '.')) && (name[1] == 'L' || name[1] == 'X' || name[1] == '.'))
#define FAKE_LABEL_NAME ".L0\001"
#endif #endif
#endif #endif
#endif
#define LOCAL_LABELS_FB 1 #define LOCAL_LABELS_FB 1
#define tc_aout_pre_write_hook(x) {;} /* not used */ #define tc_aout_pre_write_hook(x) {;} /* not used */
@ -365,7 +382,7 @@ base_index_byte;
#endif #endif
#ifdef BFD_ASSEMBLER #ifdef BFD_ASSEMBLER
void i386_validate_fix (); void i386_validate_fix PARAMS ((struct fix *));
#define TC_VALIDATE_FIX(FIXP,SEGTYPE,SKIP) i386_validate_fix(FIXP) #define TC_VALIDATE_FIX(FIXP,SEGTYPE,SKIP) i386_validate_fix(FIXP)
#endif #endif
@ -386,7 +403,7 @@ if ((n) && !need_pass_2 \
{ \ { \
char *p; \ char *p; \
p = frag_var (rs_align_code, 15, 1, (relax_substateT) max, \ p = frag_var (rs_align_code, 15, 1, (relax_substateT) max, \
(symbolS *) 0, (long) (n), (char *) 0); \ (symbolS *) 0, (offsetT) (n), (char *) 0); \
*p = 0x90; \ *p = 0x90; \
goto around; \ goto around; \
} }

35
gas/config/tc-m68k.c
View File

@ -218,7 +218,7 @@ struct m68k_it
{ {
int fragoff; /* Where in the current opcode the frag ends */ int fragoff; /* Where in the current opcode the frag ends */
symbolS *fadd; symbolS *fadd;
long foff; offsetT foff;
int fragty; int fragty;
} }
fragb[4]; fragb[4];
@ -265,6 +265,12 @@ static struct m68k_it the_ins; /* the instruction being assembled */
#define addword(w) the_ins.opcode[the_ins.numo++]=(w) #define addword(w) the_ins.opcode[the_ins.numo++]=(w)
/* Static functions. */
static void insop PARAMS ((int, struct m68k_incant *));
static void add_fix PARAMS ((int, struct m68k_exp *, int, int));
static void add_frag PARAMS ((symbolS *, offsetT, int));
/* Like addword, but goes BEFORE general operands */ /* Like addword, but goes BEFORE general operands */
static void static void
insop (w, opcode) insop (w, opcode)
@ -286,7 +292,7 @@ insop (w, opcode)
Blecch. */ Blecch. */
static void static void
add_fix (width, exp, pc_rel, pc_fix) add_fix (width, exp, pc_rel, pc_fix)
char width; int width;
struct m68k_exp *exp; struct m68k_exp *exp;
int pc_rel; int pc_rel;
int pc_fix; int pc_fix;
@ -316,9 +322,9 @@ add_fix (width, exp, pc_rel, pc_fix)
ADD becomes the FR_SYMBOL field of the frag, and OFF the FR_OFFSET. */ ADD becomes the FR_SYMBOL field of the frag, and OFF the FR_OFFSET. */
static void static void
add_frag(add,off,type) add_frag (add, off, type)
symbolS *add; symbolS *add;
long off; offsetT off;
int type; int type;
{ {
the_ins.fragb[the_ins.nfrag].fragoff=the_ins.numo; the_ins.fragb[the_ins.nfrag].fragoff=the_ins.numo;
@ -332,6 +338,10 @@ add_frag(add,off,type)
static char *crack_operand PARAMS ((char *str, struct m68k_op *opP)); static char *crack_operand PARAMS ((char *str, struct m68k_op *opP));
static int get_num PARAMS ((struct m68k_exp *exp, int ok)); static int get_num PARAMS ((struct m68k_exp *exp, int ok));
static void m68k_ip PARAMS ((char *));
static void insert_reg PARAMS ((const char *, int));
static void select_control_regs PARAMS ((void));
static void init_regtable PARAMS ((void));
static int reverse_16_bits PARAMS ((int in)); static int reverse_16_bits PARAMS ((int in));
static int reverse_8_bits PARAMS ((int in)); static int reverse_8_bits PARAMS ((int in));
static void install_gen_operand PARAMS ((int mode, int val)); static void install_gen_operand PARAMS ((int mode, int val));
@ -359,6 +369,8 @@ static void s_mri_repeat PARAMS ((int));
static void s_mri_until PARAMS ((int)); static void s_mri_until PARAMS ((int));
static void s_mri_while PARAMS ((int)); static void s_mri_while PARAMS ((int));
static void s_mri_endw PARAMS ((int)); static void s_mri_endw PARAMS ((int));
static void md_apply_fix_2 PARAMS ((fixS *, offsetT));
static void md_convert_frag_1 PARAMS ((fragS *));
static int current_architecture; static int current_architecture;
@ -536,7 +548,10 @@ const pseudo_typeS md_pseudo_table[] =
/* The mote pseudo ops are put into the opcode table, since they /* The mote pseudo ops are put into the opcode table, since they
don't start with a . they look like opcodes to gas. don't start with a . they look like opcodes to gas.
*/ */
extern void obj_coff_section ();
#ifdef M68KCOFF
extern void obj_coff_section PARAMS ((int));
#endif
CONST pseudo_typeS mote_pseudo_table[] = CONST pseudo_typeS mote_pseudo_table[] =
{ {
@ -2450,15 +2465,15 @@ m68k_ip (instring)
if (subs (&opP->disp)) if (subs (&opP->disp))
{ {
add_fix ('l', &opP->disp, 1, 0); add_fix ('l', &opP->disp, 1, 0);
add_frag ((symbolS *) 0, (long) 0, TAB (FBRANCH, LONG)); add_frag ((symbolS *) 0, (offsetT) 0, TAB (FBRANCH, LONG));
} }
else if (adds (&opP->disp)) else if (adds (&opP->disp))
add_frag (adds (&opP->disp), offs (&opP->disp), add_frag (adds (&opP->disp), offs (&opP->disp),
TAB (FBRANCH, SZ_UNDEF)); TAB (FBRANCH, SZ_UNDEF));
else else
{ {
/* add_frag((symbolS *) 0, offs(&opP->disp), /* add_frag ((symbolS *) 0, offs (&opP->disp),
TAB(FBRANCH,SHORT)); */ TAB(FBRANCH,SHORT)); */
the_ins.opcode[the_ins.numo - 1] |= 0x40; the_ins.opcode[the_ins.numo - 1] |= 0x40;
add_fix ('l', &opP->disp, 1, 0); add_fix ('l', &opP->disp, 1, 0);
addword (0); addword (0);
@ -3061,7 +3076,7 @@ crack_operand (str, opP)
void void
insert_reg (regname, regnum) insert_reg (regname, regnum)
char *regname; const char *regname;
int regnum; int regnum;
{ {
char buf[100]; char buf[100];
@ -3871,7 +3886,6 @@ md_atof (type, litP, sizeP)
LITTLENUM_TYPE words[MAX_LITTLENUMS]; LITTLENUM_TYPE words[MAX_LITTLENUMS];
LITTLENUM_TYPE *wordP; LITTLENUM_TYPE *wordP;
char *t; char *t;
char *atof_ieee ();
switch (type) switch (type)
{ {
@ -4767,7 +4781,6 @@ get_num (exp, ok)
} }
/* These are the back-ends for the various machine dependent pseudo-ops. */ /* These are the back-ends for the various machine dependent pseudo-ops. */
void demand_empty_rest_of_line (); /* Hate those extra verbose names */
static void static void
s_data1 (ignore) s_data1 (ignore)

2
gas/config/tc-m88k.c
View File

@ -1299,7 +1299,7 @@ s_bss ()
symbolP->sy_frag = frag_now; symbolP->sy_frag = frag_now;
p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP, p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
temp, (char *)0); (offsetT) temp, (char *)0);
*p = 0; *p = 0;
S_SET_SEGMENT (symbolP, SEG_BSS); S_SET_SEGMENT (symbolP, SEG_BSS);

50
gas/config/tc-mips.c
View File

@ -1577,7 +1577,7 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
& INSN_UNCOND_BRANCH_DELAY), & INSN_UNCOND_BRANCH_DELAY),
(prev_insn_reloc_type (prev_insn_reloc_type
== BFD_RELOC_MIPS16_JMP)), == BFD_RELOC_MIPS16_JMP)),
make_expr_symbol (address_expr), (long) 0, make_expr_symbol (address_expr), (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
else if (place != NULL) else if (place != NULL)
@ -2792,8 +2792,12 @@ load_register (counter, reg, ep, dbl)
|| ! ep->X_unsigned || ! ep->X_unsigned
|| sizeof (ep->X_add_number) > 4 || sizeof (ep->X_add_number) > 4
|| (ep->X_add_number & 0x80000000) == 0)) || (ep->X_add_number & 0x80000000) == 0))
|| ((mips_isa < 3 || !dbl) || ((mips_isa < 3 || ! dbl)
&& (ep->X_add_number &~ (offsetT) 0xffffffff) == 0)) && (ep->X_add_number &~ (offsetT) 0xffffffff) == 0)
|| (mips_isa < 3
&& ! dbl
&& ((ep->X_add_number &~ (offsetT) 0xffffffff)
== ~ (offsetT) 0xffffffff)))
{ {
/* 32 bit values require an lui. */ /* 32 bit values require an lui. */
macro_build ((char *) NULL, counter, ep, "lui", "t,u", reg, macro_build ((char *) NULL, counter, ep, "lui", "t,u", reg,
@ -3051,7 +3055,7 @@ load_address (counter, reg, ep)
"t,r,j", reg, GP, (int) BFD_RELOC_MIPS_GPREL); "t,r,j", reg, GP, (int) BFD_RELOC_MIPS_GPREL);
p = frag_var (rs_machine_dependent, 8, 0, p = frag_var (rs_machine_dependent, 8, 0,
RELAX_ENCODE (4, 8, 0, 4, 0, mips_warn_about_macros), RELAX_ENCODE (4, 8, 0, 4, 0, mips_warn_about_macros),
ep->X_add_symbol, (long) 0, (char *) NULL); ep->X_add_symbol, (offsetT) 0, (char *) NULL);
} }
macro_build_lui (p, counter, ep, reg); macro_build_lui (p, counter, ep, reg);
if (p != NULL) if (p != NULL)
@ -3080,7 +3084,7 @@ load_address (counter, reg, ep)
macro_build ((char *) NULL, counter, (expressionS *) NULL, "nop", ""); macro_build ((char *) NULL, counter, (expressionS *) NULL, "nop", "");
p = frag_var (rs_machine_dependent, 4, 0, p = frag_var (rs_machine_dependent, 4, 0,
RELAX_ENCODE (0, 4, -8, 0, 0, mips_warn_about_macros), RELAX_ENCODE (0, 4, -8, 0, 0, mips_warn_about_macros),
ep->X_add_symbol, (long) 0, (char *) NULL); ep->X_add_symbol, (offsetT) 0, (char *) NULL);
macro_build (p, counter, ep, macro_build (p, counter, ep,
mips_isa < 3 ? "addiu" : "daddiu", mips_isa < 3 ? "addiu" : "daddiu",
"t,r,j", reg, reg, (int) BFD_RELOC_LO16); "t,r,j", reg, reg, (int) BFD_RELOC_LO16);
@ -3127,7 +3131,7 @@ load_address (counter, reg, ep)
p = frag_var (rs_machine_dependent, 12 + off, 0, p = frag_var (rs_machine_dependent, 12 + off, 0,
RELAX_ENCODE (12, 12 + off, off, 8 + off, 0, RELAX_ENCODE (12, 12 + off, off, 8 + off, 0,
mips_warn_about_macros), mips_warn_about_macros),
ep->X_add_symbol, (long) 0, (char *) NULL); ep->X_add_symbol, (offsetT) 0, (char *) NULL);
if (off > 0) if (off > 0)
{ {
/* We need a nop before loading from $gp. This special /* We need a nop before loading from $gp. This special
@ -3922,7 +3926,7 @@ macro (ip)
p = frag_var (rs_machine_dependent, 8, 0, p = frag_var (rs_machine_dependent, 8, 0,
RELAX_ENCODE (4, 8, 0, 4, 0, RELAX_ENCODE (4, 8, 0, 4, 0,
mips_warn_about_macros), mips_warn_about_macros),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
macro_build_lui (p, &icnt, &offset_expr, tempreg); macro_build_lui (p, &icnt, &offset_expr, tempreg);
@ -3986,7 +3990,7 @@ macro (ip)
(breg == 0 (breg == 0
? mips_warn_about_macros ? mips_warn_about_macros
: 0)), : 0)),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
if (breg == 0) if (breg == 0)
{ {
@ -4010,7 +4014,7 @@ macro (ip)
"t,r,j", tempreg, tempreg, (int) BFD_RELOC_LO16); "t,r,j", tempreg, tempreg, (int) BFD_RELOC_LO16);
(void) frag_var (rs_machine_dependent, 0, 0, (void) frag_var (rs_machine_dependent, 0, 0,
RELAX_ENCODE (0, 0, -12, -4, 0, 0), RELAX_ENCODE (0, 0, -12, -4, 0, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
else else
@ -4053,7 +4057,7 @@ macro (ip)
"d,v,t", tempreg, tempreg, AT); "d,v,t", tempreg, tempreg, AT);
(void) frag_var (rs_machine_dependent, 0, 0, (void) frag_var (rs_machine_dependent, 0, 0,
RELAX_ENCODE (0, 0, -16 + off1, -8, 0, 0), RELAX_ENCODE (0, 0, -16 + off1, -8, 0, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
used_at = 1; used_at = 1;
} }
@ -4136,7 +4140,7 @@ macro (ip)
(breg == 0 (breg == 0
? mips_warn_about_macros ? mips_warn_about_macros
: 0)), : 0)),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
else if (expr1.X_add_number >= -0x8000 else if (expr1.X_add_number >= -0x8000
@ -4153,7 +4157,7 @@ macro (ip)
(breg == 0 (breg == 0
? mips_warn_about_macros ? mips_warn_about_macros
: 0)), : 0)),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
else else
@ -4204,7 +4208,7 @@ macro (ip)
(breg == 0 (breg == 0
? mips_warn_about_macros ? mips_warn_about_macros
: 0)), : 0)),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
used_at = 1; used_at = 1;
@ -4370,7 +4374,8 @@ macro (ip)
"nop", ""); "nop", "");
p = frag_var (rs_machine_dependent, 4, 0, p = frag_var (rs_machine_dependent, 4, 0,
RELAX_ENCODE (0, 4, -8, 0, 0, 0), RELAX_ENCODE (0, 4, -8, 0, 0, 0),
offset_expr.X_add_symbol, (long) 0, (char *) NULL); offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL);
} }
else else
{ {
@ -4394,7 +4399,8 @@ macro (ip)
p = frag_var (rs_machine_dependent, 12 + gpdel, 0, p = frag_var (rs_machine_dependent, 12 + gpdel, 0,
RELAX_ENCODE (16, 12 + gpdel, gpdel, 8 + gpdel, RELAX_ENCODE (16, 12 + gpdel, gpdel, 8 + gpdel,
0, 0), 0, 0),
offset_expr.X_add_symbol, (long) 0, (char *) NULL); offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL);
if (gpdel > 0) if (gpdel > 0)
{ {
macro_build (p, &icnt, (expressionS *) NULL, "nop", ""); macro_build (p, &icnt, (expressionS *) NULL, "nop", "");
@ -4648,7 +4654,7 @@ macro (ip)
RELAX_ENCODE (4, 8, 0, 4, 0, RELAX_ENCODE (4, 8, 0, 4, 0,
(mips_warn_about_macros (mips_warn_about_macros
|| (used_at && mips_noat))), || (used_at && mips_noat))),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
used_at = 0; used_at = 0;
} }
@ -4673,7 +4679,7 @@ macro (ip)
treg, (int) BFD_RELOC_MIPS_GPREL, tempreg); treg, (int) BFD_RELOC_MIPS_GPREL, tempreg);
p = frag_var (rs_machine_dependent, 12, 0, p = frag_var (rs_machine_dependent, 12, 0,
RELAX_ENCODE (8, 12, 0, 8, 0, 0), RELAX_ENCODE (8, 12, 0, 8, 0, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
macro_build_lui (p, &icnt, &offset_expr, tempreg); macro_build_lui (p, &icnt, &offset_expr, tempreg);
@ -4718,7 +4724,7 @@ macro (ip)
macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "nop", ""); macro_build ((char *) NULL, &icnt, (expressionS *) NULL, "nop", "");
p = frag_var (rs_machine_dependent, 4, 0, p = frag_var (rs_machine_dependent, 4, 0,
RELAX_ENCODE (0, 4, -8, 0, 0, 0), RELAX_ENCODE (0, 4, -8, 0, 0, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
macro_build (p, &icnt, &offset_expr, macro_build (p, &icnt, &offset_expr,
mips_isa < 3 ? "addiu" : "daddiu", mips_isa < 3 ? "addiu" : "daddiu",
@ -4772,7 +4778,7 @@ macro (ip)
tempreg); tempreg);
p = frag_var (rs_machine_dependent, 12 + gpdel, 0, p = frag_var (rs_machine_dependent, 12 + gpdel, 0,
RELAX_ENCODE (12, 12 + gpdel, gpdel, 8 + gpdel, 0, 0), RELAX_ENCODE (12, 12 + gpdel, gpdel, 8 + gpdel, 0, 0),
offset_expr.X_add_symbol, (long) 0, (char *) NULL); offset_expr.X_add_symbol, (offsetT) 0, (char *) NULL);
if (gpdel > 0) if (gpdel > 0)
{ {
macro_build (p, &icnt, (expressionS *) NULL, "nop", ""); macro_build (p, &icnt, (expressionS *) NULL, "nop", "");
@ -5115,7 +5121,7 @@ macro (ip)
p = frag_var (rs_machine_dependent, 12 + off, 0, p = frag_var (rs_machine_dependent, 12 + off, 0,
RELAX_ENCODE (8 + off, 12 + off, 0, 4 + off, 1, RELAX_ENCODE (8 + off, 12 + off, 0, 4 + off, 1,
used_at && mips_noat), used_at && mips_noat),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
/* We just generated two relocs. When tc_gen_reloc /* We just generated two relocs. When tc_gen_reloc
@ -5207,7 +5213,7 @@ macro (ip)
(void) frag_var (rs_machine_dependent, 0, 0, (void) frag_var (rs_machine_dependent, 0, 0,
RELAX_ENCODE (0, 0, -16 - off, -8, 1, 0), RELAX_ENCODE (0, 0, -16 - off, -8, 1, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
} }
else if (mips_pic == SVR4_PIC) else if (mips_pic == SVR4_PIC)
@ -5277,7 +5283,7 @@ macro (ip)
p = frag_var (rs_machine_dependent, 16 + gpdel + off, 0, p = frag_var (rs_machine_dependent, 16 + gpdel + off, 0,
RELAX_ENCODE (24 + off, 16 + gpdel + off, gpdel, RELAX_ENCODE (24 + off, 16 + gpdel + off, gpdel,
8 + gpdel + off, 1, 0), 8 + gpdel + off, 1, 0),
offset_expr.X_add_symbol, (long) 0, offset_expr.X_add_symbol, (offsetT) 0,
(char *) NULL); (char *) NULL);
if (gpdel > 0) if (gpdel > 0)
{ {

9
gas/symbols.c
View File

@ -53,6 +53,8 @@ symbolS abs_symbol;
struct obstack notes; struct obstack notes;
static void fb_label_init PARAMS ((void)); static void fb_label_init PARAMS ((void));
static long dollar_label_instance PARAMS ((long));
static long fb_label_instance PARAMS ((long));
/* symbol_new() /* symbol_new()
@ -206,7 +208,7 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */
possible_bytes, possible_bytes,
(relax_substateT) 0, (relax_substateT) 0,
(symbolS *) broken_words, (symbolS *) broken_words,
0L, (offsetT) 0,
NULL); NULL);
/* We want to store the pointer to where to insert the jump table in the /* We want to store the pointer to where to insert the jump table in the
@ -917,7 +919,7 @@ dollar_label_defined (label)
return 0; return 0;
} /* dollar_label_defined() */ } /* dollar_label_defined() */
static int static long
dollar_label_instance (label) dollar_label_instance (label)
long label; long label;
{ {
@ -1489,9 +1491,6 @@ indent ()
#endif #endif
void print_expr_1 PARAMS ((FILE *, expressionS *));
void print_symbol_value_1 PARAMS ((FILE *, symbolS *));
void void
print_symbol_value_1 (file, sym) print_symbol_value_1 (file, sym)
FILE *file; FILE *file;