diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d53102fd8af..23609c61419 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2002-01-10 Kazu Hirata + + * varasm.c: Fix formatting. + * varray.c: Likewise. + * vmsdbgout.c: Likewise. + * xcoffout.c: Likewise. + Thu Jan 10 17:19:12 CET 2002 Jan Hubicka * cfgcleanup.c (try_forward_edges): Properly initialize nthreaded_edges; diff --git a/gcc/varasm.c b/gcc/varasm.c index c7534109f81..3ad78504263 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -2425,7 +2425,7 @@ static struct constant_descriptor *const_hash_table[MAX_HASH_TABLE]; they are actually used. This will be if something takes its address or if there is a usage of the string in the RTL of a function. */ -#define STRHASH(x) ((hashval_t)((long)(x) >> 3)) +#define STRHASH(x) ((hashval_t) ((long) (x) >> 3)) struct deferred_string { @@ -2590,7 +2590,7 @@ const_hash (exp) else if (GET_CODE (value.base) == LABEL_REF) hi = value.offset + CODE_LABEL_NUMBER (XEXP (value.base, 0)) * 13; else - abort(); + abort (); hi &= (1 << HASHBITS) - 1; hi %= MAX_HASH_TABLE; diff --git a/gcc/varray.c b/gcc/varray.c index aa6de129ec8..eef2234099a 100644 --- a/gcc/varray.c +++ b/gcc/varray.c @@ -1,5 +1,5 @@ /* Virtual array support. - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of GCC. @@ -62,7 +62,7 @@ varray_grow (va, n) size_t old_data_size = old_elements * element_size; size_t data_size = n * element_size; - va = (varray_type) xrealloc ((char *)va, VARRAY_HDR_SIZE + data_size); + va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size); va->num_elements = n; if (n > old_elements) memset (&va->data.c[old_data_size], 0, data_size - old_data_size); diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c index b86719df4c1..da3948bcb3f 100644 --- a/gcc/vmsdbgout.c +++ b/gcc/vmsdbgout.c @@ -1,6 +1,6 @@ /* Output VMS debug format symbol table information from the GNU C compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Douglas B. Rupp (rupp@gnat.com). This file is part of GNU CC. @@ -277,37 +277,49 @@ static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES]; #endif #ifndef ASM_OUTPUT_DEBUG_DELTA2 -#define ASM_OUTPUT_DEBUG_DELTA2(FILE,LABEL1,LABEL2) \ - do { fprintf ((FILE), "\t%s\t", UNALIGNED_SHORT_ASM_OP); \ - assemble_name (FILE, LABEL1); \ - fprintf (FILE, "-"); \ - assemble_name (FILE, LABEL2); \ - } while (0) +#define ASM_OUTPUT_DEBUG_DELTA2(FILE,LABEL1,LABEL2) \ + do \ + { \ + fprintf ((FILE), "\t%s\t", UNALIGNED_SHORT_ASM_OP); \ + assemble_name (FILE, LABEL1); \ + fprintf (FILE, "-"); \ + assemble_name (FILE, LABEL2); \ + } \ + while (0) #endif #ifndef ASM_OUTPUT_DEBUG_DELTA4 -#define ASM_OUTPUT_DEBUG_DELTA4(FILE,LABEL1,LABEL2) \ - do { fprintf ((FILE), "\t%s\t", UNALIGNED_INT_ASM_OP); \ - assemble_name (FILE, LABEL1); \ - fprintf (FILE, "-"); \ - assemble_name (FILE, LABEL2); \ - } while (0) +#define ASM_OUTPUT_DEBUG_DELTA4(FILE,LABEL1,LABEL2) \ + do \ + { \ + fprintf ((FILE), "\t%s\t", UNALIGNED_INT_ASM_OP); \ + assemble_name (FILE, LABEL1); \ + fprintf (FILE, "-"); \ + assemble_name (FILE, LABEL2); \ + } \ + while (0) #endif #ifndef ASM_OUTPUT_DEBUG_ADDR_DELTA -#define ASM_OUTPUT_DEBUG_ADDR_DELTA(FILE,LABEL1,LABEL2) \ - do { fprintf ((FILE), "\t%s\t", UNALIGNED_PTR_ASM_OP); \ - assemble_name (FILE, LABEL1); \ - fprintf (FILE, "-"); \ - assemble_name (FILE, LABEL2); \ - } while (0) +#define ASM_OUTPUT_DEBUG_ADDR_DELTA(FILE,LABEL1,LABEL2) \ + do \ + { \ + fprintf ((FILE), "\t%s\t", UNALIGNED_PTR_ASM_OP); \ + assemble_name (FILE, LABEL1); \ + fprintf (FILE, "-"); \ + assemble_name (FILE, LABEL2); \ + } \ + while (0) #endif #ifndef ASM_OUTPUT_DEBUG_ADDR -#define ASM_OUTPUT_DEBUG_ADDR(FILE,LABEL) \ - do { fprintf ((FILE), "\t%s\t", UNALIGNED_PTR_ASM_OP); \ - assemble_name (FILE, LABEL); \ - } while (0) +#define ASM_OUTPUT_DEBUG_ADDR(FILE,LABEL) \ + do \ + { \ + fprintf ((FILE), "\t%s\t", UNALIGNED_PTR_ASM_OP); \ + assemble_name (FILE, LABEL); \ + } \ + while (0) #endif #ifndef ASM_OUTPUT_DEBUG_ADDR_CONST @@ -352,24 +364,25 @@ static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES]; newline is produced. When flag_verbose_asm is asserted, we add commnetary at the end of the line, so we must avoid output of a newline here. */ #ifndef ASM_OUTPUT_DEBUG_STRING -#define ASM_OUTPUT_DEBUG_STRING(FILE,P) \ - do { \ - register int slen = strlen(P); \ - register char *p = (P); \ - register int i; \ - fprintf (FILE, "\t.ascii \""); \ - for (i = 0; i < slen; i++) \ - { \ - register int c = p[i]; \ - if (c == '\"' || c == '\\') \ - putc ('\\', FILE); \ - if (c >= ' ' && c < 0177) \ - putc (c, FILE); \ - else \ - fprintf (FILE, "\\%o", c); \ - } \ - fprintf (FILE, "\""); \ - } \ +#define ASM_OUTPUT_DEBUG_STRING(FILE,P) \ + do \ + { \ + register int slen = strlen(P); \ + register char *p = (P); \ + register int i; \ + fprintf (FILE, "\t.ascii \""); \ + for (i = 0; i < slen; i++) \ + { \ + register int c = p[i]; \ + if (c == '\"' || c == '\\') \ + putc ('\\', FILE); \ + if (c >= ' ' && c < 0177) \ + putc (c, FILE); \ + else \ + fprintf (FILE, "\\%o", c); \ + } \ + fprintf (FILE, "\""); \ + } \ while (0) #endif @@ -377,13 +390,14 @@ static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES]; macro has the same effect as ASM_OUTPUT_LABELREF, but copies to a string rather than writing to a file. */ #ifndef ASM_NAME_TO_STRING -#define ASM_NAME_TO_STRING(STR, NAME) \ - do { \ - if ((NAME)[0] == '*') \ - strcpy (STR, NAME+1); \ - else \ - strcpy (STR, NAME); \ - } \ +#define ASM_NAME_TO_STRING(STR, NAME) \ + do \ + { \ + if ((NAME)[0] == '*') \ + strcpy (STR, NAME+1); \ + else \ + strcpy (STR, NAME); \ + } \ while (0) #endif diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c index af7ce98ab23..8396b7b334c 100644 --- a/gcc/xcoffout.c +++ b/gcc/xcoffout.c @@ -1,5 +1,5 @@ /* Output xcoff-format symbol table information from GNU compiler. - Copyright (C) 1992, 1994, 1995, 1997, 1998, 1999, 2000 + Copyright (C) 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of GCC. @@ -75,11 +75,13 @@ const char *xcoff_lastfile; ((xcoff_inlining) ? (LINENO) : (LINENO) - xcoff_begin_function_line) /* Output source line numbers via ".line" rather than ".stabd". */ -#define ASM_OUTPUT_SOURCE_LINE(FILE,LINENUM) \ - do { \ - if (xcoff_begin_function_line >= 0) \ - fprintf (FILE, "\t.line\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM)); \ - } while (0) +#define ASM_OUTPUT_SOURCE_LINE(FILE,LINENUM) \ + do \ + { \ + if (xcoff_begin_function_line >= 0) \ + fprintf (FILE, "\t.line\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM)); \ + } \ + while (0) #define ASM_OUTPUT_LFB(FILE,LINENUM) \ { \ @@ -93,11 +95,13 @@ const char *xcoff_lastfile; ? xcoff_current_include_file : main_input_filename); \ } -#define ASM_OUTPUT_LFE(FILE,LINENUM) \ - do { \ - fprintf (FILE, "\t.ef\t%d\n", (LINENUM)); \ - xcoff_begin_function_line = -1; \ - } while (0) +#define ASM_OUTPUT_LFE(FILE,LINENUM) \ + do \ + { \ + fprintf (FILE, "\t.ef\t%d\n", (LINENUM)); \ + xcoff_begin_function_line = -1; \ + } \ + while (0) #define ASM_OUTPUT_LBB(FILE,LINENUM,BLOCKNUM) \ fprintf (FILE, "\t.bb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM))