* config/tc-mmix.c: Fix formatting.

* config/tc-mmix.h: Likewise.
This commit is contained in:
Kazu Hirata
2002-05-09 00:33:09 +00:00
parent a4ad835692
commit a1b6236b7d
3 changed files with 138 additions and 130 deletions

View File

@ -1,3 +1,8 @@
2002-05-08 Kazu Hirata <kazu@cs.umass.edu>
* config/tc-mmix.c: Fix formatting.
* config/tc-mmix.h: Likewise.
2002-05-08 Alan Modra <amodra@bigpond.net.au> 2002-05-08 Alan Modra <amodra@bigpond.net.au>
* configure: Regenerate. * configure: Regenerate.

View File

@ -262,28 +262,28 @@ struct obstack mmix_sym_obstack;
#define GETA_0F (65536 * 4 - 8) #define GETA_0F (65536 * 4 - 8)
#define GETA_0B (-65536 * 4 - 4) #define GETA_0B (-65536 * 4 - 4)
#define GETA_MAX_LEN 4*4 #define GETA_MAX_LEN 4 * 4
#define GETA_3F 0 #define GETA_3F 0
#define GETA_3B 0 #define GETA_3B 0
#define BCC_0F GETA_0F #define BCC_0F GETA_0F
#define BCC_0B GETA_0B #define BCC_0B GETA_0B
#define BCC_MAX_LEN 6*4 #define BCC_MAX_LEN 6 * 4
#define BCC_5F GETA_3F #define BCC_5F GETA_3F
#define BCC_5B GETA_3B #define BCC_5B GETA_3B
#define PUSHJ_0F GETA_0F #define PUSHJ_0F GETA_0F
#define PUSHJ_0B GETA_0B #define PUSHJ_0B GETA_0B
#define PUSHJ_MAX_LEN 5*4 #define PUSHJ_MAX_LEN 5 * 4
#define PUSHJ_4F GETA_3F #define PUSHJ_4F GETA_3F
#define PUSHJ_4B GETA_3B #define PUSHJ_4B GETA_3B
#define JMP_0F (65536 * 256 * 4 - 8) #define JMP_0F (65536 * 256 * 4 - 8)
#define JMP_0B (-65536 * 256 * 4 - 4) #define JMP_0B (-65536 * 256 * 4 - 4)
#define JMP_MAX_LEN 5*4 #define JMP_MAX_LEN 5 * 4
#define JMP_4F 0 #define JMP_4F 0
#define JMP_4B 0 #define JMP_4B 0
@ -413,7 +413,7 @@ mmix_fill_nops (opcodep, n)
int i; int i;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
md_number_to_chars (opcodep + i*4, SWYM_INSN_BYTE << 24, 4); md_number_to_chars (opcodep + i * 4, SWYM_INSN_BYTE << 24, 4);
} }
/* See macro md_parse_name in tc-mmix.h. */ /* See macro md_parse_name in tc-mmix.h. */
@ -712,7 +712,7 @@ static void
mmix_discard_rest_of_line () mmix_discard_rest_of_line ()
{ {
while (*input_line_pointer while (*input_line_pointer
&& (! is_end_of_line [(unsigned char) *input_line_pointer] && (! is_end_of_line[(unsigned char) *input_line_pointer]
|| TC_EOL_IN_INSN (input_line_pointer))) || TC_EOL_IN_INSN (input_line_pointer)))
input_line_pointer++; input_line_pointer++;
} }
@ -746,7 +746,7 @@ mmix_md_begin ()
/* This will break the day the "lex" thingy changes. For now, it's the /* This will break the day the "lex" thingy changes. For now, it's the
only way to make ':' part of a name, and a name beginner. */ only way to make ':' part of a name, and a name beginner. */
lex_type [':'] = (LEX_NAME | LEX_BEGIN_NAME); lex_type[':'] = (LEX_NAME | LEX_BEGIN_NAME);
mmix_opcode_hash = hash_new (); mmix_opcode_hash = hash_new ();
@ -1081,7 +1081,7 @@ md_assemble (str)
} }
if (expand_op) if (expand_op)
frag_var (rs_machine_dependent, 4*4, 0, frag_var (rs_machine_dependent, 4 * 4, 0,
ENCODE_RELAX (STATE_JMP, STATE_UNDF), ENCODE_RELAX (STATE_JMP, STATE_UNDF),
exp[0].X_add_symbol, exp[0].X_add_symbol,
exp[0].X_add_number, exp[0].X_add_number,
@ -2025,7 +2025,7 @@ s_greg (unused)
register. */ register. */
c = get_symbol_end (); c = get_symbol_end ();
if (! is_end_of_line [(unsigned char) c]) if (! is_end_of_line[(unsigned char) c])
input_line_pointer++; input_line_pointer++;
if (*p) if (*p)
@ -2904,7 +2904,7 @@ mmix_handle_mmixal ()
/* Don't handle empty lines here. */ /* Don't handle empty lines here. */
while (1) while (1)
{ {
if (*s0 == 0 || is_end_of_line [(unsigned int) *s0]) if (*s0 == 0 || is_end_of_line[(unsigned int) *s0])
return; return;
if (! ISSPACE (*s0)) if (! ISSPACE (*s0))
@ -2935,7 +2935,7 @@ mmix_handle_mmixal ()
/* For errors emitted here, the book-keeping is off by one; the /* For errors emitted here, the book-keeping is off by one; the
caller is about to bump the counters. Adjust the error messages. */ caller is about to bump the counters. Adjust the error messages. */
if (is_end_of_line [(unsigned int) *s]) if (is_end_of_line[(unsigned int) *s])
{ {
char *name; char *name;
unsigned int line; unsigned int line;
@ -2988,10 +2988,10 @@ mmix_handle_mmixal ()
pending_label[len_0 - 1] = 0; pending_label[len_0 - 1] = 0;
} }
while (*s0 && ISSPACE (*s0) && ! is_end_of_line [(unsigned int) *s0]) while (*s0 && ISSPACE (*s0) && ! is_end_of_line[(unsigned int) *s0])
s0++; s0++;
if (pending_label != NULL && is_end_of_line [(unsigned int) *s0]) if (pending_label != NULL && is_end_of_line[(unsigned int) *s0])
/* Whoops, this was actually a lone label on a line. Like :-ended /* Whoops, this was actually a lone label on a line. Like :-ended
labels, we don't attach such labels to the next instruction or labels, we don't attach such labels to the next instruction or
pseudo. */ pseudo. */
@ -3011,7 +3011,7 @@ mmix_handle_mmixal ()
while (*s) while (*s)
{ {
c = *s++; c = *s++;
if (is_end_of_line [(unsigned int) c]) if (is_end_of_line[(unsigned int) c])
break; break;
if (c == MAGIC_FB_BACKWARD_CHAR || c == MAGIC_FB_FORWARD_CHAR) if (c == MAGIC_FB_BACKWARD_CHAR || c == MAGIC_FB_FORWARD_CHAR)
as_bad (_("invalid characters in input")); as_bad (_("invalid characters in input"));
@ -3048,7 +3048,7 @@ mmix_handle_mmixal ()
/* FIXME: Test-case for semi-colon in string. */ /* FIXME: Test-case for semi-colon in string. */
while (*s while (*s
&& *s != '"' && *s != '"'
&& (! is_end_of_line [(unsigned int) *s] || *s == ';')) && (! is_end_of_line[(unsigned int) *s] || *s == ';'))
s++; s++;
if (*s == '"') if (*s == '"')
@ -3241,7 +3241,7 @@ mmix_fb_label (expP)
int int
mmix_force_relocation (fixP) mmix_force_relocation (fixP)
fixS * fixP; fixS *fixP;
{ {
if (fixP->fx_r_type == BFD_RELOC_MMIX_LOCAL if (fixP->fx_r_type == BFD_RELOC_MMIX_LOCAL
|| fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
@ -3758,7 +3758,7 @@ mmix_parse_predefined_name (name, expP)
return 0; return 0;
for (i = 0; for (i = 0;
i < sizeof (predefined_abs_syms)/sizeof (predefined_abs_syms[0]); i < sizeof (predefined_abs_syms) / sizeof (predefined_abs_syms[0]);
i++) i++)
if (strcmp (canon_name, predefined_abs_syms[i].name) == 0) if (strcmp (canon_name, predefined_abs_syms[i].name) == 0)
{ {
@ -4129,7 +4129,7 @@ mmix_cons (nbytes)
SKIP_WHITESPACE (); SKIP_WHITESPACE ();
if (is_end_of_line [(unsigned int) *input_line_pointer]) if (is_end_of_line[(unsigned int) *input_line_pointer])
{ {
/* Default to zero if the expression was absent. */ /* Default to zero if the expression was absent. */

View File

@ -92,7 +92,8 @@ extern void mmix_fb_label PARAMS ((expressionS *));
/* Since integer_constant is local to expr.c, we have to make this a /* Since integer_constant is local to expr.c, we have to make this a
macro. FIXME: Do it cleaner. */ macro. FIXME: Do it cleaner. */
#define md_operand(exp) \ #define md_operand(exp) \
do { \ do \
{ \
if (input_line_pointer[0] == '#') \ if (input_line_pointer[0] == '#') \
{ \ { \
input_line_pointer++; \ input_line_pointer++; \
@ -103,8 +104,8 @@ extern void mmix_fb_label PARAMS ((expressionS *));
as_bad (_("`&' serial number operator is not supported")); \ as_bad (_("`&' serial number operator is not supported")); \
else \ else \
mmix_fb_label (exp); \ mmix_fb_label (exp); \
} while (0) } \
while (0)
/* Gas dislikes the 2ADD, 8ADD etc. insns, so we have to assemble them in /* Gas dislikes the 2ADD, 8ADD etc. insns, so we have to assemble them in
the error-recovery loop. Hopefully there are no significant the error-recovery loop. Hopefully there are no significant
@ -147,7 +148,8 @@ extern void mmix_adjust_symtab PARAMS ((void));
though. */ though. */
extern int mmix_globalize_symbols; extern int mmix_globalize_symbols;
#define tc_frob_symbol(sym, punt) \ #define tc_frob_symbol(sym, punt) \
do { \ do \
{ \
if (S_GET_SEGMENT (sym) == reg_section \ if (S_GET_SEGMENT (sym) == reg_section \
|| (symp) == section_symbol (absolute_section)) \ || (symp) == section_symbol (absolute_section)) \
(punt) = 1; \ (punt) = 1; \
@ -161,7 +163,8 @@ extern int mmix_globalize_symbols;
|| (S_GET_NAME (sym)[0] != '$' \ || (S_GET_NAME (sym)[0] != '$' \
&& S_GET_VALUE (sym) < 256))) \ && S_GET_VALUE (sym) < 256))) \
S_SET_EXTERNAL (sym); \ S_SET_EXTERNAL (sym); \
} while (0) } \
while (0)
/* When relaxing, we need to emit various relocs we otherwise wouldn't. */ /* When relaxing, we need to emit various relocs we otherwise wouldn't. */
#define TC_FORCE_RELOCATION(fix) mmix_force_relocation (fix) #define TC_FORCE_RELOCATION(fix) mmix_force_relocation (fix)