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

* config/obj-coff.c: Fix formatting.

Browse Source 
* config/obj-elf.c: Likewise.
	* config/tc-alpha.c: Likewise.
	* config/tc-arm.c: Likewise.
	* config/tc-d10v.c: Likewise.
	* config/tc-d30v.c: Likewise.
	* config/tc-h8300.c: Likewise.
	* config/tc-hppa.c: Likewise.
This commit is contained in:
Kazu Hirata
2002-05-09 13:12:57 +00:00
parent 2b9c82010f
commit cc8a6dd09b
9 changed files with 140 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gas/ChangeLog
View File

@ -1,3 +1,14 @@
2002-05-09 Kazu Hirata <kazu@cs.umass.edu>
* config/obj-coff.c: Fix formatting.
* config/obj-elf.c: Likewise.
* config/tc-alpha.c: Likewise.
* config/tc-arm.c: Likewise.
* config/tc-d10v.c: Likewise.
* config/tc-d30v.c: Likewise.
* config/tc-h8300.c: Likewise.
* config/tc-hppa.c: Likewise.
2002-05-09 Alan Modra <amodra@bigpond.net.au> 2002-05-09 Alan Modra <amodra@bigpond.net.au>
* config/tc-i386.c (md_estimate_size_before_relax) Don't lose * config/tc-i386.c (md_estimate_size_before_relax) Don't lose

20
gas/config/obj-coff.c
View File

@ -568,7 +568,7 @@ obj_coff_loc (ignore)
if (listing) if (listing)
{ {
lineno += coff_line_base - 1; lineno += coff_line_base - 1;
listing_source_line (lineno); listing_source_line (lineno);
} }
} }
@ -716,7 +716,7 @@ obj_coff_endef (ignore)
name = S_GET_NAME (def_symbol_in_progress); name = S_GET_NAME (def_symbol_in_progress);
if (name[0] == '.' && name[2] == 'f' && name[3] == '\0') if (name[0] == '.' && name[2] == 'f' && name[3] == '\0')
{ {
switch (name[1]) switch (name[1])
{ {
case 'b': case 'b':
@ -842,16 +842,16 @@ obj_coff_endef (ignore)
|| S_GET_SEGMENT (def_symbol_in_progress) == absolute_section || S_GET_SEGMENT (def_symbol_in_progress) == absolute_section
|| ! symbol_constant_p (def_symbol_in_progress) || ! symbol_constant_p (def_symbol_in_progress)
|| (symbolP = symbol_find_base (S_GET_NAME (def_symbol_in_progress), || (symbolP = symbol_find_base (S_GET_NAME (def_symbol_in_progress),
DO_NOT_STRIP)) == NULL DO_NOT_STRIP)) == NULL
|| SF_GET_TAG (def_symbol_in_progress) != SF_GET_TAG (symbolP)) || SF_GET_TAG (def_symbol_in_progress) != SF_GET_TAG (symbolP))
{ {
/* If it already is at the end of the symbol list, do nothing */ /* If it already is at the end of the symbol list, do nothing */
if (def_symbol_in_progress != symbol_lastP) if (def_symbol_in_progress != symbol_lastP)
{ {
symbol_remove (def_symbol_in_progress, &symbol_rootP, &symbol_lastP); symbol_remove (def_symbol_in_progress, &symbol_rootP, &symbol_lastP);
symbol_append (def_symbol_in_progress, symbol_lastP, &symbol_rootP, symbol_append (def_symbol_in_progress, symbol_lastP, &symbol_rootP,
&symbol_lastP); &symbol_lastP);
} }
} }
else else
{ {
@ -1504,13 +1504,13 @@ obj_coff_section (ignore)
sections so adjust_reloc_syms in write.c will correctly handle sections so adjust_reloc_syms in write.c will correctly handle
relocs which refer to non-local symbols in these sections. */ relocs which refer to non-local symbols in these sections. */
if (strncmp (name, ".gnu.linkonce", sizeof (".gnu.linkonce") - 1) == 0) if (strncmp (name, ".gnu.linkonce", sizeof (".gnu.linkonce") - 1) == 0)
flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD; flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
#endif #endif
if (! bfd_set_section_flags (stdoutput, sec, flags)) if (! bfd_set_section_flags (stdoutput, sec, flags))
as_warn (_("error setting flags for \"%s\": %s"), as_warn (_("error setting flags for \"%s\": %s"),
bfd_section_name (stdoutput, sec), bfd_section_name (stdoutput, sec),
bfd_errmsg (bfd_get_error ())); bfd_errmsg (bfd_get_error ()));
} }
else if (flags != SEC_NO_FLAGS) else if (flags != SEC_NO_FLAGS)
{ {
@ -1564,7 +1564,7 @@ coff_frob_section (sec)
fragp = seg_info (sec)->frchainP->frch_root; fragp = seg_info (sec)->frchainP->frch_root;
last = seg_info (sec)->frchainP->frch_last; last = seg_info (sec)->frchainP->frch_last;
while (fragp->fr_next != last) while (fragp->fr_next != last)
fragp = fragp->fr_next; fragp = fragp->fr_next;
last->fr_address = size; last->fr_address = size;
fragp->fr_offset += new_size - size; fragp->fr_offset += new_size - size;
} }

12
gas/config/obj-elf.c
View File

@ -1,6 +1,6 @@
/* ELF object file format /* ELF object file format
Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
Free Software Foundation, Inc. 2001, 2002 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -608,13 +608,13 @@ static struct special_section const special_sections[] =
.section .init_array .section .init_array
*/ */
{ ".init_array",SHT_INIT_ARRAY, SHF_ALLOC + SHF_WRITE }, { ".init_array",SHT_INIT_ARRAY, SHF_ALLOC + SHF_WRITE },
{ ".fini_array",SHT_FINI_ARRAY, SHF_ALLOC + SHF_WRITE }, { ".fini_array",SHT_FINI_ARRAY, SHF_ALLOC + SHF_WRITE },
{ ".preinit_array",SHT_PREINIT_ARRAY, SHF_ALLOC + SHF_WRITE }, { ".preinit_array",SHT_PREINIT_ARRAY, SHF_ALLOC + SHF_WRITE },
#else #else
{ ".init_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".init_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
{ ".fini_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".fini_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
{ ".preinit_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, { ".preinit_array",SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
#endif #endif
#ifdef ELF_TC_SPECIAL_SECTIONS #ifdef ELF_TC_SPECIAL_SECTIONS

10
gas/config/tc-alpha.c
View File

@ -1,6 +1,6 @@
/* tc-alpha.c - Processor-specific code for the DEC Alpha AXP CPU. /* tc-alpha.c - Processor-specific code for the DEC Alpha AXP CPU.
Copyright 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Copyright 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
Free Software Foundation, Inc. 2001, 2002 Free Software Foundation, Inc.
Contributed by Carnegie Mellon University, 1993. Contributed by Carnegie Mellon University, 1993.
Written by Alessandro Forin, based on earlier gas-1.38 target CPU files. Written by Alessandro Forin, based on earlier gas-1.38 target CPU files.
Modified by Ken Raeburn for gas-2.x and ECOFF support. Modified by Ken Raeburn for gas-2.x and ECOFF support.
@ -1894,7 +1894,7 @@ tokenize_arguments (str, tok, ntok)
goto err; goto err;
++input_line_pointer; ++input_line_pointer;
SKIP_WHITESPACE (); SKIP_WHITESPACE ();
p = input_line_pointer; p = input_line_pointer;
c = get_symbol_end (); c = get_symbol_end ();
@ -1917,7 +1917,7 @@ tokenize_arguments (str, tok, ntok)
} }
*input_line_pointer = c; *input_line_pointer = c;
SKIP_WHITESPACE (); SKIP_WHITESPACE ();
if (*input_line_pointer != '!') if (*input_line_pointer != '!')
{ {
if (r->require_seq) if (r->require_seq)
@ -2377,7 +2377,7 @@ assemble_insn (opcode, tok, ntok, insn, reloc)
abort (); abort ();
/* There is one special case for which an insn receives two /* There is one special case for which an insn receives two
relocations, and thus the user-supplied reloc does not relocations, and thus the user-supplied reloc does not
override the operand reloc. */ override the operand reloc. */
if (operand->default_reloc == BFD_RELOC_ALPHA_HINT) if (operand->default_reloc == BFD_RELOC_ALPHA_HINT)
{ {

90
gas/config/tc-arm.c
View File

@ -521,7 +521,7 @@ struct vfp_reg
unsigned long regno; unsigned long regno;
}; };
static const struct vfp_reg vfp_regs[] = static const struct vfp_reg vfp_regs[] =
{ {
{"fpsid", 0x00000000}, {"fpsid", 0x00000000},
{"FPSID", 0x00000000}, {"FPSID", 0x00000000},
@ -842,7 +842,7 @@ static void do_mav_binops_3a PARAMS ((char *));
static void do_mav_binops_3b PARAMS ((char *)); static void do_mav_binops_3b PARAMS ((char *));
static void do_mav_binops_3c PARAMS ((char *)); static void do_mav_binops_3c PARAMS ((char *));
static void do_mav_binops_3d PARAMS ((char *)); static void do_mav_binops_3d PARAMS ((char *));
static void do_mav_triple PARAMS ((char *, int, enum arm_reg_type, static void do_mav_triple PARAMS ((char *, int, enum arm_reg_type,
enum arm_reg_type, enum arm_reg_type,
enum arm_reg_type)); enum arm_reg_type));
static void do_mav_triple_4a PARAMS ((char *)); static void do_mav_triple_4a PARAMS ((char *));
@ -855,7 +855,7 @@ static void do_mav_triple_5e PARAMS ((char *));
static void do_mav_triple_5f PARAMS ((char *)); static void do_mav_triple_5f PARAMS ((char *));
static void do_mav_triple_5g PARAMS ((char *)); static void do_mav_triple_5g PARAMS ((char *));
static void do_mav_triple_5h PARAMS ((char *)); static void do_mav_triple_5h PARAMS ((char *));
static void do_mav_quad PARAMS ((char *, int, enum arm_reg_type, static void do_mav_quad PARAMS ((char *, int, enum arm_reg_type,
enum arm_reg_type, enum arm_reg_type,
enum arm_reg_type, enum arm_reg_type,
enum arm_reg_type)); enum arm_reg_type));
@ -1106,7 +1106,7 @@ static const struct asm_opcode insns[] =
{"strh", 0xe00000b0, 3, ARM_EXT_V4, do_ldstv4}, {"strh", 0xe00000b0, 3, ARM_EXT_V4, do_ldstv4},
/* ARM Architecture 4T. */ /* ARM Architecture 4T. */
/* Note: bx (and blx) are required on V5, even if the processor does /* Note: bx (and blx) are required on V5, even if the processor does
not support Thumb. */ not support Thumb. */
{"bx", 0xe12fff10, 2, ARM_EXT_V4T | ARM_EXT_V5, do_bx}, {"bx", 0xe12fff10, 2, ARM_EXT_V4T | ARM_EXT_V5, do_bx},
@ -2165,14 +2165,14 @@ add_to_lit_pool ()
break; break;
if (literals[lit_count].exp.X_op == inst.reloc.exp.X_op if (literals[lit_count].exp.X_op == inst.reloc.exp.X_op
&& inst.reloc.exp.X_op == O_symbol && inst.reloc.exp.X_op == O_symbol
&& (literals[lit_count].exp.X_add_number && (literals[lit_count].exp.X_add_number
== inst.reloc.exp.X_add_number) == inst.reloc.exp.X_add_number)
&& (literals[lit_count].exp.X_add_symbol && (literals[lit_count].exp.X_add_symbol
== inst.reloc.exp.X_add_symbol) == inst.reloc.exp.X_add_symbol)
&& (literals[lit_count].exp.X_op_symbol && (literals[lit_count].exp.X_op_symbol
== inst.reloc.exp.X_op_symbol)) == inst.reloc.exp.X_op_symbol))
break; break;
lit_count++; lit_count++;
} }
@ -2624,9 +2624,9 @@ opcode_select (width)
thumb_mode = 0; thumb_mode = 0;
if (!need_pass_2) if (!need_pass_2)
frag_align (2, 0, 0); frag_align (2, 0, 0);
record_alignment (now_seg, 1); record_alignment (now_seg, 1);
} }
break; break;
@ -3450,13 +3450,13 @@ ld_mode_required_here (string)
} }
else /* [Rn] */ else /* [Rn] */
{ {
skip_whitespace (str); skip_whitespace (str);
if (* str == '!') if (* str == '!')
{ {
str ++; str ++;
inst.instruction |= WRITE_BACK; inst.instruction |= WRITE_BACK;
} }
inst.instruction |= INDEX_UP | HWOFFSET_IMM; inst.instruction |= INDEX_UP | HWOFFSET_IMM;
pre_inc = 1; pre_inc = 1;
@ -4027,10 +4027,10 @@ do_blx (str)
{ {
/* This must be is BLX <target address>, no condition allowed. */ /* This must be is BLX <target address>, no condition allowed. */
if (inst.instruction != COND_ALWAYS) if (inst.instruction != COND_ALWAYS)
{ {
inst.error = BAD_COND; inst.error = BAD_COND;
return; return;
} }
inst.instruction = 0xfafffffe; inst.instruction = 0xfafffffe;
@ -4088,7 +4088,7 @@ do_t_blx (str)
BKPT <16 bit unsigned immediate> BKPT <16 bit unsigned immediate>
Instruction is not conditional. Instruction is not conditional.
The bit pattern given in insns[] has the COND_ALWAYS condition, The bit pattern given in insns[] has the COND_ALWAYS condition,
and it is an error if the caller tried to override that. */ and it is an error if the caller tried to override that. */
static void static void
do_bkpt (str) do_bkpt (str)
@ -4331,7 +4331,7 @@ do_ldrd (str)
|| (rn = ld_mode_required_here (& str)) == FAIL) || (rn = ld_mode_required_here (& str)) == FAIL)
{ {
if (!inst.error) if (!inst.error)
inst.error = BAD_ARGS; inst.error = BAD_ARGS;
return; return;
} }
@ -4514,7 +4514,7 @@ my_get_expression (ep, str)
return 0; return 0;
} }
/* We handle all bad expressions here, so that we can report the faulty /* We handle all bad expressions here, so that we can report the faulty
instruction in the error message. */ instruction in the error message. */
void void
md_operand (expr) md_operand (expr)
@ -5543,7 +5543,7 @@ do_ldstv4 (str)
end_of_line (str); end_of_line (str);
return; return;
} }
value = validate_immediate (~ inst.reloc.exp.X_add_number); value = validate_immediate (~ inst.reloc.exp.X_add_number);
if (value != FAIL) if (value != FAIL)
@ -6729,7 +6729,7 @@ vfp_psr_parse (str)
/* Mark it. */ /* Mark it. */
*--p = 0; *--p = 0;
for (vreg = vfp_regs + 0; for (vreg = vfp_regs + 0;
vreg < vfp_regs + sizeof (vfp_regs) / sizeof (struct vfp_reg); vreg < vfp_regs + sizeof (vfp_regs) / sizeof (struct vfp_reg);
vreg++) vreg++)
{ {
@ -7929,11 +7929,11 @@ mav_reg_required_here (str, shift, regtype)
/* Restore the start point. */ /* Restore the start point. */
*str = start; *str = start;
/* In the few cases where we might be able to accept something else /* In the few cases where we might be able to accept something else
this error can be overridden. */ this error can be overridden. */
inst.error = _(all_reg_maps[regtype].expected); inst.error = _(all_reg_maps[regtype].expected);
return FAIL; return FAIL;
} }
@ -8181,7 +8181,7 @@ do_mav_quad_6b (str)
REG_TYPE_MVFX); REG_TYPE_MVFX);
} }
/* cfmvsc32<cond> DSPSC,MVFX[15:0]. */ /* cfmvsc32<cond> DSPSC,MVFX[15:0]. */
static void static void
do_mav_dspsc_1 (str) do_mav_dspsc_1 (str)
char * str; char * str;
@ -9095,7 +9095,7 @@ create_register_alias (newname, p)
*p = c; *p = c;
return 0; return 0;
} }
static void static void
set_constant_flonums () set_constant_flonums ()
{ {
@ -10487,7 +10487,7 @@ md_assemble (str)
/* md_parse_option /* md_parse_option
Invocation line includes a switch not recognized by the base assembler. Invocation line includes a switch not recognized by the base assembler.
See if it's a processor-specific option. See if it's a processor-specific option.
This routine is somewhat complicated by the need for backwards This routine is somewhat complicated by the need for backwards
compatibility (since older releases of gcc can't be changed). compatibility (since older releases of gcc can't be changed).
@ -10505,7 +10505,7 @@ md_assemble (str)
-mthumb Start in Thumb mode -mthumb Start in Thumb mode
-mthumb-interwork Code supports ARM/Thumb interworking -mthumb-interwork Code supports ARM/Thumb interworking
For now we will also provide support for For now we will also provide support for
-mapcs-32 32-bit Program counter -mapcs-32 32-bit Program counter
-mapcs-26 26-bit Program counter -mapcs-26 26-bit Program counter
@ -10581,7 +10581,7 @@ struct arm_option_table
char *deprecated; /* If non-null, print this message. */ char *deprecated; /* If non-null, print this message. */
}; };
struct arm_option_table arm_opts[] = struct arm_option_table arm_opts[] =
{ {
{"k", N_("generate PIC code"), &pic_code, 1, NULL}, {"k", N_("generate PIC code"), &pic_code, 1, NULL},
{"mthumb", N_("assemble Thumb code"), &thumb_mode, 1, NULL}, {"mthumb", N_("assemble Thumb code"), &thumb_mode, 1, NULL},
@ -10789,7 +10789,7 @@ static struct arm_cpu_option_table arm_cpus[] =
{"ep9312", ARM_ARCH_V4T | ARM_CEXT_MAVERICK, FPU_NONE}, {"ep9312", ARM_ARCH_V4T | ARM_CEXT_MAVERICK, FPU_NONE},
{NULL, 0, 0} {NULL, 0, 0}
}; };
struct arm_arch_option_table struct arm_arch_option_table
{ {
char *name; char *name;
@ -11046,7 +11046,7 @@ md_parse_option (c, arg)
#endif #endif
case 'a': case 'a':
/* Listing option. Just ignore these, we don't support additional /* Listing option. Just ignore these, we don't support additional
ones. */ ones. */
return 0; return 0;
@ -11073,10 +11073,10 @@ md_parse_option (c, arg)
for (lopt = arm_long_opts; lopt->option != NULL; lopt++) for (lopt = arm_long_opts; lopt->option != NULL; lopt++)
{ {
/* These options are expected to have an argument. */ /* These options are expected to have an argument. */
if (c == lopt->option[0] if (c == lopt->option[0]
&& arg != NULL && arg != NULL
&& strncmp (arg, lopt->option + 1, && strncmp (arg, lopt->option + 1,
strlen (lopt->option + 1)) == 0) strlen (lopt->option + 1)) == 0)
{ {
#if WARN_DEPRECATED #if WARN_DEPRECATED
@ -11248,7 +11248,7 @@ arm_frob_label (sym)
lsl r3, r3, #2 lsl r3, r3, #2
ldr r2, [r3, r2] ldr r2, [r3, r2]
mov pc, r2 mov pc, r2
.Lbbb: .word .Lxxx .Lbbb: .word .Lxxx
.Lccc: .word .Lyyy .Lccc: .word .Lyyy
..etc... ..etc...
@ -11258,7 +11258,7 @@ arm_frob_label (sym)
The second instruction converts a table index into a byte offset. The second instruction converts a table index into a byte offset.
The third instruction gets the jump address out of the table. The third instruction gets the jump address out of the table.
The fourth instruction performs the jump. The fourth instruction performs the jump.
If the address stored at .Laaa is that of a symbol which has the If the address stored at .Laaa is that of a symbol which has the
Thumb_Func bit set, then the linker will arrange for this address Thumb_Func bit set, then the linker will arrange for this address
to have the bottom bit set, which in turn would mean that the to have the bottom bit set, which in turn would mean that the
@ -11307,7 +11307,7 @@ arm_adjust_symtab ()
as_bad (_("%s: unexpected function type: %d"), as_bad (_("%s: unexpected function type: %d"),
S_GET_NAME (sym), S_GET_STORAGE_CLASS (sym)); S_GET_NAME (sym), S_GET_STORAGE_CLASS (sym));
} }
else switch (S_GET_STORAGE_CLASS (sym)) else switch (S_GET_STORAGE_CLASS (sym))
{ {
case C_EXT: case C_EXT:
S_SET_STORAGE_CLASS (sym, C_THUMBEXT); S_SET_STORAGE_CLASS (sym, C_THUMBEXT);
@ -11609,17 +11609,17 @@ arm_handle_align (fragP)
int bytes, fix, noop_size; int bytes, fix, noop_size;
char * p; char * p;
const char * noop; const char * noop;
if (fragP->fr_type != rs_align_code) if (fragP->fr_type != rs_align_code)
return; return;
bytes = fragP->fr_next->fr_address - fragP->fr_address - fragP->fr_fix; bytes = fragP->fr_next->fr_address - fragP->fr_address - fragP->fr_fix;
p = fragP->fr_literal + fragP->fr_fix; p = fragP->fr_literal + fragP->fr_fix;
fix = 0; fix = 0;
if (bytes > MAX_MEM_FOR_RS_ALIGN_CODE) if (bytes > MAX_MEM_FOR_RS_ALIGN_CODE)
bytes &= MAX_MEM_FOR_RS_ALIGN_CODE; bytes &= MAX_MEM_FOR_RS_ALIGN_CODE;
if (fragP->tc_frag_data) if (fragP->tc_frag_data)
{ {
if (target_big_endian) if (target_big_endian)
@ -11636,7 +11636,7 @@ arm_handle_align (fragP)
noop = arm_noop; noop = arm_noop;
noop_size = sizeof (arm_noop); noop_size = sizeof (arm_noop);
} }
if (bytes & (noop_size - 1)) if (bytes & (noop_size - 1))
{ {
fix = bytes & (noop_size - 1); fix = bytes & (noop_size - 1);
@ -11652,7 +11652,7 @@ arm_handle_align (fragP)
bytes -= noop_size; bytes -= noop_size;
fix += noop_size; fix += noop_size;
} }
fragP->fr_fix += fix; fragP->fr_fix += fix;
fragP->fr_var = noop_size; fragP->fr_var = noop_size;
} }
@ -11671,7 +11671,7 @@ arm_frag_align_code (n, max)
to support alignments greater than 32 bytes. */ to support alignments greater than 32 bytes. */
if (max > MAX_MEM_FOR_RS_ALIGN_CODE) if (max > MAX_MEM_FOR_RS_ALIGN_CODE)
as_fatal (_("alignments greater than 32 bytes not supported in .text sections.")); as_fatal (_("alignments greater than 32 bytes not supported in .text sections."));
p = frag_var (rs_align_code, p = frag_var (rs_align_code,
MAX_MEM_FOR_RS_ALIGN_CODE, MAX_MEM_FOR_RS_ALIGN_CODE,
1, 1,

88
gas/config/tc-d10v.c
View File

@ -99,9 +99,9 @@ static int parallel_ok PARAMS ((struct d10v_opcode *opcode1, unsigned long insn1
struct d10v_opcode *opcode2, unsigned long insn2, struct d10v_opcode *opcode2, unsigned long insn2,
packing_type exec_type)); packing_type exec_type));
static void check_resource_conflict PARAMS ((struct d10v_opcode *opcode1, static void check_resource_conflict PARAMS ((struct d10v_opcode *opcode1,
unsigned long insn1, unsigned long insn1,
struct d10v_opcode *opcode2, struct d10v_opcode *opcode2,
unsigned long insn2)); unsigned long insn2));
static symbolS * find_symbol_matching_register PARAMS ((expressionS *)); static symbolS * find_symbol_matching_register PARAMS ((expressionS *));
@ -670,8 +670,8 @@ build_insn (opcode, opers, insn)
insn = insn | (number << shift); insn = insn | (number << shift);
} }
/* kludge: for DIVS, we need to put the operands in twice on the second /* kludge: for DIVS, we need to put the operands in twice on the second
pass, format is changed to LONG_R to force the second set of operands pass, format is changed to LONG_R to force the second set of operands
to not be shifted over 15. */ to not be shifted over 15. */
if ((opcode->opcode == OPCODE_DIVS) && (format == LONG_L)) if ((opcode->opcode == OPCODE_DIVS) && (format == LONG_L))
insn = build_insn (opcode, opers, insn); insn = build_insn (opcode, opers, insn);
@ -728,8 +728,8 @@ write_1_short (opcode, insn, fx)
if (opcode->exec_type & PARONLY) if (opcode->exec_type & PARONLY)
as_fatal (_("Instruction must be executed in parallel with another instruction.")); as_fatal (_("Instruction must be executed in parallel with another instruction."));
/* The other container needs to be NOP. /* The other container needs to be NOP.
According to 4.3.1: for FM=00, sub-instructions performed only by IU According to 4.3.1: for FM=00, sub-instructions performed only by IU
cannot be encoded in L-container. */ cannot be encoded in L-container. */
if (opcode->unit == IU) if (opcode->unit == IU)
insn |= FM00 | (NOP << 15); /* Right container. */ insn |= FM00 | (NOP << 15); /* Right container. */
@ -944,7 +944,7 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
/* If this is auto parallization, and either instruction is a branch, /* If this is auto parallization, and either instruction is a branch,
don't parallel. */ don't parallel. */
if (exec_type == PACK_UNSPEC if (exec_type == PACK_UNSPEC
&& (op1->exec_type & (ALONE | BRANCH) && (op1->exec_type & (ALONE | BRANCH)
|| op2->exec_type & (ALONE | BRANCH))) || op2->exec_type & (ALONE | BRANCH)))
return 0; return 0;
@ -963,8 +963,8 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
and the second reads the PSW (which includes C, F0, and F1), then and the second reads the PSW (which includes C, F0, and F1), then
they cannot operate safely in parallel. */ they cannot operate safely in parallel. */
/* The bitmasks (mod and used) look like this (bit 31 = MSB). /* The bitmasks (mod and used) look like this (bit 31 = MSB).
r0-r15 0-15 r0-r15 0-15
a0-a1 16-17 a0-a1 16-17
cr (not psw) 18 cr (not psw) 18
psw 19 psw 19
@ -1051,7 +1051,7 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
/* Determine if there are any resource conflicts among two manually /* Determine if there are any resource conflicts among two manually
parallelized instructions. Some of this was lifted from parallel_ok. */ parallelized instructions. Some of this was lifted from parallel_ok. */
static void static void
check_resource_conflict (op1, insn1, op2, insn2) check_resource_conflict (op1, insn1, op2, insn2)
struct d10v_opcode *op1, *op2; struct d10v_opcode *op1, *op2;
unsigned long insn1, insn2; unsigned long insn1, insn2;
@ -1127,35 +1127,35 @@ check_resource_conflict (op1, insn1, op2, insn2)
if (flags & (OPERAND_ACC0 | OPERAND_ACC1)) if (flags & (OPERAND_ACC0 | OPERAND_ACC1))
regno += 16; regno += 16;
else if (flags & OPERAND_CONTROL) /* mvtc or mvfc */ else if (flags & OPERAND_CONTROL) /* mvtc or mvfc */
{ {
if (regno == 0) if (regno == 0)
regno = 19; regno = 19;
else else
regno = 18; regno = 18;
} }
else if (flags & OPERAND_FFLAG) else if (flags & OPERAND_FFLAG)
regno = 22; regno = 22;
else if (flags & OPERAND_CFLAG) else if (flags & OPERAND_CFLAG)
regno = 21; regno = 21;
if ( flags & OPERAND_DEST ) if ( flags & OPERAND_DEST )
{ {
mod[j] |= 1 << regno; mod[j] |= 1 << regno;
if (flags & OPERAND_EVEN) if (flags & OPERAND_EVEN)
mod[j] |= 1 << (regno + 1); mod[j] |= 1 << (regno + 1);
} }
else else
{ {
used[j] |= 1 << regno ; used[j] |= 1 << regno ;
if (flags & OPERAND_EVEN) if (flags & OPERAND_EVEN)
used[j] |= 1 << (regno + 1); used[j] |= 1 << (regno + 1);
/* Auto inc/dec also modifies the register. */ /* Auto inc/dec also modifies the register. */
if (op->operands[i+1] != 0 if (op->operands[i+1] != 0
&& (d10v_operands[op->operands[i+1]].flags && (d10v_operands[op->operands[i+1]].flags
& (OPERAND_PLUS | OPERAND_MINUS)) != 0) & (OPERAND_PLUS | OPERAND_MINUS)) != 0)
mod[j] |= 1 << regno; mod[j] |= 1 << regno;
} }
} }
else if (flags & OPERAND_ATMINUS) else if (flags & OPERAND_ATMINUS)
{ {
@ -1294,7 +1294,7 @@ md_assemble (str)
d10v_cleanup (); d10v_cleanup ();
if (prev_opcode if (prev_opcode
&& (0 == write_2_short (prev_opcode, prev_insn, opcode, insn, extype, && (0 == write_2_short (prev_opcode, prev_insn, opcode, insn, extype,
fixups))) fixups)))
{ {
/* No instructions saved. */ /* No instructions saved. */
@ -1520,7 +1520,7 @@ find_opcode (opcode, myops)
} }
match = 0; match = 0;
/* Now search the opcode table table for one with operands /* Now search the opcode table table for one with operands
that matches what we've got. */ that matches what we've got. */
while (!match) while (!match)
@ -1562,19 +1562,19 @@ find_opcode (opcode, myops)
break; break;
} }
/* Unfortunatly, for the indirect operand in instructions such /* Unfortunatly, for the indirect operand in instructions such
as ``ldb r1, @(c,r14)'' this function can be passed as ``ldb r1, @(c,r14)'' this function can be passed
X_op == O_register (because 'c' is a valid register name). X_op == O_register (because 'c' is a valid register name).
However we cannot just ignore the case when X_op == O_register However we cannot just ignore the case when X_op == O_register
but flags & OPERAND_REG is null, so we check to see if a symbol but flags & OPERAND_REG is null, so we check to see if a symbol
of the same name as the register exists. If the symbol does of the same name as the register exists. If the symbol does
exist, then the parser was unable to distinguish the two cases exist, then the parser was unable to distinguish the two cases
and we fix things here. (Ref: PR14826) */ and we fix things here. (Ref: PR14826) */
if (!(flags & OPERAND_REG) && (X_op == O_register)) if (!(flags & OPERAND_REG) && (X_op == O_register))
{ {
symbolS * sym; symbolS * sym;
sym = find_symbol_matching_register (& myops[i]); sym = find_symbol_matching_register (& myops[i]);
if (sym != NULL) if (sym != NULL)
@ -1672,9 +1672,9 @@ tc_gen_reloc (seg, fixp)
if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT
|| fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY) || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
reloc->address = fixp->fx_offset; reloc->address = fixp->fx_offset;
reloc->addend = fixp->fx_addnumber; reloc->addend = fixp->fx_addnumber;
return reloc; return reloc;
} }
@ -1769,13 +1769,13 @@ md_apply_fix3 (fixP, valP, seg)
XXX - Do we have to worry about branches to a symbol + offset ? */ XXX - Do we have to worry about branches to a symbol + offset ? */
if (fixP->fx_addsy != NULL if (fixP->fx_addsy != NULL
&& S_IS_EXTERN (fixP->fx_addsy) ) && S_IS_EXTERN (fixP->fx_addsy) )
{ {
segT fseg = S_GET_SEGMENT (fixP->fx_addsy); segT fseg = S_GET_SEGMENT (fixP->fx_addsy);
segment_info_type *segf = seg_info(fseg); segment_info_type *segf = seg_info(fseg);
if ( segf && segf->sym != fixP->fx_addsy) if ( segf && segf->sym != fixP->fx_addsy)
value = 0; value = 0;
} }
/* Drop through. */ /* Drop through. */
case BFD_RELOC_D10V_18: case BFD_RELOC_D10V_18:
/* Instruction addresses are always right-shifted by 2. */ /* Instruction addresses are always right-shifted by 2. */
@ -1789,9 +1789,9 @@ md_apply_fix3 (fixP, valP, seg)
rep = (struct d10v_opcode *) hash_find (d10v_hash, "rep"); rep = (struct d10v_opcode *) hash_find (d10v_hash, "rep");
repi = (struct d10v_opcode *) hash_find (d10v_hash, "repi"); repi = (struct d10v_opcode *) hash_find (d10v_hash, "repi");
if ((insn & FM11) == FM11 if ((insn & FM11) == FM11
&& ((repi != NULL && ((repi != NULL
&& (insn & repi->mask) == (unsigned) repi->opcode) && (insn & repi->mask) == (unsigned) repi->opcode)
|| (rep != NULL || (rep != NULL
&& (insn & rep->mask) == (unsigned) rep->opcode)) && (insn & rep->mask) == (unsigned) rep->opcode))
&& value < 4) && value < 4)
as_fatal as_fatal

6
gas/config/tc-d30v.c
View File

@ -1,5 +1,5 @@
/* tc-d30v.c -- Assembler code for the Mitsubishi D30V /* tc-d30v.c -- Assembler code for the Mitsubishi D30V
Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -246,7 +246,7 @@ check_range (num, bits, flags)
if (bits == 32) if (bits == 32)
{ {
if (sizeof (unsigned long) * CHAR_BIT == 32) if (sizeof (unsigned long) * CHAR_BIT == 32)
return 0; return 0;
/* We don't record signed or unsigned for 32-bit quantities. /* We don't record signed or unsigned for 32-bit quantities.
Allow either. */ Allow either. */
@ -1211,7 +1211,7 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
return 0; return 0;
} }
else else
if ((mod_reg[0][j] & (mod_reg[1][j] | used_reg[1][j])) != 0) if ((mod_reg[0][j] & (mod_reg[1][j] | used_reg[1][j])) != 0)
return 0; return 0;
} }

6
gas/config/tc-h8300.c
View File

@ -1,6 +1,6 @@
/* tc-h8300.c -- Assemble code for the Hitachi H8/300 /* tc-h8300.c -- Assemble code for the Hitachi H8/300
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001 Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
Free Software Foundation, Inc. 2001, 2002 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -1491,7 +1491,7 @@ md_section_align (seg, size)
valueT size; valueT size;
{ {
return ((size + (1 << section_alignment[(int) seg]) - 1) return ((size + (1 << section_alignment[(int) seg]) - 1)
& (-1 << section_alignment[(int) seg])); & (-1 << section_alignment[(int) seg]));
} }
#endif #endif

26
gas/config/tc-hppa.c
View File

@ -1289,10 +1289,10 @@ pa_undefine_label ()
{ {
if (1 if (1
#ifdef OBJ_SOM #ifdef OBJ_SOM
&& current_space == label_chain->lss_space && label_chain->lss_label && current_space == label_chain->lss_space && label_chain->lss_label
#endif #endif
#ifdef OBJ_ELF #ifdef OBJ_ELF
&& now_seg == label_chain->lss_segment && label_chain->lss_label && now_seg == label_chain->lss_segment && label_chain->lss_label
#endif #endif
) )
{ {
@ -2334,16 +2334,16 @@ pa_ip (str)
args++; args++;
switch (*args) switch (*args)
{ {
/* Handle FP compare conditions. */ /* Handle FP compare conditions. */
case 'f': case 'f':
cond = pa_parse_fp_cmp_cond (&s); cond = pa_parse_fp_cmp_cond (&s);
INSERT_FIELD_AND_CONTINUE (opcode, cond, 0); INSERT_FIELD_AND_CONTINUE (opcode, cond, 0);
/* Handle an add condition. */ /* Handle an add condition. */
case 'A': case 'A':
case 'a': case 'a':
cmpltr = 0; cmpltr = 0;
flag = 0; flag = 0;
if (*s == ',') if (*s == ',')
{ {
s++; s++;
@ -4240,8 +4240,8 @@ tc_gen_reloc (section, fixp)
case R_N0SEL: case R_N0SEL:
case R_N1SEL: case R_N1SEL:
/* There is no symbol or addend associated with these fixups. */ /* There is no symbol or addend associated with these fixups. */
relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
*relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol);
relocs[i]->addend = 0; relocs[i]->addend = 0;
break; break;
@ -4249,8 +4249,8 @@ tc_gen_reloc (section, fixp)
case R_ENTRY: case R_ENTRY:
case R_EXIT: case R_EXIT:
/* There is no symbol associated with these fixups. */ /* There is no symbol associated with these fixups. */
relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
*relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol);
relocs[i]->addend = fixp->fx_offset; relocs[i]->addend = fixp->fx_offset;
break; break;
@ -5227,7 +5227,7 @@ pa_get_absolute_expression (insn, strp)
input_line_pointer = *strp; input_line_pointer = *strp;
s = *strp; s = *strp;
while (*s != ',' && *s != ' ' && *s != '\t') while (*s != ',' && *s != ' ' && *s != '\t')
s++; s++;
c = *s; c = *s;
*s = 0; *s = 0;