sh.h (high_life_started): Remove

	* config/sh/sh.h (high_life_started): Remove
	* config/sh/predicates.md (general_movdst_operand): Use
	'reload_in_progress' instead of 'high_life_started'.
	* config/sh/sh.md (divsi_inv_call, *divsi_inv_call_combine,
	divsi_inv_fp): Likewise.

From-SVN: r186212

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e08e69..6ce0a71 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2012-04-07  Oleg Endo  <olegendo@gcc.gnu.org>
 
+       * config/sh/sh.h (high_life_started): Remove
+       * config/sh/predicates.md (general_movdst_operand): Use
+       'reload_in_progress' instead of 'high_life_started'.
+       * config/sh/sh.md (divsi_inv_call, *divsi_inv_call_combine,
+       divsi_inv_fp): Likewise.
+
+2012-04-07  Oleg Endo  <olegendo@gcc.gnu.org>
+
        * config/sh/sh-protos.h (prepare_move_operands): Return void
        instead of int.
        * config/sh/sh.c (prepare_move_operands): Likewise.

diff --git a/gcc/config/sh/predicates.md b/gcc/config/sh/predicates.md
index ebcff45..b00ad14 100644 (file)
--- a/gcc/config/sh/predicates.md
+++ b/gcc/config/sh/predicates.md
@@ -453,7 +453,7 @@
     return 0;
   if (mode == DImode && TARGET_SHMEDIA && GET_CODE (op) == SUBREG
       && GET_MODE_SIZE (GET_MODE (SUBREG_REG (op))) < 8
-      && ! (high_life_started || reload_completed))
+      && ! (reload_in_progress || reload_completed))
     return 0;
 
   if ((mode == QImode || mode == HImode)

diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index b11392b..c8af362 100644 (file)
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -2482,7 +2482,4 @@ extern int current_function_interrupt;
 2:\n" TEXT_SECTION_ASM_OP);
 #endif /* (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__ */
 
-/* FIXME: middle-end support for highpart optimizations is missing.  */
-#define high_life_started reload_in_progress
-
 #endif /* ! GCC_SH_H */

diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index 28f5fd9..c045631 100644 (file)
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -1991,7 +1991,7 @@
    (use (match_operand:SI 3 "register_operand" "r"))]
   "TARGET_SHMEDIA"
   "#"
-  "&& (high_life_started || reload_completed)"
+  "&& (reload_in_progress || reload_completed)"
   [(set (match_dup 0) (match_dup 3))]
   ""
   [(set_attr "highpart" "must_split")])
@@ -2021,7 +2021,7 @@
         UNSPEC_DIV_INV_M3))]
   "TARGET_SHMEDIA"
   "#"
-  "&& (high_life_started || reload_completed)"
+  "&& (reload_in_progress || reload_completed)"
   [(pc)]
 {
   const char *name = sh_divsi3_libfunc;
@@ -2643,7 +2643,7 @@ label:
    (clobber (match_operand:DF 8 "register_operand" "=r"))]
   "TARGET_SHMEDIA_FPU"
   "#"
-  "&& (high_life_started || reload_completed)"
+  "&& (reload_in_progress || reload_completed)"
   [(set (match_dup 0) (match_dup 3))]
   ""
   [(set_attr "highpart" "must_split")])