From 8e2e89f78ac366d74ac9a0e75afe056073589ef1 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 15 Jan 2002 13:38:03 +0000 Subject: [PATCH] read-rtl.c: Fix formatting. * read-rtl.c: Fix formatting. * real.c: Likewise. * recog.c: Likewise. * regclass.c: Likewise. * regmove.c: Likewise. * reg-stack.c: Likewise. * reload1.c: Likewise. * rtlanal.c: Likewise. From-SVN: r48870 --- gcc/ChangeLog | 11 +++++++++++ gcc/read-rtl.c | 20 ++++++++++---------- gcc/real.c | 50 +++++++++++++++++++++++++------------------------- gcc/recog.c | 6 +++--- gcc/reg-stack.c | 4 ++-- gcc/regclass.c | 18 +++++++++--------- gcc/regmove.c | 14 +++++++------- gcc/reload1.c | 16 ++++++++-------- gcc/rtlanal.c | 4 ++-- 9 files changed, 77 insertions(+), 66 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2d6fc5f..206c1b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,16 @@ 2002-01-15 Kazu Hirata + * read-rtl.c: Fix formatting. + * real.c: Likewise. + * recog.c: Likewise. + * regclass.c: Likewise. + * regmove.c: Likewise. + * reg-stack.c: Likewise. + * reload1.c: Likewise. + * rtlanal.c: Likewise. + +2002-01-15 Kazu Hirata + * config/i386/i386.c: Fix formatting. 2002-01-15 Jakub Jelinek diff --git a/gcc/read-rtl.c b/gcc/read-rtl.c index 3c9b9f5..5b937ec 100644 --- a/gcc/read-rtl.c +++ b/gcc/read-rtl.c @@ -73,7 +73,7 @@ fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msg, ...)) putc ('\n', stderr); /* Gather some following context. */ - for (i = 0; i < sizeof(context)-1; ++i) + for (i = 0; i < sizeof (context)-1; ++i) { c = getc (infile); if (c == EOF) @@ -376,13 +376,13 @@ read_string (ob, infile, star_if_braced) not provide one. */ #if HOST_BITS_PER_WIDE_INT > HOST_BITS_PER_LONG && !defined(HAVE_ATOLL) && !defined(HAVE_ATOQ) HOST_WIDE_INT -atoll(p) +atoll (p) const char *p; { int neg = 0; HOST_WIDE_INT tmp_wide; - while (ISSPACE(*p)) + while (ISSPACE (*p)) p++; if (*p == '-') neg = 1, p++; @@ -390,7 +390,7 @@ atoll(p) p++; tmp_wide = 0; - while (ISDIGIT(*p)) + while (ISDIGIT (*p)) { HOST_WIDE_INT new_wide = tmp_wide*10 + (*p - '0'); if (new_wide < tmp_wide) @@ -415,7 +415,7 @@ def_hash (def) const void *def; { unsigned result, i; - const char *string = ((const struct md_constant *)def)->name; + const char *string = ((const struct md_constant *) def)->name; for (result = i = 0;*string++ != '\0'; i++) result += ((unsigned char) *string << (i % CHAR_BIT)); @@ -427,8 +427,8 @@ static int def_name_eq_p (def1, def2) const void *def1, *def2; { - return ! strcmp (((const struct md_constant *)def1)->name, - ((const struct md_constant *)def2)->name); + return ! strcmp (((const struct md_constant *) def1)->name, + ((const struct md_constant *) def2)->name); } /* INFILE is a FILE pointer to read text from. TMP_CHAR is a buffer suitable @@ -510,7 +510,7 @@ validate_const_int (infile, string) int valid = 1; cp = string; - while (*cp && ISSPACE(*cp)) + while (*cp && ISSPACE (*cp)) cp++; if (*cp == '-' || *cp == '+') cp++; @@ -728,7 +728,7 @@ again: case 'w': read_name (tmp_char, infile); - validate_const_int(infile, tmp_char); + validate_const_int (infile, tmp_char); #if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT tmp_wide = atoi (tmp_char); #else @@ -750,7 +750,7 @@ again: case 'i': case 'n': read_name (tmp_char, infile); - validate_const_int(infile, tmp_char); + validate_const_int (infile, tmp_char); tmp_int = atoi (tmp_char); XINT (return_rtx, i) = tmp_int; break; diff --git a/gcc/real.c b/gcc/real.c index 3a12594..7b8879b 100644 --- a/gcc/real.c +++ b/gcc/real.c @@ -271,8 +271,8 @@ typedef unsigned int UHItype __attribute__ ((mode (HI))); # define PUT_REAL(e,r) \ do { \ memcpy ((r), (e), 2*NE); \ - if (2*NE < sizeof(*r)) \ - memset ((char *) (r) + 2*NE, 0, sizeof(*r) - 2*NE); \ + if (2*NE < sizeof (*r)) \ + memset ((char *) (r) + 2*NE, 0, sizeof (*r) - 2*NE); \ } while (0) # else /* no XFmode */ # if MAX_LONG_DOUBLE_TYPE_SIZE == 128 @@ -283,8 +283,8 @@ typedef unsigned int UHItype __attribute__ ((mode (HI))); # define PUT_REAL(e,r) \ do { \ memcpy ((r), (e), 2*NE); \ - if (2*NE < sizeof(*r)) \ - memset ((char *) (r) + 2*NE, 0, sizeof(*r) - 2*NE); \ + if (2*NE < sizeof (*r)) \ + memset ((char *) (r) + 2*NE, 0, sizeof (*r) - 2*NE); \ } while (0) #else #define NE 6 @@ -1015,7 +1015,7 @@ ereal_to_int (low, high, rr) ediv (df, d, dg); /* dg = d / 2^32 is the high word */ euifrac (dg, (unsigned HOST_WIDE_INT *) high, dh); emul (df, dh, dg); /* fractional part is the low word */ - euifrac (dg, (unsigned HOST_WIDE_INT *)low, dh); + euifrac (dg, (unsigned HOST_WIDE_INT *) low, dh); if (s) { /* complement and add 1 */ @@ -2382,9 +2382,9 @@ m16m (a, b, c) { m = (unsigned EMULONG) aa * *ps--; carry = (m & 0xffff) + *pp; - *pp-- = (UEMUSHORT)carry; + *pp-- = (UEMUSHORT) carry; carry = (carry >> 16) + (m >> 16) + *pp; - *pp = (UEMUSHORT)carry; + *pp = (UEMUSHORT) carry; *(pp-1) = carry >> 16; } } @@ -2428,7 +2428,7 @@ edivm (den, num) else tquot = tnum / tdenm; /* Multiply denominator by trial quotient digit. */ - m16m ((unsigned int)tquot, den, tprod); + m16m ((unsigned int) tquot, den, tprod); /* The quotient digit may have been overestimated. */ if (ecmpm (tprod, num) > 0) { @@ -2442,7 +2442,7 @@ edivm (den, num) } esubm (tprod, num); equot[i] = tquot; - eshup6(num); + eshup6 (num); } /* test for nonzero remainder after roundoff bit */ p = &num[M]; @@ -2457,7 +2457,7 @@ edivm (den, num) for (i=0; i= 0) && (k < base)) { /* Ignore leading zeros */ @@ -6123,7 +6123,7 @@ c4xtoe (d, e, mode) } else size = 2; - eshift(y, -8); + eshift (y, -8); /* Now do the two's complement on the data. */ @@ -6143,7 +6143,7 @@ c4xtoe (d, e, mode) if (carry) { - eshift(y, -1); + eshift (y, -1); y[M+1] |= 0x8000; r++; } @@ -6165,7 +6165,7 @@ c4xtoe (d, e, mode) y[M+2] = dn[2]; /* Fill in the rest of our mantissa. */ y[M+3] = dn[3]; } - eshift(y, -8); + eshift (y, -8); } emovo (y, e); @@ -6261,7 +6261,7 @@ toc4x (x, y, mode) { /* This is the case of -1 x 2^m, we have to rid ourselves of the high sign bit and shift the exponent. */ - eshift(x, 1); + eshift (x, 1); i--; } } diff --git a/gcc/recog.c b/gcc/recog.c index 652038a..ec0ec88 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -1,6 +1,6 @@ /* Subroutines used by or related to instruction recognition. Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 - 1999, 2000, 2001 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GCC. @@ -157,7 +157,7 @@ check_asm_operands (x) const char *c = constraints[i]; if (c[0] == '%') c++; - if (ISDIGIT ((unsigned char)c[0]) && c[1] == '\0') + if (ISDIGIT ((unsigned char) c[0]) && c[1] == '\0') c = constraints[c[0] - '0']; if (! asm_operand_ok (operands[i], c)) @@ -2253,7 +2253,7 @@ preprocess_constraints () break; default: - op_alt[j].class = reg_class_subunion[(int) op_alt[j].class][(int) REG_CLASS_FROM_LETTER ((unsigned char)c)]; + op_alt[j].class = reg_class_subunion[(int) op_alt[j].class][(int) REG_CLASS_FROM_LETTER ((unsigned char) c)]; break; } } diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index a1c4187..e7f69b0 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -871,7 +871,7 @@ remove_regno_note (insn, note, regno) { rtx *note_link, this; - note_link = ®_NOTES(insn); + note_link = ®_NOTES (insn); for (this = *note_link; this; this = XEXP (this, 1)) if (REG_NOTE_KIND (this) == note && REG_P (XEXP (this, 0)) && REGNO (XEXP (this, 0)) == regno) @@ -2223,7 +2223,7 @@ subst_stack_regs (insn, regstack) since the form of the newly emitted pop insn references the reg, making it no longer `unset'. */ - note_link = ®_NOTES(insn); + note_link = ®_NOTES (insn); for (note = *note_link; note; note = XEXP (note, 1)) if (REG_NOTE_KIND (note) == REG_UNUSED && STACK_REG_P (XEXP (note, 0))) { diff --git a/gcc/regclass.c b/gcc/regclass.c index 9577638..9bf0704 100644 --- a/gcc/regclass.c +++ b/gcc/regclass.c @@ -1192,7 +1192,7 @@ regclass (f, nregs, dump) costs = (struct costs *) xmalloc (nregs * sizeof (struct costs)); #ifdef CLASS_CANNOT_CHANGE_MODE - reg_changes_mode = BITMAP_XMALLOC(); + reg_changes_mode = BITMAP_XMALLOC (); #endif #ifdef FORBIDDEN_INC_DEC_CLASSES @@ -1341,7 +1341,7 @@ regclass (f, nregs, dump) best = (enum reg_class) class; } else if (p->cost[class] == best_cost) - best = reg_class_subunion[(int)best][class]; + best = reg_class_subunion[(int) best][class]; } /* Record the alternate register class; i.e., a class for which @@ -2214,8 +2214,8 @@ allocate_reg_info (num_regs, new_p, renumber_p) if (new_p) /* if we're zapping everything, no need to realloc */ { - free ((char *)renumber); - free ((char *)reg_pref); + free ((char *) renumber); + free ((char *) reg_pref); renumber = (short *) xmalloc (size_renumber); reg_pref_buffer = (struct reg_pref *) xmalloc (regno_allocated * sizeof (struct reg_pref)); @@ -2223,8 +2223,8 @@ allocate_reg_info (num_regs, new_p, renumber_p) else { - renumber = (short *) xrealloc ((char *)renumber, size_renumber); - reg_pref_buffer = (struct reg_pref *) xrealloc ((char *)reg_pref_buffer, + renumber = (short *) xrealloc ((char *) renumber, size_renumber); + reg_pref_buffer = (struct reg_pref *) xrealloc ((char *) reg_pref_buffer, regno_allocated * sizeof (struct reg_pref)); } @@ -2301,7 +2301,7 @@ free_reg_info () for (reg_data = reg_info_head; reg_data; reg_data = reg_next) { reg_next = reg_data->next; - free ((char *)reg_data); + free ((char *) reg_data); } free (reg_pref_buffer); @@ -2571,8 +2571,8 @@ reg_class_subset_p (c1, c2) if (c2 == ALL_REGS) win: return 1; - GO_IF_HARD_REG_SUBSET (reg_class_contents[(int)c1], - reg_class_contents[(int)c2], + GO_IF_HARD_REG_SUBSET (reg_class_contents[(int) c1], + reg_class_contents[(int) c2], win); return 0; } diff --git a/gcc/regmove.c b/gcc/regmove.c index c11fbcb..f184deb 100644 --- a/gcc/regmove.c +++ b/gcc/regmove.c @@ -239,7 +239,7 @@ mark_flags_life_zones (flags) { enum machine_mode mode = (flags ? HImode : VOIDmode); rtx insn; - for (insn = get_insns(); insn; insn = NEXT_INSN (insn)) + for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) PUT_MODE (insn, mode); return; } @@ -334,7 +334,7 @@ static int *regno_src_regno; a candidate for tying to a hard register, since the output might in turn be a candidate to be tied to a different hard register. */ static int -replacement_quality(reg) +replacement_quality (reg) rtx reg; { int src_regno; @@ -1104,12 +1104,12 @@ regmove_optimize (f, nregs, regmove_dump_file) && (GET_CODE (SET_SRC (set)) == SIGN_EXTEND || GET_CODE (SET_SRC (set)) == ZERO_EXTEND) && GET_CODE (XEXP (SET_SRC (set), 0)) == REG - && GET_CODE (SET_DEST(set)) == REG) + && GET_CODE (SET_DEST (set)) == REG) optimize_reg_copy_3 (insn, SET_DEST (set), SET_SRC (set)); if (flag_expensive_optimizations && ! pass && GET_CODE (SET_SRC (set)) == REG - && GET_CODE (SET_DEST(set)) == REG) + && GET_CODE (SET_DEST (set)) == REG) { /* If this is a register-register copy where SRC is not dead, see if we can optimize it. If this optimization succeeds, @@ -1124,7 +1124,7 @@ regmove_optimize (f, nregs, regmove_dump_file) if (regno_src_regno[REGNO (SET_DEST (set))] < 0 && SET_SRC (set) != SET_DEST (set)) { - int srcregno = REGNO (SET_SRC(set)); + int srcregno = REGNO (SET_SRC (set)); if (regno_src_regno[srcregno] >= 0) srcregno = regno_src_regno[srcregno]; regno_src_regno[REGNO (SET_DEST (set))] = srcregno; @@ -1599,7 +1599,7 @@ find_matches (insn, matchp) case 'j': case 'k': case 'l': case 'p': case 'q': case 't': case 'u': case 'v': case 'w': case 'x': case 'y': case 'z': case 'A': case 'B': case 'C': case 'D': case 'W': case 'Y': case 'Z': - if (CLASS_LIKELY_SPILLED_P (REG_CLASS_FROM_LETTER ((unsigned char)c))) + if (CLASS_LIKELY_SPILLED_P (REG_CLASS_FROM_LETTER ((unsigned char) c))) likely_spilled[op_no] = 1; break; } @@ -1922,7 +1922,7 @@ fixup_match_1 (insn, set, src, src_subreg, dst, backward, operand_number, if (note && CONSTANT_P (XEXP (note, 0))) { - for (q = PREV_INSN (insn); q; q = PREV_INSN(q)) + for (q = PREV_INSN (insn); q; q = PREV_INSN (q)) { /* ??? We can't scan past the end of a basic block without updating the register lifetime info diff --git a/gcc/reload1.c b/gcc/reload1.c index 81fba35..521e482 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -366,9 +366,9 @@ static int (*offsets_at)[NUM_ELIMINABLE_REGS]; static int num_labels; -static void replace_pseudos_in_call_usage PARAMS((rtx *, - enum machine_mode, - rtx)); +static void replace_pseudos_in_call_usage PARAMS ((rtx *, + enum machine_mode, + rtx)); static void maybe_fix_stack_asms PARAMS ((void)); static void copy_reloads PARAMS ((struct insn_chain *)); static void calculate_needs_all_insns PARAMS ((int)); @@ -4058,7 +4058,7 @@ reload_as_needed (live_known) /* Don't assume a reload reg is still good after a call insn if it is a call-used reg. */ else if (GET_CODE (insn) == CALL_INSN) - AND_COMPL_HARD_REG_SET(reg_reloaded_valid, call_used_reg_set); + AND_COMPL_HARD_REG_SET (reg_reloaded_valid, call_used_reg_set); } /* Clean up. */ @@ -5317,7 +5317,7 @@ choose_reload_regs (chain) { max_group_size = MAX (rld[j].nregs, max_group_size); group_class - = reg_class_superunion[(int) rld[j].class][(int)group_class]; + = reg_class_superunion[(int) rld[j].class][(int) group_class]; } save_reload_reg_rtx[j] = rld[j].reg_rtx; @@ -8347,8 +8347,8 @@ reload_cse_simplify_operands (insn) alternative_reject = (int *) alloca (recog_data.n_alternatives * sizeof (int)); alternative_nregs = (int *) alloca (recog_data.n_alternatives * sizeof (int)); alternative_order = (int *) alloca (recog_data.n_alternatives * sizeof (int)); - memset ((char *)alternative_reject, 0, recog_data.n_alternatives * sizeof (int)); - memset ((char *)alternative_nregs, 0, recog_data.n_alternatives * sizeof (int)); + memset ((char *) alternative_reject, 0, recog_data.n_alternatives * sizeof (int)); + memset ((char *) alternative_nregs, 0, recog_data.n_alternatives * sizeof (int)); /* For each operand, find out which regs are equivalent. */ for (i = 0; i < recog_data.n_operands; i++) @@ -8451,7 +8451,7 @@ reload_cse_simplify_operands (insn) default: class - = reg_class_subunion[(int) class][(int) REG_CLASS_FROM_LETTER ((unsigned char)c)]; + = reg_class_subunion[(int) class][(int) REG_CLASS_FROM_LETTER ((unsigned char) c)]; break; case ',': case '\0': diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index c536df7..3af6da7e 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -1410,7 +1410,7 @@ reg_overlap_mentioned_p (x, in) do_reg: endregno = regno + (regno < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (regno, GET_MODE (x)) : 1); - return refers_to_regno_p (regno, endregno, in, (rtx*)0); + return refers_to_regno_p (regno, endregno, in, (rtx*) 0); case MEM: { @@ -1857,7 +1857,7 @@ find_reg_fusage (insn, code, datum) return 0; if (! datum) - abort(); + abort (); if (GET_CODE (datum) != REG) { -- 2.7.4