From 9218cee06b920313d5d1e45bcdac166df6510c26 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 23 Feb 1997 22:47:20 +0000 Subject: [PATCH] minor formatting fixes --- gas/as.c | 28 ++++++++++++++-------------- gas/config/tc-mips.c | 35 +++++++++++++++++------------------ gas/itbl-ops.c | 2 -- gas/itbl-ops.h | 2 -- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/gas/as.c b/gas/as.c index 927580b80d..e5ca102cfd 100644 --- a/gas/as.c +++ b/gas/as.c @@ -143,7 +143,7 @@ Options:\n\ --statistics print various measured statistics from execution\n\ --version print assembler version number and exit\n\ -W suppress warnings\n\ --t,--itbl INSTTBL extend instruction set to include instrictions\n\ +-t,--itbl INSTTBL extend instruction set to include instructions\n\ matching the specifications defined in file INSTTBL\n\ -w ignored\n\ -X ignored\n\ @@ -278,8 +278,8 @@ parse_args (pargc, pargv) 'v', #endif 'w', 'X', - /* New option for extending instruction set (see also --itbl below) */ - 't', + /* New option for extending instruction set (see also --itbl below) */ + 't', '\0' }; struct option *longopts; @@ -305,11 +305,11 @@ parse_args (pargc, pargv) {"defsym", required_argument, NULL, OPTION_DEFSYM}, #define OPTION_INSTTBL (OPTION_STD_BASE + 8) /* New option for extending instruction set (see also -t above). - * The "-t file" or "--itbl file" option extends the basic set - * of valid instructions by reading "file", a text file containing - * a list of instruction formats. The additional opcodes and their - * formats are added to the built-in set of instructions, and - * mnemonics for new registers may also be defined. */ + The "-t file" or "--itbl file" option extends the basic set of + valid instructions by reading "file", a text file containing a + list of instruction formats. The additional opcodes and their + formats are added to the built-in set of instructions, and + mnemonics for new registers may also be defined. */ {"itbl", required_argument, NULL, OPTION_INSTTBL} }; @@ -460,12 +460,12 @@ the GNU General Public License. This program has absolutely no warranty.\n"); information from this table gets appended onto the existing internal table. */ itbl_files->name = xstrdup (optarg); - if (itbl_parse(itbl_files->name) != 0) - { - fprintf (stderr, "Failed to read instruction table %s\n", - itbl_files->name); - exit (EXIT_SUCCESS); - } + if (itbl_parse (itbl_files->name) != 0) + { + fprintf (stderr, "Failed to read instruction table %s\n", + itbl_files->name); + exit (EXIT_SUCCESS); + } } break; diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index f22f8e8a33..382540a01a 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -1109,7 +1109,7 @@ md_assemble (str) mips16_ip (str, &insn); else { - mips_ip (str, &insn); + mips_ip (str, &insn); DBG(("returned from mips_ip(%s) insn_opcode = 0x%x\n", str, insn.insn_opcode)); } @@ -5393,7 +5393,7 @@ macro (ip) s = "cop3"; copz: /* For now we just do C (same as Cz). */ - macro_build ((char *) NULL, &icnt, &offset_expr, s, "C"); + macro_build ((char *) NULL, &icnt, &offset_expr, s, "C"); return; #ifdef LOSING_COMPILER @@ -5407,11 +5407,11 @@ macro (ip) symbols, etc. Would it be more efficient to use mask (id) here? */ if (itbl_have_entries - && immed_expr = itbl_assemble(ip->insn_mo->name, ""), immed_expr) + && (immed_expr = itbl_assemble (ip->insn_mo->name, ""))) { s = ip->insn_mo->name; s2 = "cop3"; - coproc = ITBL_DECODE_PNUM(immed_expr);; + coproc = ITBL_DECODE_PNUM (immed_expr);; macro_build ((char *) NULL, &icnt, &immed_expr, s, "C"); return; } @@ -6077,8 +6077,8 @@ macro2 (ip) break; default: - /* FIXME: Check if this is one of the itbl macros, since they are - added dynamically. */ + /* FIXME: Check if this is one of the itbl macros, since they + are added dynamically. */ as_bad ("Macro %s not implemented yet", ip->insn_mo->name); break; } @@ -6603,19 +6603,20 @@ mips_ip (str, ip) int r; p = s+1; /* advance past '$' */ - n = itbl_get_field(&p); /* n is name */ + n = itbl_get_field (&p); /* n is name */ /* See if this is a register defined in an itbl entry */ - if (r = itbl_get_reg_val(n), r) + r = itbl_get_reg_val (n); + if (r) { - /* Get_field advances to the start of the next - field, so we need to back rack to the end of - the last field. */ + /* Get_field advances to the start of + the next field, so we need to back + rack to the end of the last field. */ if (p) - s = p-1; + s = p - 1; else - s = strchr(s,'\0'); + s = strchr (s,'\0'); regno = r; } else @@ -6682,8 +6683,8 @@ mips_ip (str, ip) case 'D': /* Itbl operand; not yet implemented. FIXME ?? */ break; - /* What about all other operands like 'i', - which can be specified in the opcode table? */ + /* What about all other operands like 'i', which + can be specified in the opcode table? */ } lastregno = regno; continue; @@ -8453,7 +8454,6 @@ MIPS options:\n\ #endif } - void mips_init_after_args () { @@ -8461,11 +8461,10 @@ mips_init_after_args () { /* initialize 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 md_pcrel_from (fixP) fixS *fixP; diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c index 95df3ac814..9117f3120e 100644 --- a/gas/itbl-ops.c +++ b/gas/itbl-ops.c @@ -1,6 +1,4 @@ - /* itbl-ops.c - Copyright (C) 1997 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. diff --git a/gas/itbl-ops.h b/gas/itbl-ops.h index 8653229b7c..7ec04f9895 100644 --- a/gas/itbl-ops.h +++ b/gas/itbl-ops.h @@ -1,6 +1,4 @@ - /* itbl-ops.h - Copyright (C) 1997 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. -- 2.34.1