diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ee4aefe8c0..b83e503df73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2002-01-21 Kazu Hirata + + * unwind-dw2.c: Fix formatting. + * unwind-dw2-fde.c: Likewise. + * unwind-dw2-fde.h: Likewise. + * unwind-pe.h: Likewise. + * varasm.c: Likewise. + * varray.h: Likewise. + 2002-01-21 Hans-Peter Nilsson Remove workaround for register stack overwrite bug in mmix. diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c index 4181e45b1f5..460d7f0d80f 100644 --- a/gcc/unwind-dw2-fde.c +++ b/gcc/unwind-dw2-fde.c @@ -76,7 +76,7 @@ __register_frame_info_bases (void *begin, struct object *ob, void *tbase, void *dbase) { /* If .eh_frame is empty, don't register at all. */ - if (*(uword *)begin == 0) + if (*(uword *) begin == 0) return; ob->pc_begin = (void *)-1; @@ -107,7 +107,7 @@ __register_frame (void *begin) struct object *ob; /* If .eh_frame is empty, don't register at all. */ - if (*(uword *)begin == 0) + if (*(uword *) begin == 0) return; ob = (struct object *) malloc (sizeof (struct object)); @@ -171,7 +171,7 @@ __deregister_frame_info_bases (void *begin) struct object *ob = 0; /* If .eh_frame is empty, we haven't registered. */ - if (*(uword *)begin == 0) + if (*(uword *) begin == 0) return ob; init_object_mutex_once (); @@ -224,7 +224,7 @@ void __deregister_frame (void *begin) { /* If .eh_frame is empty, we haven't registered. */ - if (*(uword *)begin != 0) + if (*(uword *) begin != 0) free (__deregister_frame_info (begin)); } @@ -443,10 +443,10 @@ fde_split (struct object *ob, fde_compare_t fde_compare, probe != &marker && fde_compare (ob, linear->array[i], *probe) < 0; probe = chain_end) { - chain_end = (fde **)erratic->array[probe - linear->array]; + chain_end = (fde **) erratic->array[probe - linear->array]; erratic->array[probe - linear->array] = NULL; } - erratic->array[i] = (fde *)chain_end; + erratic->array[i] = (fde *) chain_end; chain_end = &linear->array[i]; } @@ -642,8 +642,8 @@ classify_object_over_fdes (struct object *ob, fde *this_fde) continue; count += 1; - if ((void *)pc_begin < ob->pc_begin) - ob->pc_begin = (void *)pc_begin; + if ((void *) pc_begin < ob->pc_begin) + ob->pc_begin = (void *) pc_begin; } return count; @@ -679,7 +679,7 @@ add_fdes (struct object *ob, struct fde_accumulator *accu, fde *this_fde) if (encoding == DW_EH_PE_absptr) { - if (*(_Unwind_Ptr *)this_fde->pc_begin == 0) + if (*(_Unwind_Ptr *) this_fde->pc_begin == 0) continue; } else @@ -797,8 +797,8 @@ linear_search_fdes (struct object *ob, fde *this_fde, void *pc) if (encoding == DW_EH_PE_absptr) { - pc_begin = ((_Unwind_Ptr *)this_fde->pc_begin)[0]; - pc_range = ((_Unwind_Ptr *)this_fde->pc_begin)[1]; + pc_begin = ((_Unwind_Ptr *) this_fde->pc_begin)[0]; + pc_range = ((_Unwind_Ptr *) this_fde->pc_begin)[1]; if (pc_begin == 0) continue; } @@ -825,7 +825,7 @@ linear_search_fdes (struct object *ob, fde *this_fde, void *pc) continue; } - if ((_Unwind_Ptr)pc - pc_begin < pc_range) + if ((_Unwind_Ptr) pc - pc_begin < pc_range) return this_fde; } @@ -848,8 +848,8 @@ binary_search_unencoded_fdes (struct object *ob, void *pc) void *pc_begin; uaddr pc_range; - pc_begin = ((void **)f->pc_begin)[0]; - pc_range = ((uaddr *)f->pc_begin)[1]; + pc_begin = ((void **) f->pc_begin)[0]; + pc_range = ((uaddr *) f->pc_begin)[1]; if (pc < pc_begin) hi = i; @@ -881,9 +881,9 @@ binary_search_single_encoding_fdes (struct object *ob, void *pc) &pc_begin); read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range); - if ((_Unwind_Ptr)pc < pc_begin) + if ((_Unwind_Ptr) pc < pc_begin) hi = i; - else if ((_Unwind_Ptr)pc >= pc_begin + pc_range) + else if ((_Unwind_Ptr) pc >= pc_begin + pc_range) lo = i + 1; else return f; @@ -912,9 +912,9 @@ binary_search_mixed_encoding_fdes (struct object *ob, void *pc) f->pc_begin, &pc_begin); read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range); - if ((_Unwind_Ptr)pc < pc_begin) + if ((_Unwind_Ptr) pc < pc_begin) hi = i; - else if ((_Unwind_Ptr)pc >= pc_begin + pc_range) + else if ((_Unwind_Ptr) pc >= pc_begin + pc_range) lo = i + 1; else return f; diff --git a/gcc/unwind-dw2-fde.h b/gcc/unwind-dw2-fde.h index 14552684381..b06ff41133f 100644 --- a/gcc/unwind-dw2-fde.h +++ b/gcc/unwind-dw2-fde.h @@ -156,7 +156,7 @@ get_cie (struct dwarf_fde *f) static inline fde * next_fde (fde *f) { - return (fde *)((char *)f + f->length + sizeof (f->length)); + return (fde *) ((char *) f + f->length + sizeof (f->length)); } extern fde * _Unwind_Find_FDE (void *, struct dwarf_eh_bases *); diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c index e502d66857e..d3828e97ad4 100644 --- a/gcc/unwind-dw2.c +++ b/gcc/unwind-dw2.c @@ -132,10 +132,10 @@ static inline void * read_pointer (const void *p) { const union unaligned *up = p; return up->p; } static inline int -read_1u (const void *p) { return *(const unsigned char *)p; } +read_1u (const void *p) { return *(const unsigned char *) p; } static inline int -read_1s (const void *p) { return *(const signed char *)p; } +read_1s (const void *p) { return *(const signed char *) p; } static inline int read_2u (const void *p) { const union unaligned *up = p; return up->u2; } @@ -600,13 +600,13 @@ execute_stack_op (const unsigned char *op_ptr, const unsigned char *op_end, result = second & first; break; case DW_OP_div: - result = (_Unwind_Sword)second / (_Unwind_Sword)first; + result = (_Unwind_Sword) second / (_Unwind_Sword) first; break; case DW_OP_minus: result = second - first; break; case DW_OP_mod: - result = (_Unwind_Sword)second % (_Unwind_Sword)first; + result = (_Unwind_Sword) second % (_Unwind_Sword) first; break; case DW_OP_mul: result = second * first; @@ -624,28 +624,28 @@ execute_stack_op (const unsigned char *op_ptr, const unsigned char *op_end, result = second >> first; break; case DW_OP_shra: - result = (_Unwind_Sword)second >> first; + result = (_Unwind_Sword) second >> first; break; case DW_OP_xor: result = second ^ first; break; case DW_OP_le: - result = (_Unwind_Sword)first <= (_Unwind_Sword)second; + result = (_Unwind_Sword) first <= (_Unwind_Sword) second; break; case DW_OP_ge: - result = (_Unwind_Sword)first >= (_Unwind_Sword)second; + result = (_Unwind_Sword) first >= (_Unwind_Sword) second; break; case DW_OP_eq: - result = (_Unwind_Sword)first == (_Unwind_Sword)second; + result = (_Unwind_Sword) first == (_Unwind_Sword) second; break; case DW_OP_lt: - result = (_Unwind_Sword)first < (_Unwind_Sword)second; + result = (_Unwind_Sword) first < (_Unwind_Sword) second; break; case DW_OP_gt: - result = (_Unwind_Sword)first > (_Unwind_Sword)second; + result = (_Unwind_Sword) first > (_Unwind_Sword) second; break; case DW_OP_ne: - result = (_Unwind_Sword)first != (_Unwind_Sword)second; + result = (_Unwind_Sword) first != (_Unwind_Sword) second; break; default: @@ -725,7 +725,7 @@ execute_cfa_program (const unsigned char *insn_ptr, { reg = insn & 0x3f; insn_ptr = read_uleb128 (insn_ptr, &utmp); - offset = (_Unwind_Sword)utmp * fs->data_align; + offset = (_Unwind_Sword) utmp * fs->data_align; fs->regs.reg[reg].how = REG_SAVED_OFFSET; fs->regs.reg[reg].loc.offset = offset; } @@ -757,7 +757,7 @@ execute_cfa_program (const unsigned char *insn_ptr, case DW_CFA_offset_extended: insn_ptr = read_uleb128 (insn_ptr, ®); insn_ptr = read_uleb128 (insn_ptr, &utmp); - offset = (_Unwind_Sword)utmp * fs->data_align; + offset = (_Unwind_Sword) utmp * fs->data_align; fs->regs.reg[reg].how = REG_SAVED_OFFSET; fs->regs.reg[reg].loc.offset = offset; break; @@ -878,7 +878,7 @@ execute_cfa_program (const unsigned char *insn_ptr, older PowerPC code. */ insn_ptr = read_uleb128 (insn_ptr, ®); insn_ptr = read_uleb128 (insn_ptr, &utmp); - offset = (_Unwind_Word)utmp * fs->data_align; + offset = (_Unwind_Word) utmp * fs->data_align; fs->regs.reg[reg].how = REG_SAVED_OFFSET; fs->regs.reg[reg].loc.offset = -offset; break; @@ -929,7 +929,7 @@ uw_frame_state_for (struct _Unwind_Context *context, _Unwind_FrameState *fs) execute_cfa_program (insn, end, context, fs); /* Locate augmentation for the fde. */ - aug = (unsigned char *)fde + sizeof (*fde); + aug = (unsigned char *) fde + sizeof (*fde); aug += 2 * size_of_encoded_value (fs->fde_encoding); insn = NULL; if (fs->saw_z) diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h index fe0632432d2..01e05ebf34c 100644 --- a/gcc/unwind-pe.h +++ b/gcc/unwind-pe.h @@ -183,10 +183,10 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, if (encoding == DW_EH_PE_aligned) { - _Unwind_Ptr a = (_Unwind_Ptr)p; + _Unwind_Ptr a = (_Unwind_Ptr) p; a = (a + sizeof (void *) - 1) & - sizeof(void *); result = *(_Unwind_Ptr *) a; - p = (const unsigned char *)(a + sizeof (void *)); + p = (const unsigned char *) (a + sizeof (void *)); } else { @@ -201,7 +201,7 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, { _Unwind_Word tmp; p = read_uleb128 (p, &tmp); - result = (_Unwind_Ptr)tmp; + result = (_Unwind_Ptr) tmp; } break; @@ -209,7 +209,7 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, { _Unwind_Sword tmp; p = read_sleb128 (p, &tmp); - result = (_Unwind_Ptr)tmp; + result = (_Unwind_Ptr) tmp; } break; @@ -246,9 +246,9 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, if (result != 0) { result += ((encoding & 0x70) == DW_EH_PE_pcrel - ? (_Unwind_Ptr)u : base); + ? (_Unwind_Ptr) u : base); if (encoding & DW_EH_PE_indirect) - result = *(_Unwind_Ptr *)result; + result = *(_Unwind_Ptr *) result; } } diff --git a/gcc/varasm.c b/gcc/varasm.c index 3ad78504263..955a98e9c6c 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -2684,7 +2684,7 @@ compare_constant_1 (exp, p) if ((enum machine_mode) *p++ != TYPE_MODE (TREE_TYPE (exp))) return 0; - strp = (const unsigned char *)TREE_STRING_POINTER (exp); + strp = (const unsigned char *) TREE_STRING_POINTER (exp); len = TREE_STRING_LENGTH (exp); if (memcmp ((char *) &TREE_STRING_LENGTH (exp), p, sizeof TREE_STRING_LENGTH (exp))) diff --git a/gcc/varray.h b/gcc/varray.h index 4681406e1f4..66c4d39a3a6 100644 --- a/gcc/varray.h +++ b/gcc/varray.h @@ -1,5 +1,5 @@ /* Virtual array support. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of GCC. @@ -159,7 +159,7 @@ extern varray_type varray_init PARAMS ((size_t, size_t, const char *)); /* Free up memory allocated by the virtual array, but do not free any of the elements involved. */ #define VARRAY_FREE(vp) \ - do { if (vp) { free (vp); vp = (varray_type)0; } } while (0) + do { if (vp) { free (vp); vp = (varray_type) 0; } } while (0) /* Grow/shrink the virtual array VA to N elements. */ extern varray_type varray_grow PARAMS ((varray_type, size_t));