OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2000-12-05 Kazu Hirata <kazu@hxi.com> 

* config/tc-mips.c: Fix formatting.
This commit is contained in:
Kazu Hirata 2000-12-05 18:51:08 +00:00
parent 8157b96704
commit beae10d5eb
2 changed files with 213 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gas/ChangeLog
View File

@ -1,3 +1,7 @@
2000-12-05 Kazu Hirata <kazu@hxi.com>
* config/tc-mips.c: Fix formatting.
2000-12-04 Matthew Hiller <hiller@redhat.com> 2000-12-04 Matthew Hiller <hiller@redhat.com>
* config/tc-d10v.c (flag_allow_gstabs_packing): New variable. * config/tc-d10v.c (flag_allow_gstabs_packing): New variable.

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

@ -110,6 +110,7 @@ extern int target_big_endian;
static int mips_64; static int mips_64;
/* The default target format to use. */ /* The default target format to use. */
const char * const char *
mips_target_format () mips_target_format ()
{ {
@ -152,8 +153,7 @@ mips_target_format ()
pseudo-op. We use a struct so that .set push and .set pop are more pseudo-op. We use a struct so that .set push and .set pop are more
reliable. */ reliable. */
struct mips_set_options struct mips_set_options {
{
/* MIPS ISA (Instruction Set Architecture) level. This is set to -1 /* MIPS ISA (Instruction Set Architecture) level. This is set to -1
if it has not been initialized. Changed by `.set mipsN', and the if it has not been initialized. Changed by `.set mipsN', and the
-mipsN command line option, and the default CPU. */ -mipsN command line option, and the default CPU. */
@ -190,8 +190,7 @@ struct mips_set_options
that we must set the isa field to ISA_UNKNOWN and the mips16 field to that we must set the isa field to ISA_UNKNOWN and the mips16 field to
-1 to indicate that they have not been initialized. */ -1 to indicate that they have not been initialized. */
static struct mips_set_options mips_opts = static struct mips_set_options mips_opts = {
{
ISA_UNKNOWN, -1, 0, 0, 0, 0, 0, 0 ISA_UNKNOWN, -1, 0, 0, 0, 0, 0, 0
}; };
@ -208,7 +207,7 @@ static int file_mips_isa = ISA_UNKNOWN;
static int mips_cpu = CPU_UNKNOWN; static int mips_cpu = CPU_UNKNOWN;
/* The argument of the -mabi= flag. */ /* The argument of the -mabi= flag. */
static char* mips_abi_string = 0; static char *mips_abi_string = 0;
/* Wether we should mark the file EABI64 or EABI32. */ /* Wether we should mark the file EABI64 or EABI32. */
static int mips_eabi64 = 0; static int mips_eabi64 = 0;
@ -290,8 +289,7 @@ static int mips_gp32 = 0;
/* MIPS PIC level. */ /* MIPS PIC level. */
enum mips_pic_level enum mips_pic_level {
{
/* Do not generate PIC code. */ /* Do not generate PIC code. */
NO_PIC, NO_PIC,
@ -485,8 +483,7 @@ static int prev_nop_frag_since;
relocation. We then sort them so that they immediately precede the relocation. We then sort them so that they immediately precede the
corresponding LO relocation. */ corresponding LO relocation. */
struct mips_hi_fixup struct mips_hi_fixup {
{
/* Next HI fixup. */ /* Next HI fixup. */
struct mips_hi_fixup *next; struct mips_hi_fixup *next;
/* This fixup. */ /* This fixup. */
@ -502,8 +499,7 @@ static struct mips_hi_fixup *mips_hi_fixup_list;
/* Map normal MIPS register numbers to mips16 register numbers. */ /* Map normal MIPS register numbers to mips16 register numbers. */
#define X ILLEGAL_REG #define X ILLEGAL_REG
static const int mips32_to_16_reg_map[] = static const int mips32_to_16_reg_map[] = {
{
X, X, 2, 3, 4, 5, 6, 7, X, X, 2, 3, 4, 5, 6, 7,
X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X,
0, 1, X, X, X, X, X, X, 0, 1, X, X, X, X, X, X,
@ -513,8 +509,7 @@ static const int mips32_to_16_reg_map[] =
/* Map mips16 register numbers to normal MIPS register numbers. */ /* Map mips16 register numbers to normal MIPS register numbers. */
static const unsigned int mips16_to_32_reg_map[] = static const unsigned int mips16_to_32_reg_map[] = {
{
16, 17, 2, 3, 4, 5, 6, 7 16, 17, 2, 3, 4, 5, 6, 7
}; };
@ -589,8 +584,8 @@ static const unsigned int mips16_to_32_reg_map[] =
| ((warn) ? 1 : 0))) | ((warn) ? 1 : 0)))
#define RELAX_OLD(i) (((i) >> 23) & 0x7f) #define RELAX_OLD(i) (((i) >> 23) & 0x7f)
#define RELAX_NEW(i) (((i) >> 16) & 0x7f) #define RELAX_NEW(i) (((i) >> 16) & 0x7f)
#define RELAX_RELOC1(i) ((bfd_vma)(((i) >> 9) & 0x7f) - 64) #define RELAX_RELOC1(i) ((bfd_vma) (((i) >> 9) & 0x7f) - 64)
#define RELAX_RELOC2(i) ((bfd_vma)(((i) >> 2) & 0x7f) - 64) #define RELAX_RELOC2(i) ((bfd_vma) (((i) >> 2) & 0x7f) - 64)
#define RELAX_RELOC3(i) (((i) >> 1) & 1) #define RELAX_RELOC3(i) (((i) >> 1) & 1)
#define RELAX_WARN(i) ((i) & 1) #define RELAX_WARN(i) ((i) & 1)
@ -718,8 +713,7 @@ static int validate_mips_insn PARAMS ((const struct mips_opcode *));
/* Table and functions used to map between CPU/ISA names, and /* Table and functions used to map between CPU/ISA names, and
ISA levels, and CPU numbers. */ ISA levels, and CPU numbers. */
struct mips_cpu_info struct mips_cpu_info {
{
const char *name; /* CPU or ISA name. */ const char *name; /* CPU or ISA name. */
int is_isa; /* Is this an ISA? (If 0, a CPU.) */ int is_isa; /* Is this an ISA? (If 0, a CPU.) */
int isa; /* ISA level. */ int isa; /* ISA level. */
@ -748,8 +742,7 @@ static const struct mips_cpu_info *mips_cpu_info_from_cpu PARAMS ((int));
they are not currently supported: .asm0, .endr, .lab, .repeat, they are not currently supported: .asm0, .endr, .lab, .repeat,
.struct. */ .struct. */
static const pseudo_typeS mips_pseudo_table[] = static const pseudo_typeS mips_pseudo_table[] = {
{
/* MIPS specific pseudo-ops. */ /* MIPS specific pseudo-ops. */
{"option", s_option, 0}, {"option", s_option, 0},
{"set", s_mipsset, 0}, {"set", s_mipsset, 0},
@ -823,8 +816,7 @@ mips_pop_insert ()
/* Symbols labelling the current insn. */ /* Symbols labelling the current insn. */
struct insn_label_list struct insn_label_list {
{
struct insn_label_list *next; struct insn_label_list *next;
symbolS *label; symbolS *label;
}; };
@ -998,7 +990,7 @@ md_begin ()
the best, but then neither is basing the abi on the isa. */ the best, but then neither is basing the abi on the isa. */
if (ISA_HAS_64BIT_REGS (mips_opts.isa) if (ISA_HAS_64BIT_REGS (mips_opts.isa)
&& mips_abi_string && mips_abi_string
&& 0 == strcmp (mips_abi_string,"eabi")) && 0 == strcmp (mips_abi_string, "eabi"))
mips_eabi64 = 1; mips_eabi64 = 1;
/* If they asked for mips1 or mips2 and a cpu that is /* If they asked for mips1 or mips2 and a cpu that is
@ -1224,7 +1216,7 @@ md_assemble (str)
else else
{ {
mips_ip (str, &insn); mips_ip (str, &insn);
DBG((_("returned from mips_ip(%s) insn_opcode = 0x%x\n"), DBG ((_("returned from mips_ip(%s) insn_opcode = 0x%x\n"),
str, insn.insn_opcode)); str, insn.insn_opcode));
} }
@ -1893,7 +1885,7 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
instruction. May want to add this support in the future. */ instruction. May want to add this support in the future. */
} }
/* Never set the bit for $0, which is always zero. */ /* Never set the bit for $0, which is always zero. */
mips_gprmask &=~ 1 << 0; mips_gprmask &= ~1 << 0;
} }
else else
{ {
@ -3083,8 +3075,8 @@ load_register (counter, reg, ep, dbl)
himask = 0xffff << (shift - 32); himask = 0xffff << (shift - 32);
lomask = 0; lomask = 0;
} }
if ((hi32.X_add_number & ~ (offsetT) himask) == 0 if ((hi32.X_add_number & ~(offsetT) himask) == 0
&& (lo32.X_add_number & ~ (offsetT) lomask) == 0) && (lo32.X_add_number & ~(offsetT) lomask) == 0)
{ {
expressionS tmp; expressionS tmp;
@ -3094,7 +3086,8 @@ load_register (counter, reg, ep, dbl)
| (lo32.X_add_number >> shift)); | (lo32.X_add_number >> shift));
else else
tmp.X_add_number = hi32.X_add_number >> (shift - 32); tmp.X_add_number = hi32.X_add_number >> (shift - 32);
macro_build ((char *) NULL, counter, &tmp, "ori", "t,r,i", reg, 0, macro_build ((char *) NULL, counter, &tmp,
"ori", "t,r,i", reg, 0,
(int) BFD_RELOC_LO16); (int) BFD_RELOC_LO16);
macro_build ((char *) NULL, counter, NULL, macro_build ((char *) NULL, counter, NULL,
(shift >= 32) ? "dsll32" : "dsll", (shift >= 32) ? "dsll32" : "dsll",
@ -3103,7 +3096,8 @@ load_register (counter, reg, ep, dbl)
return; return;
} }
shift++; shift++;
} while (shift <= (64 - 16)); }
while (shift <= (64 - 16));
/* Find the bit number of the lowest one bit, and store the /* Find the bit number of the lowest one bit, and store the
shifted value in hi/lo. */ shifted value in hi/lo. */
@ -3166,7 +3160,7 @@ load_register (counter, reg, ep, dbl)
/* Sign extend hi32 before calling load_register, because we can /* Sign extend hi32 before calling load_register, because we can
generally get better code when we load a sign extended value. */ generally get better code when we load a sign extended value. */
if ((hi32.X_add_number & 0x80000000) != 0) if ((hi32.X_add_number & 0x80000000) != 0)
hi32.X_add_number |= ~ (offsetT) 0xffffffff; hi32.X_add_number |= ~(offsetT) 0xffffffff;
load_register (counter, reg, &hi32, 0); load_register (counter, reg, &hi32, 0);
freg = reg; freg = reg;
} }
@ -8467,8 +8461,7 @@ mips16_ip (str, ip)
/* This structure holds information we know about a mips16 immediate /* This structure holds information we know about a mips16 immediate
argument type. */ argument type. */
struct mips16_immed_operand struct mips16_immed_operand {
{
/* The type code used in the argument string in the opcode table. */ /* The type code used in the argument string in the opcode table. */
int type; int type;
/* The number of bits in the short form of the opcode. */ /* The number of bits in the short form of the opcode. */
@ -8583,7 +8576,8 @@ mips16_immed (file, line, type, val, warn, small, ext, insn, use_extend,
needext = false; needext = false;
if (warn && ext && ! needext) if (warn && ext && ! needext)
as_warn_where (file, line, _("extended operand requested but not required")); as_warn_where (file, line,
_("extended operand requested but not required"));
if (small && needext) if (small && needext)
as_bad_where (file, line, _("invalid unextended operand value")); as_bad_where (file, line, _("invalid unextended operand value"));
@ -8825,8 +8819,7 @@ md_number_to_chars (buf, val, n)
CONST char *md_shortopts = "O::g::G:"; CONST char *md_shortopts = "O::g::G:";
struct option md_longopts[] = struct option md_longopts[] = {
{
#define OPTION_MIPS1 (OPTION_MD_BASE + 1) #define OPTION_MIPS1 (OPTION_MD_BASE + 1)
{"mips0", no_argument, NULL, OPTION_MIPS1}, {"mips0", no_argument, NULL, OPTION_MIPS1},
{"mips1", no_argument, NULL, OPTION_MIPS1}, {"mips1", no_argument, NULL, OPTION_MIPS1},
@ -9138,21 +9131,25 @@ md_parse_option (c, arg)
gcc, but to set this flag before gcc is built with such gcc, but to set this flag before gcc is built with such
multilibs will break too many systems. */ multilibs will break too many systems. */
/* mips_32bitmode = 1; */ #if 0
mips_32bitmode = 1;
#endif
break; break;
case OPTION_GP64: case OPTION_GP64:
mips_gp32 = 0; mips_gp32 = 0;
mips_64 = 1; mips_64 = 1;
/* mips_32bitmode = 0; */ #if 0
mips_32bitmode = 0;
#endif
break; break;
case OPTION_MABI: case OPTION_MABI:
if (strcmp (arg,"32") == 0 if (strcmp (arg, "32") == 0
|| strcmp (arg,"n32") == 0 || strcmp (arg, "n32") == 0
|| strcmp (arg,"64") == 0 || strcmp (arg, "64") == 0
|| strcmp (arg,"o64") == 0 || strcmp (arg, "o64") == 0
|| strcmp (arg,"eabi") == 0) || strcmp (arg, "eabi") == 0)
mips_abi_string = arg; mips_abi_string = arg;
break; break;
@ -9207,7 +9204,7 @@ md_show_usage (stream)
{ {
int column, first; int column, first;
fprintf(stream, _("\ fprintf (stream, _("\
MIPS options:\n\ MIPS options:\n\
-membedded-pic generate embedded position independent code\n\ -membedded-pic generate embedded position independent code\n\
-EB generate big endian output\n\ -EB generate big endian output\n\
@ -9215,7 +9212,7 @@ MIPS options:\n\
-g, -g2 do not remove uneeded NOPs or swap branches\n\ -g, -g2 do not remove uneeded NOPs or swap branches\n\
-G NUM allow referencing objects up to NUM bytes\n\ -G NUM allow referencing objects up to NUM bytes\n\
implicitly with the gp register [default 8]\n")); implicitly with the gp register [default 8]\n"));
fprintf(stream, _("\ fprintf (stream, _("\
-mips1 generate MIPS ISA I instructions\n\ -mips1 generate MIPS ISA I instructions\n\
-mips2 generate MIPS ISA II instructions\n\ -mips2 generate MIPS ISA II instructions\n\
-mips3 generate MIPS ISA III instructions\n\ -mips3 generate MIPS ISA III instructions\n\
@ -9259,17 +9256,17 @@ MIPS options:\n\
show (stream, "4650", &column, &first); show (stream, "4650", &column, &first);
fputc ('\n', stream); fputc ('\n', stream);
fprintf(stream, _("\ fprintf (stream, _("\
-mips16 generate mips16 instructions\n\ -mips16 generate mips16 instructions\n\
-no-mips16 do not generate mips16 instructions\n")); -no-mips16 do not generate mips16 instructions\n"));
fprintf(stream, _("\ fprintf (stream, _("\
-O0 remove unneeded NOPs, do not swap branches\n\ -O0 remove unneeded NOPs, do not swap branches\n\
-O remove unneeded NOPs and swap branches\n\ -O remove unneeded NOPs and swap branches\n\
--[no-]construct-floats [dis]allow floating point values to be constructed\n\ --[no-]construct-floats [dis]allow floating point values to be constructed\n\
--trap, --no-break trap exception on div by 0 and mult overflow\n\ --trap, --no-break trap exception on div by 0 and mult overflow\n\
--break, --no-trap break exception on div by 0 and mult overflow\n")); --break, --no-trap break exception on div by 0 and mult overflow\n"));
#ifdef OBJ_ELF #ifdef OBJ_ELF
fprintf(stream, _("\ fprintf (stream, _("\
-KPIC, -call_shared generate SVR4 position independent code\n\ -KPIC, -call_shared generate SVR4 position independent code\n\
-non_shared do not generate position independent code\n\ -non_shared do not generate position independent code\n\
-xgot assume a 32 bit GOT\n\ -xgot assume a 32 bit GOT\n\
@ -9283,7 +9280,7 @@ mips_init_after_args ()
{ {
/* initialize opcodes */ /* initialize opcodes */
bfd_mips_num_opcodes = bfd_mips_num_builtin_opcodes; bfd_mips_num_opcodes = bfd_mips_num_builtin_opcodes;
mips_opcodes = (struct mips_opcode*) mips_builtin_opcodes; mips_opcodes = (struct mips_opcode *) mips_builtin_opcodes;
} }
long long
@ -9452,7 +9449,6 @@ mips_frob_file ()
relocations, in case the linker has to relax a call. We also need relocations, in case the linker has to relax a call. We also need
to keep relocations for switch table entries. */ to keep relocations for switch table entries. */
/*ARGSUSED*/
int int
mips_force_relocation (fixp) mips_force_relocation (fixp)
fixS *fixp; fixS *fixp;
@ -10162,8 +10158,7 @@ s_option (x)
/* This structure is used to hold a stack of .set values. */ /* This structure is used to hold a stack of .set values. */
struct mips_option_stack struct mips_option_stack {
{
struct mips_option_stack *next; struct mips_option_stack *next;
struct mips_set_options options; struct mips_set_options options;
}; };
@ -10921,7 +10916,6 @@ mips16_extended_frag (fragp, sec, stretch)
encoded in the subtype information. For the mips16, we have to encoded in the subtype information. For the mips16, we have to
decide whether we are using an extended opcode or not. */ decide whether we are using an extended opcode or not. */
/*ARGSUSED*/
int int
md_estimate_size_before_relax (fragp, segtype) md_estimate_size_before_relax (fragp, segtype)
fragS *fragp; fragS *fragp;
@ -11511,11 +11505,11 @@ mips_elf_final_processing ()
/* Set the MIPS ELF ABI flags. */ /* Set the MIPS ELF ABI flags. */
if (mips_abi_string == 0) if (mips_abi_string == 0)
; ;
else if (strcmp (mips_abi_string,"32") == 0) else if (strcmp (mips_abi_string, "32") == 0)
elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_O32; elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_O32;
else if (strcmp (mips_abi_string,"o64") == 0) else if (strcmp (mips_abi_string, "o64") == 0)
elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_O64; elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_O64;
else if (strcmp (mips_abi_string,"eabi") == 0) else if (strcmp (mips_abi_string, "eabi") == 0)
{ {
if (mips_eabi64) if (mips_eabi64)
elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_EABI64; elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_EABI64;
@ -11529,8 +11523,7 @@ mips_elf_final_processing ()
#endif /* OBJ_ELF || OBJ_MAYBE_ELF */ #endif /* OBJ_ELF || OBJ_MAYBE_ELF */
typedef struct proc typedef struct proc {
{
symbolS *isym; symbolS *isym;
unsigned long reg_mask; unsigned long reg_mask;
unsigned long reg_offset; unsigned long reg_offset;
@ -11539,8 +11532,7 @@ typedef struct proc
unsigned long frame_offset; unsigned long frame_offset;
unsigned long frame_reg; unsigned long frame_reg;
unsigned long pc_reg; unsigned long pc_reg;
} } procS;
procS;
static procS cur_proc; static procS cur_proc;
static procS *cur_proc_ptr; static procS *cur_proc_ptr;
@ -11720,21 +11712,21 @@ s_mips_end (x)
assert (pdr_seg); assert (pdr_seg);
subseg_set (pdr_seg, 0); subseg_set (pdr_seg, 0);
/* Write the symbol */ /* Write the symbol. */
exp.X_op = O_symbol; exp.X_op = O_symbol;
exp.X_add_symbol = p; exp.X_add_symbol = p;
exp.X_add_number = 0; exp.X_add_number = 0;
emit_expr (&exp, 4); emit_expr (&exp, 4);
fragp = frag_more (7*4); fragp = frag_more (7 * 4);
md_number_to_chars (fragp, (valueT) cur_proc_ptr->reg_mask, 4); md_number_to_chars (fragp, (valueT) cur_proc_ptr->reg_mask, 4);
md_number_to_chars (fragp + 4, (valueT) cur_proc_ptr->reg_offset, 4); md_number_to_chars (fragp + 4, (valueT) cur_proc_ptr->reg_offset, 4);
md_number_to_chars (fragp + 8, (valueT) cur_proc_ptr->fpreg_mask, 4); md_number_to_chars (fragp + 8, (valueT) cur_proc_ptr->fpreg_mask, 4);
md_number_to_chars (fragp +12, (valueT) cur_proc_ptr->fpreg_offset, 4); md_number_to_chars (fragp + 12, (valueT) cur_proc_ptr->fpreg_offset, 4);
md_number_to_chars (fragp +16, (valueT) cur_proc_ptr->frame_offset, 4); md_number_to_chars (fragp + 16, (valueT) cur_proc_ptr->frame_offset, 4);
md_number_to_chars (fragp +20, (valueT) cur_proc_ptr->frame_reg, 4); md_number_to_chars (fragp + 20, (valueT) cur_proc_ptr->frame_reg, 4);
md_number_to_chars (fragp +24, (valueT) cur_proc_ptr->pc_reg, 4); md_number_to_chars (fragp + 24, (valueT) cur_proc_ptr->pc_reg, 4);
subseg_set (saved_seg, saved_subseg); subseg_set (saved_seg, saved_subseg);
} }
@ -11916,8 +11908,7 @@ s_loc (x)
Case is ignored in comparison, so put the canonical entry in the Case is ignored in comparison, so put the canonical entry in the
appropriate case but everything else in lower case to ease eye pain. */ appropriate case but everything else in lower case to ease eye pain. */
static const struct mips_cpu_info mips_cpu_info_table[] = static const struct mips_cpu_info mips_cpu_info_table[] = {
{
/* MIPS1 ISA */ /* MIPS1 ISA */
{ "MIPS1", 1, ISA_MIPS1, CPU_R3000, }, { "MIPS1", 1, ISA_MIPS1, CPU_R3000, },
{ "mips", 1, ISA_MIPS1, CPU_R3000, }, { "mips", 1, ISA_MIPS1, CPU_R3000, },
@ -12066,7 +12057,7 @@ mips_cpu_info_from_name (name)
int i; int i;
for (i = 0; mips_cpu_info_table[i].name != NULL; i++) for (i = 0; mips_cpu_info_table[i].name != NULL; i++)
if (strcasecmp(name, mips_cpu_info_table[i].name) == 0) if (strcasecmp (name, mips_cpu_info_table[i].name) == 0)
return (&mips_cpu_info_table[i]); return (&mips_cpu_info_table[i]);
return (NULL); return (NULL);