From 984514ac2eee98afae88c833714fecf12abcf6ac Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 21 Apr 2011 11:01:54 +0100 Subject: [PATCH] alpha.c (struct machine_function): Use rtx, not struct rtx_def *. * config/alpha/alpha.c (struct machine_function): Use rtx, not struct rtx_def *. * config/bfin/bfin.h (bfin_cc_rtx, bfin_rets_rtx): Use rtx, not struct rtx_def *. * config/cris/cris-protos.h (STDIO_INCLUDED): Don't define. * config/h8300/h8300.h (struct cum_arg): Use rtx, not struct rtx_def *. * config/iq2000/iq2000.h (struct iq2000_args): Use rtx, not struct rtx_def *. * config/m32c/m32c-protos.h (MM, UINT): Don't define. Expand definitions where used. * config/microblaze/microblaze.h (struct microblaze_args): Use rtx, not struct rtx_def *. * config/pa/pa-protos.h (return_addr_rtx): Use rtx, not struct rtx_def *. * config/pa/pa.h (hppa_pic_save_rtx): Use rtx, not struct rtx_def *. * config/pdp11/pdp11.h (cc0_reg_rtx): Use rtx, not struct rtx_def *. * config/sh/sh-protos.h (sfunc_uses_reg, get_fpscr_rtx): Use rtx, not struct rtx_def *. * config/sh/sh.h (sh_compare_op0, sh_compare_op1): Use rtx, not struct rtx_def *. * config/spu/spu-protos.h (spu_float_const): Use rtx, not struct rtx_def *. * config/spu/spu.c (spu_float_const): Use rtx, not struct rtx_def *. From-SVN: r172818 --- gcc/ChangeLog | 30 ++++++++++++++++++++++++++ gcc/config/alpha/alpha.c | 2 +- gcc/config/bfin/bfin.h | 2 +- gcc/config/cris/cris-protos.h | 7 ++---- gcc/config/h8300/h8300.h | 2 +- gcc/config/iq2000/iq2000.h | 2 +- gcc/config/m32c/m32c-protos.h | 34 ++++++++++++------------------ gcc/config/microblaze/microblaze.h | 2 +- gcc/config/pa/pa-protos.h | 4 ++-- gcc/config/pa/pa.h | 2 +- gcc/config/pdp11/pdp11.h | 2 +- gcc/config/sh/sh-protos.h | 4 ++-- gcc/config/sh/sh.h | 4 ++-- gcc/config/spu/spu-protos.h | 6 +++--- gcc/config/spu/spu.c | 5 +++-- 15 files changed, 65 insertions(+), 43 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 028e230f4f6..0519905a43d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,33 @@ +2011-04-21 Joseph Myers + + * config/alpha/alpha.c (struct machine_function): Use rtx, not + struct rtx_def *. + * config/bfin/bfin.h (bfin_cc_rtx, bfin_rets_rtx): Use rtx, not + struct rtx_def *. + * config/cris/cris-protos.h (STDIO_INCLUDED): Don't define. + * config/h8300/h8300.h (struct cum_arg): Use rtx, not struct + rtx_def *. + * config/iq2000/iq2000.h (struct iq2000_args): Use rtx, not struct + rtx_def *. + * config/m32c/m32c-protos.h (MM, UINT): Don't define. Expand + definitions where used. + * config/microblaze/microblaze.h (struct microblaze_args): Use + rtx, not struct rtx_def *. + * config/pa/pa-protos.h (return_addr_rtx): Use rtx, not struct + rtx_def *. + * config/pa/pa.h (hppa_pic_save_rtx): Use rtx, not struct rtx_def + *. + * config/pdp11/pdp11.h (cc0_reg_rtx): Use rtx, not struct rtx_def + *. + * config/sh/sh-protos.h (sfunc_uses_reg, get_fpscr_rtx): Use rtx, + not struct rtx_def *. + * config/sh/sh.h (sh_compare_op0, sh_compare_op1): Use rtx, not + struct rtx_def *. + * config/spu/spu-protos.h (spu_float_const): Use rtx, not struct + rtx_def *. + * config/spu/spu.c (spu_float_const): Use rtx, not struct rtx_def + *. + 2011-04-21 Richard Sandiford * tree-vect-data-refs.c (vect_drs_dependent_in_basic_block): Use diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index 4cbafa02f91..72ade3ef2d1 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -4605,7 +4605,7 @@ struct GTY(()) machine_function const char *some_ld_name; /* For TARGET_LD_BUGGY_LDGP. */ - struct rtx_def *gp_save_rtx; + rtx gp_save_rtx; /* For VMS condition handlers. */ bool uses_condition_handler; diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h index 8577db7a6de..d3bdd5606b4 100644 --- a/gcc/config/bfin/bfin.h +++ b/gcc/config/bfin/bfin.h @@ -1137,7 +1137,7 @@ do { \ #define ASM_OUTPUT_REG_PUSH(FILE, REGNO) fprintf (FILE, "[SP--] = %s;\n", reg_names[REGNO]) #define ASM_OUTPUT_REG_POP(FILE, REGNO) fprintf (FILE, "%s = [SP++];\n", reg_names[REGNO]) -extern struct rtx_def *bfin_cc_rtx, *bfin_rets_rtx; +extern rtx bfin_cc_rtx, bfin_rets_rtx; /* This works for GAS and some other assemblers. */ #define SET_ASM_OP ".set " diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h index 9718cf9a9bd..ba91de1d81f 100644 --- a/gcc/config/cris/cris-protos.h +++ b/gcc/config/cris/cris-protos.h @@ -1,5 +1,6 @@ /* Definitions for GCC. Part of the machine description for CRIS. - Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2009, 2010 + Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2009, 2010, + 2011 Free Software Foundation, Inc. Contributed by Axis Communications. @@ -21,10 +22,6 @@ along with GCC; see the file COPYING3. If not see /* Prototypes for the CRIS port. */ -#if defined(FILE) || defined(stdin) || defined(stdout) || defined(getc) || defined(putc) -#define STDIO_INCLUDED -#endif - extern bool cris_simple_epilogue (void); #ifdef RTX_CODE extern const char *cris_op_str (rtx); diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h index 015df600154..936aabfa229 100644 --- a/gcc/config/h8300/h8300.h +++ b/gcc/config/h8300/h8300.h @@ -463,7 +463,7 @@ enum reg_class { struct cum_arg { int nbytes; - struct rtx_def *libcall; + rtx libcall; }; /* Initialize a variable CUM of type CUMULATIVE_ARGS diff --git a/gcc/config/iq2000/iq2000.h b/gcc/config/iq2000/iq2000.h index b9717ff0f52..e909ef94b57 100644 --- a/gcc/config/iq2000/iq2000.h +++ b/gcc/config/iq2000/iq2000.h @@ -314,7 +314,7 @@ typedef struct iq2000_args int fp_code; /* Mode of FP arguments. */ unsigned int num_adjusts; /* Number of adjustments made. */ /* Adjustments made to args pass in regs. */ - struct rtx_def * adjust[MAX_ARGS_IN_REGISTERS * 2]; + rtx adjust[MAX_ARGS_IN_REGISTERS * 2]; } CUMULATIVE_ARGS; /* Initialize a variable CUM of type CUMULATIVE_ARGS diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h index fdaa8a8beac..6c88a1dc9bc 100644 --- a/gcc/config/m32c/m32c-protos.h +++ b/gcc/config/m32c/m32c-protos.h @@ -1,5 +1,5 @@ /* Target Prototypes for R8C/M16C/M32C - Copyright (C) 2005, 2007, 2008, 2010 + Copyright (C) 2005, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. Contributed by Red Hat. @@ -19,12 +19,9 @@ along with GCC; see the file COPYING3. If not see . */ -#define MM enum machine_mode -#define UINT unsigned int - void m32c_conditional_register_usage (void); int m32c_const_ok_for_constraint_p (HOST_WIDE_INT, char, const char *); -UINT m32c_dwarf_frame_regnum (int); +unsigned int m32c_dwarf_frame_regnum (int); int m32c_eh_return_data_regno (int); void m32c_emit_epilogue (void); void m32c_emit_prologue (void); @@ -47,8 +44,8 @@ int m32c_trampoline_size (void); #ifdef RTX_CODE -int m32c_cannot_change_mode_class (MM, MM, int); -int m32c_class_max_nregs (int, MM); +int m32c_cannot_change_mode_class (enum machine_mode, enum machine_mode, int); +int m32c_class_max_nregs (int, enum machine_mode); rtx m32c_eh_return_stackadj_rtx (void); void m32c_emit_eh_epilogue (rtx); int m32c_expand_cmpstr (rtx *); @@ -60,19 +57,19 @@ void m32c_expand_neg_mulpsi3 (rtx *); int m32c_expand_setmemhi (rtx *); int m32c_extra_constraint_p (rtx, char, const char *); int m32c_extra_constraint_p2 (rtx, char, const char *); -int m32c_hard_regno_nregs (int, MM); -int m32c_hard_regno_ok (int, MM); +int m32c_hard_regno_nregs (int, enum machine_mode); +int m32c_hard_regno_ok (int, enum machine_mode); bool m32c_illegal_subreg_p (rtx); -bool m32c_immd_dbl_mov (rtx *, MM); +bool m32c_immd_dbl_mov (rtx *, enum machine_mode); rtx m32c_incoming_return_addr_rtx (void); -int m32c_legitimize_reload_address (rtx *, MM, int, int, int); -int m32c_limit_reload_class (MM, int); -int m32c_modes_tieable_p (MM, MM); -bool m32c_mov_ok (rtx *, MM); +int m32c_legitimize_reload_address (rtx *, enum machine_mode, int, int, int); +int m32c_limit_reload_class (enum machine_mode, int); +int m32c_modes_tieable_p (enum machine_mode, enum machine_mode); +bool m32c_mov_ok (rtx *, enum machine_mode); char * m32c_output_compare (rtx, rtx *); int m32c_preferred_output_reload_class (rtx, int); int m32c_preferred_reload_class (rtx, int); -int m32c_prepare_move (rtx *, MM); +int m32c_prepare_move (rtx *, enum machine_mode); int m32c_prepare_shift (rtx *, int, int); void m32c_print_operand (FILE *, rtx, int); void m32c_print_operand_address (FILE *, rtx); @@ -80,8 +77,8 @@ int m32c_reg_ok_for_base_p (rtx, int); enum reg_class m32c_regno_reg_class (int); rtx m32c_return_addr_rtx (int); const char *m32c_scc_pattern (rtx *, RTX_CODE); -int m32c_secondary_reload_class (int, MM, rtx); -int m32c_split_move (rtx *, MM, int); +int m32c_secondary_reload_class (int, enum machine_mode, rtx); +int m32c_split_move (rtx *, enum machine_mode, int); int m32c_split_psi_p (rtx *); int current_function_special_page_vector (rtx); @@ -97,6 +94,3 @@ void m32c_output_aligned_common (FILE *, tree, const char *, int, int, int); #endif - -#undef MM -#undef UINT diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h index 6cfbf68fae7..a667acadaf8 100644 --- a/gcc/config/microblaze/microblaze.h +++ b/gcc/config/microblaze/microblaze.h @@ -473,7 +473,7 @@ typedef struct microblaze_args /* Adjustments made to args pass in regs. */ /* ??? The size is doubled to work around a bug in the code that sets the adjustments in function_arg. */ - struct rtx_def *adjust[MAX_ARGS_IN_REGISTERS * 2]; + rtx adjust[MAX_ARGS_IN_REGISTERS * 2]; } CUMULATIVE_ARGS; #define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME,FNDECL,N_NAMED_ARGS) \ diff --git a/gcc/config/pa/pa-protos.h b/gcc/config/pa/pa-protos.h index ab56250f147..d481c3d0ec2 100644 --- a/gcc/config/pa/pa-protos.h +++ b/gcc/config/pa/pa-protos.h @@ -1,5 +1,5 @@ /* Prototypes for pa.c functions used in the md file & elsewhere. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2010 + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Free Software Foundation, Inc. @@ -72,7 +72,7 @@ extern int attr_length_save_restore_dltp (rtx); /* Declare functions defined in pa.c and used in templates. */ -extern struct rtx_def *return_addr_rtx (int, rtx); +extern rtx return_addr_rtx (int, rtx); #ifdef ARGS_SIZE_RTX /* expr.h defines ARGS_SIZE_RTX and `enum direction' */ diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index f401707c9df..05ebd217f30 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -351,7 +351,7 @@ typedef struct GTY(()) machine_function /* Function to return the rtx used to save the pic offset table register across function calls. */ -extern struct rtx_def *hppa_pic_save_rtx (void); +extern rtx hppa_pic_save_rtx (void); #define DEFAULT_PCC_STRUCT_RETURN 0 diff --git a/gcc/config/pdp11/pdp11.h b/gcc/config/pdp11/pdp11.h index 5d389ec4edb..85941be540b 100644 --- a/gcc/config/pdp11/pdp11.h +++ b/gcc/config/pdp11/pdp11.h @@ -502,7 +502,7 @@ extern int may_call_alloca; /* Tell emit-rtl.c how to initialize special values on a per-function base. */ -extern struct rtx_def *cc0_reg_rtx; +extern rtx cc0_reg_rtx; #define CC_STATUS_MDEP rtx diff --git a/gcc/config/sh/sh-protos.h b/gcc/config/sh/sh-protos.h index 947ec04281f..ff94b1072f5 100644 --- a/gcc/config/sh/sh-protos.h +++ b/gcc/config/sh/sh-protos.h @@ -51,7 +51,7 @@ extern const char *output_movedouble (rtx, rtx[], enum machine_mode); extern const char *output_movepcrel (rtx, rtx[], enum machine_mode); extern const char *output_far_jump (rtx, rtx); -extern struct rtx_def *sfunc_uses_reg (rtx); +extern rtx sfunc_uses_reg (rtx); extern int barrier_align (rtx); extern int sh_loop_align (rtx); extern int fp_zero_operand (rtx); @@ -126,7 +126,7 @@ extern bool sh_vector_mode_supported_p (enum machine_mode); extern const char *output_jump_label_table (void); extern int sh_handle_pragma (int (*)(void), void (*)(int), const char *); -extern struct rtx_def *get_fpscr_rtx (void); +extern rtx get_fpscr_rtx (void); extern int sh_media_register_for_return (void); extern void sh_expand_prologue (void); extern void sh_expand_epilogue (bool); diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h index 4876fd6c9cd..ef42a1bfc9d 100644 --- a/gcc/config/sh/sh.h +++ b/gcc/config/sh/sh.h @@ -2291,8 +2291,8 @@ struct sh_args { final_prescan_insn ((INSN), (OPVEC), (NOPERANDS)) -extern struct rtx_def *sh_compare_op0; -extern struct rtx_def *sh_compare_op1; +extern rtx sh_compare_op0; +extern rtx sh_compare_op1; /* Which processor to schedule for. The elements of the enumeration must match exactly the cpu attribute in the sh.md file. */ diff --git a/gcc/config/spu/spu-protos.h b/gcc/config/spu/spu-protos.h index 675af028723..6774ad9c2bc 100644 --- a/gcc/config/spu/spu-protos.h +++ b/gcc/config/spu/spu-protos.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006, 2007, 2008, 2009, 2010 +/* Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it under @@ -42,8 +42,8 @@ extern rtx hwint_to_const_double (enum machine_mode mode, HOST_WIDE_INT v); extern rtx spu_const (enum machine_mode mode, HOST_WIDE_INT val); extern rtx spu_const_from_ints (enum machine_mode mode, int a, int b, int c, int d); -extern struct rtx_def *spu_float_const (const char *string, - enum machine_mode mode); +extern rtx spu_float_const (const char *string, + enum machine_mode mode); extern int immediate_load_p (rtx op, enum machine_mode mode); extern int logical_immediate_p (rtx op, enum machine_mode mode); extern int iohl_immediate_p (rtx op, enum machine_mode mode); diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c index 4142e7e229a..1ee1c9bdfb3 100644 --- a/gcc/config/spu/spu.c +++ b/gcc/config/spu/spu.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -3313,7 +3314,7 @@ spu_sched_adjust_cost (rtx insn, rtx link, rtx dep_insn, int cost) } /* Create a CONST_DOUBLE from a string. */ -struct rtx_def * +rtx spu_float_const (const char *string, enum machine_mode mode) { REAL_VALUE_TYPE value; -- 2.30.2