aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog12
-rw-r--r--gas/app.c14
-rw-r--r--gas/as.c4
-rw-r--r--gas/ehopt.c2
-rw-r--r--gas/expr.c2
-rw-r--r--gas/input-file.c40
-rw-r--r--gas/listing.c54
-rw-r--r--gas/macro.h2
-rw-r--r--gas/stabs.c2
-rw-r--r--gas/symbols.c2
10 files changed, 73 insertions, 61 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index d244da0..062daf3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-18 Kazu Hirata <kazu@cs.umass.edu>
+
+ * app.c: Fix formatting.
+ * as.c: Likewise.
+ * ehopt.c: Likewise.
+ * expr.c: Likewise.
+ * input-file.c: Likewise.
+ * listing.c: Likewise.
+ * macro.h: Likewise.
+ * stabs.c: Likewise.
+ * symbols.c: Likewise.
+
2002-05-17 Alan Modra <amodra@bigpond.net.au>
* config/obj-generic.c: Delete file.
diff --git a/gas/app.c b/gas/app.c
index a3589da..f9c5c7d 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -424,13 +424,13 @@ do_scrub_chars (get, tostart, tolen)
I don't want to make such a significant change to the assembler's
memory usage. */
-#define PUT(pch) \
- do \
- { \
- *to++ = (pch); \
- if (to >= toend) \
- goto tofull; \
- } \
+#define PUT(pch) \
+ do \
+ { \
+ *to++ = (pch); \
+ if (to >= toend) \
+ goto tofull; \
+ } \
while (0)
if (saved_input != NULL)
diff --git a/gas/as.c b/gas/as.c
index 8d48716..83fbf1a 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -500,8 +500,8 @@ parse_args (pargc, pargv)
break;
case OPTION_TARGET_HELP:
- md_show_usage (stdout);
- exit (EXIT_SUCCESS);
+ md_show_usage (stdout);
+ exit (EXIT_SUCCESS);
case OPTION_HELP:
show_usage (stdout);
diff --git a/gas/ehopt.c b/gas/ehopt.c
index ad6e028..4f5c9b2 100644
--- a/gas/ehopt.c
+++ b/gas/ehopt.c
@@ -370,7 +370,7 @@ check_eh_frame (exp, pnbytes)
d->state = state_error;
else
{
- int left = (d->aug_size -= *pnbytes);
+ int left = (d->aug_size -= *pnbytes);
if (left == 0)
d->state = state_wait_loc4;
else if (left < 0)
diff --git a/gas/expr.c b/gas/expr.c
index 74c49d9..13c167a 100644
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -803,7 +803,7 @@ operand (expressionP)
integer_constant ((NUMBERS_WITH_SUFFIX || flag_m68k_mri)
? 0 : 10,
- expressionP);
+ expressionP);
break;
#ifdef LITERAL_PREFIXDOLLAR_HEX
diff --git a/gas/input-file.c b/gas/input-file.c
index 798f327..5c23f31 100644
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -157,29 +157,29 @@ input_file_open (filename, pre)
/* Begins with comment, may not want to preprocess. */
c = getc (f_in);
if (c == 'N')
- {
- fgets (buf, 80, f_in);
- if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))
- preprocess = 0;
- if (!strchr (buf, '\n'))
- ungetc ('#', f_in); /* It was longer. */
- else
- ungetc ('\n', f_in);
- }
+ {
+ fgets (buf, 80, f_in);
+ if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))
+ preprocess = 0;
+ if (!strchr (buf, '\n'))
+ ungetc ('#', f_in); /* It was longer. */
+ else
+ ungetc ('\n', f_in);
+ }
else if (c == 'A')
- {
- fgets (buf, 80, f_in);
- if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
- preprocess = 1;
- if (!strchr (buf, '\n'))
- ungetc ('#', f_in);
- else
- ungetc ('\n', f_in);
- }
+ {
+ fgets (buf, 80, f_in);
+ if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
+ preprocess = 1;
+ if (!strchr (buf, '\n'))
+ ungetc ('#', f_in);
+ else
+ ungetc ('\n', f_in);
+ }
else if (c == '\n')
- ungetc ('\n', f_in);
+ ungetc ('\n', f_in);
else
- ungetc ('#', f_in);
+ ungetc ('#', f_in);
}
else
ungetc (c, f_in);
diff --git a/gas/listing.c b/gas/listing.c
index c92f2db..91b5253 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -616,36 +616,36 @@ calc_hex (list)
data_buffer_size += 2;
octet_in_frag++;
}
- if (frag_ptr->fr_type == rs_fill)
- {
- unsigned int var_rep_max = octet_in_frag;
- unsigned int var_rep_idx = octet_in_frag;
-
- /* Print as many bytes from the variable part as is sensible. */
- while (((offsetT) octet_in_frag
- < (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
- && data_buffer_size < MAX_BYTES - 3)
- {
- if (address == ~(unsigned int) 0)
- {
- address = frag_ptr->fr_address / OCTETS_PER_BYTE;
- }
- sprintf (data_buffer + data_buffer_size,
- "%02X",
- (frag_ptr->fr_literal[var_rep_idx]) & 0xff);
+ if (frag_ptr->fr_type == rs_fill)
+ {
+ unsigned int var_rep_max = octet_in_frag;
+ unsigned int var_rep_idx = octet_in_frag;
+
+ /* Print as many bytes from the variable part as is sensible. */
+ while (((offsetT) octet_in_frag
+ < (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
+ && data_buffer_size < MAX_BYTES - 3)
+ {
+ if (address == ~(unsigned int) 0)
+ {
+ address = frag_ptr->fr_address / OCTETS_PER_BYTE;
+ }
+ sprintf (data_buffer + data_buffer_size,
+ "%02X",
+ (frag_ptr->fr_literal[var_rep_idx]) & 0xff);
#if 0
- data_buffer[data_buffer_size++] = '*';
- data_buffer[data_buffer_size++] = '*';
+ data_buffer[data_buffer_size++] = '*';
+ data_buffer[data_buffer_size++] = '*';
#endif
- data_buffer_size += 2;
+ data_buffer_size += 2;
- var_rep_idx++;
- octet_in_frag++;
+ var_rep_idx++;
+ octet_in_frag++;
- if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
- var_rep_idx = var_rep_max;
- }
- }
+ if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
+ var_rep_idx = var_rep_max;
+ }
+ }
frag_ptr = frag_ptr->fr_next;
}
@@ -1063,7 +1063,7 @@ listing_listing (name)
if (!((listing & LISTING_NODEBUG)
&& debugging_pseudo (list, list->line_contents)))
{
- print_lines (list,
+ print_lines (list,
list->file->linenum == 0 ? list->line : list->file->linenum,
list->line_contents, calc_hex (list));
}
diff --git a/gas/macro.h b/gas/macro.h
index beff9a8..b9dc2d0 100644
--- a/gas/macro.h
+++ b/gas/macro.h
@@ -79,7 +79,7 @@ extern const char *define_macro
PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *)),
const char **namep));
extern int check_macro PARAMS ((const char *, sb *, int, const char **,
- macro_entry **));
+ macro_entry **));
extern void delete_macro PARAMS ((const char *));
extern const char *expand_irp
PARAMS ((int, int, sb *, sb *, int (*) PARAMS ((sb *)), int));
diff --git a/gas/stabs.c b/gas/stabs.c
index 96f279a..38bbc24 100644
--- a/gas/stabs.c
+++ b/gas/stabs.c
@@ -247,7 +247,7 @@ s_stab_generic (what, stab_secname, stabstr_secname)
format, probably DWARF. */
as_warn (_(".stab%c: description field '%x' too big, try a different debug format"),
what, desc);
-
+
if (what == 's' || what == 'n')
{
if (*input_line_pointer != ',')
diff --git a/gas/symbols.c b/gas/symbols.c
index 05e6557..d86c52a 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -2398,7 +2398,7 @@ print_symbol_value_1 (file, sym)
segT s = S_GET_SEGMENT (sym);
if (s != undefined_section
- && s != expr_section)
+ && s != expr_section)
fprintf (file, " %lx", (long) S_GET_VALUE (sym));
}
else if (indent_level < max_indent_level