cris.c (cris_address_cost): Make static.

        * config/cris/cris.c (cris_address_cost): Make static.
        (TARGET_RTX_COSTS, TARGET_ADDRESS_COST): New.
        * config/cris/cris.h (ADDRESS_COST): Remove.
        * config/cris/cris-protos.h: Update.

From-SVN: r62009

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 474d5af15732b33159aa7f7cb32359a24404806d..1aeddf8109b8fe0bd97f56aaca3338bf8d9b9cda 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,11 @@
 
        * cse.c (find_best_addr): Kill !ADDRESS_COST code.
 
+       * config/cris/cris.c (cris_address_cost): Make static.
+       (TARGET_RTX_COSTS, TARGET_ADDRESS_COST): New.
+       * config/cris/cris.h (ADDRESS_COST): Remove.
+       * config/cris/cris-protos.h: Update.
+
 2003-01-23  Mike Stump  <mrs@apple.com>
 
        * regclass.c (init_reg_autoinc): New function.
@@ -87,6 +92,8 @@
        * config/mn10300/mn10300-protos.h: Update.
        * config/mn10300/mn10300.h (ADDRESS_COST): Remove.
 
+       * doc/tm.texi: Update.
+
 2003-01-28  Vladimir Makarov  <vmakarov@redhat.com>
 
        * haifa-sched.c (schedule_insn): Return necessary cycle advance

diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h
index fba20c44f44fe5161c8050bd2281e5098153d19d..43ac4442b2fffa36334ba903d0c7c53d9018a1e7 100644 (file)
--- a/gcc/config/cris/cris-protos.h
+++ b/gcc/config/cris/cris-protos.h
@@ -31,7 +31,6 @@ extern int cris_simple_epilogue PARAMS ((void));
 extern const char *cris_op_str PARAMS ((rtx));
 extern int cris_eligible_for_epilogue_delay PARAMS ((rtx));
 extern void cris_notice_update_cc PARAMS ((rtx, rtx));
-extern int cris_address_cost PARAMS ((rtx));
 extern void cris_print_operand PARAMS ((FILE *, rtx, int));
 extern void cris_print_operand_address PARAMS ((FILE *, rtx));
 extern int cris_side_effect_mode_ok PARAMS ((enum rtx_code, rtx *, int, int,

diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 6842dfebda01bc2cc0cad0596030f6376cbbe0f5..2d336916cceff862f888e1bc362accd18b0960c9 100644 (file)
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -106,6 +106,8 @@ static void cris_operand_lossage PARAMS ((const char *, rtx));
 static void cris_asm_output_mi_thunk
   PARAMS ((FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree));
 
+static bool cris_rtx_costs PARAMS ((rtx, int, int, int *));
+static int cris_address_cost PARAMS ((rtx));
 
 /* The function cris_target_asm_function_epilogue puts the last insn to
    output here.  It always fits; there won't be a symbol operand.  Used in
@@ -164,6 +166,11 @@ int cris_cpu_version = CRIS_DEFAULT_CPU_VERSION;
 #undef TARGET_ASM_CAN_OUTPUT_MI_THUNK
 #define TARGET_ASM_CAN_OUTPUT_MI_THUNK default_can_output_mi_thunk_no_vcall
 
+#undef TARGET_RTX_COSTS
+#define TARGET_RTX_COSTS cris_rtx_costs
+#undef TARGET_ADDRESS_COST
+#define TARGET_ADDRESS_COST cris_address_cost
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 /* Predicate functions.  */
@@ -2193,7 +2200,7 @@ cris_rtx_costs (x, code, outer_code, total)
 
 /* The ADDRESS_COST worker.  */
 
-int
+static int
 cris_address_cost (x)
      rtx x;
 {

diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index 38449c7bc812311c445dc551c9ab1b350828e5d6..78e62d11adef9c32e34b004a0cace280e179eb30 100644 (file)
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -1336,8 +1336,6 @@ struct cum_args {int regs;};
 
 /* Node: Costs */
 
-#define ADDRESS_COST(X) cris_address_cost (X)
-
 /* FIXME: Need to define REGISTER_MOVE_COST when more register classes are
    introduced.  */