mn10300.h (CONSTANT_ALIGNMENT): Define.

        * config/mn10300/mn10300.h (CONSTANT_ALIGNMENT): Define.
        (DATA_ALIGNMENT, LOCAL_ALIGNMENT): Define.
        (FIRST_PSEUDO_REGISTER): Increase by one.
        (FIXED_REGISTERS, CALL_USED_REGISTERS): Update with CC_REG.
        (HARD_REGNO_MODE_OK): Call mn10300_hard_regno_mode_ok.
        (MODES_TIEABLE): Call mn10300_modes_tieable.
        (REG_CLASS_NAMES, REG_CLASS_CONTENTS, REGNO_REG_CLASS): Add
        CC_REGS.
        (LEGITIMATE_CONSTANT_P): Call mn10300_legitimate_constant_p.
        (CC_OVERFLOW_UNUSABLE, CC_NO_CARRY, NOTICE_UPDATE_CC)
        (SELECT_CC_MODE, REVERSIBLE_CC_MODE): Delete.
        (REGISTER_NAMES, ADDITIONAL_REGISTER_NAMES): Add CC register.
        (ASM_OUTPUT_REG_PUSH, ASM_OUTPUT_REG_POP): Delete.
        (mn10300_cc_status_mdep): Delete.
        (CC_STATUS_MDEP, CC_STATUS_MDEP_INIT): Delete.
        * config/mn10300/mn10300 (mn10300_option_override): Stop disabling
        the combine-stack-adjust pass.
        (print_operand): Use the mode of the comparison operation to
        select the comparison suffix.
        (notice_update_cc): Delete.
        (mn10300_secondary_reload_class): Remove test for stack pointer
        based arithmetic.
        (output_tst): Rename to mn10300_output_cmp.
        (impossible_plus_operand): Move into predicates.md.
        (mn10300_legitimize_address): Make static.
        (mn10300_legitimate_address_p): Make static.  Only allow SI sized
        constant pic operands.
        (mn10300_legitimate_constant_p): New function.
        (mn10300_case_values_threshold): Make static.
        (mn10300_hard_regno_mode_ok): New function.
        (mn10300_modes_tieable): New function.
        (mn10300_select_cc_mode): New function.
        * config/mn10300/predicates.md (impossible_plus_operand): Define.
        * config/mn10300/mn10300-protos.h: Tidy.
        (mn10300_legitimate_constant_p, mn10300_modes_tieable)
        (mn10300_hard_regno_mode_ok, mn10300_select_cc_mode): Prototype.
        * config/mn10300/mn10300.md (cc attribute): Delete.  Replace
        with clobbers or sets of CC_REG.
        (CC_REG): Define.
        (mov*): Remove use of CLR instruction.
        (cbranch_si4_<code>): New pattern/split.
        (integer_conditional_branch): New pattern.
        (cbranch_sf4_<code>): New pattern/split.
        (float_conditional_branch): New pattern.
        (casesi): Use addsi3 pattern instead of movsi pattern to add and
        move a value at the same time.
        (cc0 peepholes): Remove.

From-SVN: r165459

gcc/ChangeLog

+2010-10-14  Nick Clifton  <nickc@redhat.com>
+
+	* config/mn10300/mn10300.h (CONSTANT_ALIGNMENT): Define.
+	(DATA_ALIGNMENT, LOCAL_ALIGNMENT): Define.
+	(FIRST_PSEUDO_REGISTER): Increase by one.
+	(FIXED_REGISTERS, CALL_USED_REGISTERS): Update with CC_REG.
+	(HARD_REGNO_MODE_OK): Call mn10300_hard_regno_mode_ok.
+	(MODES_TIEABLE): Call mn10300_modes_tieable.
+	(REG_CLASS_NAMES, REG_CLASS_CONTENTS, REGNO_REG_CLASS): Add
+	CC_REGS.
+	(LEGITIMATE_CONSTANT_P): Call mn10300_legitimate_constant_p.
+	(CC_OVERFLOW_UNUSABLE, CC_NO_CARRY, NOTICE_UPDATE_CC)
+	(SELECT_CC_MODE, REVERSIBLE_CC_MODE): Delete.
+	(REGISTER_NAMES, ADDITIONAL_REGISTER_NAMES): Add CC register.
+	(ASM_OUTPUT_REG_PUSH, ASM_OUTPUT_REG_POP): Delete.
+	(mn10300_cc_status_mdep): Delete.
+	(CC_STATUS_MDEP, CC_STATUS_MDEP_INIT): Delete.
+	* config/mn10300/mn10300 (mn10300_option_override): Stop disabling
+	the combine-stack-adjust pass.
+	(print_operand): Use the mode of the comparison operation to
+	select the comparison suffix.
+	(notice_update_cc): Delete.
+	(mn10300_secondary_reload_class): Remove test for stack pointer
+	based arithmetic.
+	(output_tst): Rename to mn10300_output_cmp.
+	(impossible_plus_operand): Move into predicates.md.
+	(mn10300_legitimize_address): Make static.
+	(mn10300_legitimate_address_p): Make static.  Only allow SI sized
+	constant pic operands.
+	(mn10300_legitimate_constant_p): New function.
+	(mn10300_case_values_threshold): Make static.
+	(mn10300_hard_regno_mode_ok): New function.
+	(mn10300_modes_tieable): New function.
+	(mn10300_select_cc_mode): New function.
+	* config/mn10300/predicates.md (impossible_plus_operand): Define.
+	* config/mn10300/mn10300-protos.h: Tidy.
+	(mn10300_legitimate_constant_p, mn10300_modes_tieable)
+	(mn10300_hard_regno_mode_ok, mn10300_select_cc_mode): Prototype.
+	* config/mn10300/mn10300.md (cc attribute): Delete.  Replace
+	with clobbers or sets of CC_REG.
+	(CC_REG): Define.
+	(mov*): Remove use of CLR instruction.
+	(cbranch_si4_<code>): New pattern/split.
+	(integer_conditional_branch): New pattern.
+	(cbranch_sf4_<code>): New pattern/split.
+	(float_conditional_branch): New	pattern.
+	(casesi): Use addsi3 pattern instead of movsi pattern to add and
+	move a value at the same time.
+	(cc0 peepholes): Remove.
+
 2010-10-14  Andrey Belevantsev  <abel@ispras.ru>
 
 	* sel-sched-ir.c (init_global_and_expr_for_insn): Set CANT_MOVE

gcc/config/mn10300/mn10300-protos.h

@@ -19,35 +19,40 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#ifdef RTX_CODE
+#define Mmode enum machine_mode
+#define Cstar const char *
+#define Rclas enum reg_class
 
-extern rtx legitimize_pic_address (rtx, rtx);
-extern int legitimate_pic_operand_p (rtx);
-extern void print_operand (FILE *, rtx, int);
-extern void print_operand_address (FILE *, rtx);
-extern void mn10300_print_reg_list (FILE *, int);
-extern int mn10300_get_live_callee_saved_regs (void);
-extern void mn10300_gen_multiple_store (int);
-extern void notice_update_cc (rtx, rtx);
-extern enum reg_class mn10300_secondary_reload_class (enum reg_class,
-						      enum machine_mode, rtx);
-extern const char *output_tst (rtx, rtx);
-extern int store_multiple_operation (rtx, enum machine_mode);
-extern int symbolic_operand (rtx, enum machine_mode);
-extern int impossible_plus_operand (rtx, enum machine_mode);
-
-extern bool mn10300_wide_const_load_uses_clr (rtx operands[2]);
-
-extern bool mn10300_function_value_regno_p (const unsigned int);
+#ifdef RTX_CODE
+extern rtx   legitimize_pic_address (rtx, rtx);
+extern int   legitimate_pic_operand_p (rtx);
+extern bool  mn10300_function_value_regno_p (const unsigned int);
+extern void  mn10300_gen_multiple_store (int);
+extern int   mn10300_get_live_callee_saved_regs (void);
+extern bool  mn10300_hard_regno_mode_ok (unsigned int, Mmode);
+extern bool  mn10300_legitimate_constant_p (rtx);
+extern bool  mn10300_modes_tieable (Mmode, Mmode);
+extern Cstar mn10300_output_cmp (rtx, rtx);
+extern void  mn10300_print_reg_list (FILE *, int);
+extern Rclas mn10300_secondary_reload_class (Rclas, Mmode, rtx);
+extern Mmode mn10300_select_cc_mode (rtx);
+extern bool  mn10300_wide_const_load_uses_clr (rtx operands[2]);
+extern void  print_operand (FILE *, rtx, int);
+extern void  print_operand_address (FILE *, rtx);
+extern int   store_multiple_operation (rtx, Mmode);
+extern int   symbolic_operand (rtx, Mmode);
 #endif /* RTX_CODE */
 
 #ifdef TREE_CODE
-extern struct rtx_def *function_arg (CUMULATIVE_ARGS *,
-				     enum machine_mode, tree, int);
+extern struct rtx_def *function_arg (CUMULATIVE_ARGS *, Mmode, tree, int);
 #endif /* TREE_CODE */
 
-extern void expand_prologue (void);
-extern void expand_epilogue (void);
-extern int initial_offset (int, int);
-extern int can_use_return_insn (void);
-extern int mask_ok_for_mem_btst (int, int);
+extern int   can_use_return_insn (void);
+extern void  expand_prologue (void);
+extern void  expand_epilogue (void);
+extern int   initial_offset (int, int);
+extern int   mask_ok_for_mem_btst (int, int);
+
+#undef Mmode
+#undef Cstar
+#undef Rclas

gcc/config/mn10300/mn10300.c

@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "target.h"
 #include "target-def.h"
+#include "df.h"
 
 /* This is used by GOTaddr2picreg to uniquely identify
    UNSPEC_INT_LABELs.  */
@@ -190,12 +191,6 @@ mn10300_option_override (void)
 {
   if (TARGET_AM33)
     target_flags &= ~MASK_MULT_BUG;
-
-  /* FIXME: The combine stack adjustments pass is breaking
-     cc0-setter/cc0-user relationship by inserting a jump
-     instruction.  This should be investigated, but for now
-     just disable the pass.  */
-  flag_combine_stack_adjustments = 0;
 }
 
 static void
@@ -220,7 +215,7 @@ print_operand (FILE *file, rtx x, int code)
     {
       case 'b':
       case 'B':
-	if (cc_status.mdep.fpCC)
+	if (GET_MODE (XEXP (x, 0)) == CC_FLOATmode)
 	  {
 	    switch (code == 'b' ? GET_CODE (x)
 		    : reverse_condition_maybe_unordered (GET_CODE (x)))
@@ -1008,7 +1003,7 @@ expand_epilogue (void)
   /* SIZE includes the fixed stack space needed for function calls.  */
   size = get_frame_size () + crtl->outgoing_args_size;
   size += (crtl->outgoing_args_size ? 4 : 0);
-
+  
   if (TARGET_AM33_2 && fp_regs_to_save ())
     {
       int num_regs_to_save = fp_regs_to_save (), i;
@@ -1236,59 +1231,6 @@ expand_epilogue (void)
     emit_jump_insn (gen_return_internal ());
 }
 
-/* Update the condition code from the insn.  */
-
-void
-notice_update_cc (rtx body, rtx insn)
-{
-  switch (get_attr_cc (insn))
-    {
-    case CC_NONE:
-      /* Insn does not affect CC at all.  */
-      break;
-
-    case CC_NONE_0HIT:
-      /* Insn does not change CC, but the 0'th operand has been changed.  */
-      if (cc_status.value1 != 0
-	  && reg_overlap_mentioned_p (recog_data.operand[0], cc_status.value1))
-	cc_status.value1 = 0;
-      break;
-
-    case CC_SET_ZN:
-      /* Insn sets the Z,N flags of CC to recog_data.operand[0].
-	 V,C are unusable.  */
-      CC_STATUS_INIT;
-      cc_status.flags |= CC_NO_CARRY | CC_OVERFLOW_UNUSABLE;
-      cc_status.value1 = recog_data.operand[0];
-      break;
-
-    case CC_SET_ZNV:
-      /* Insn sets the Z,N,V flags of CC to recog_data.operand[0].
-	 C is unusable.  */
-      CC_STATUS_INIT;
-      cc_status.flags |= CC_NO_CARRY;
-      cc_status.value1 = recog_data.operand[0];
-      break;
-
-    case CC_COMPARE:
-      /* The insn is a compare instruction.  */
-      CC_STATUS_INIT;
-      cc_status.value1 = SET_SRC (body);
-      if (GET_CODE (SET_SRC (body)) == COMPARE
-	  && GET_MODE (XEXP (SET_SRC (body), 0)) == SFmode)
-	cc_status.mdep.fpCC = 1;
-      break;
-
-    case CC_CLOBBER:
-      /* Insn doesn't leave CC in a usable state.  */
-      CC_STATUS_INIT;
-      break;
-
-    default:
-      gcc_unreachable ();
-    }
-}
-
 /* Recognize the PARALLEL rtx generated by mn10300_gen_multiple_store().
    This function is for MATCH_PARALLEL and so assumes OP is known to be
    parallel.  If OP is a multiple store, return a mask indicating which
@@ -1413,11 +1355,6 @@ mn10300_secondary_reload_class (enum reg_class rclass, enum machine_mode mode,
 		  || XEXP (in, 1) == stack_pointer_rtx))))
     return ADDRESS_REGS;
 
-  if (GET_CODE (in) == PLUS
-      && (XEXP (in, 0) == stack_pointer_rtx
-	  || XEXP (in, 1) == stack_pointer_rtx))
-    return GENERAL_REGS;
-
   if (TARGET_AM33_2
       && rclass == FP_REGS)
     {
@@ -1425,7 +1362,7 @@ mn10300_secondary_reload_class (enum reg_class rclass, enum machine_mode mode,
 	 constant address.  */
       if (GET_CODE (in) == MEM
 	  && CONSTANT_ADDRESS_P (XEXP (in, 0)))
-	return (TARGET_AM33 ? DATA_OR_EXTENDED_REGS : DATA_REGS);
+	return DATA_OR_EXTENDED_REGS;
 
       /* Handle case were a pseudo may not get a hard register
 	 but has an equivalent memory location defined.  */
@@ -1433,7 +1370,7 @@ mn10300_secondary_reload_class (enum reg_class rclass, enum machine_mode mode,
 	  && REGNO (inner) >= FIRST_PSEUDO_REGISTER
 	  && reg_equiv_mem [REGNO (inner)]
 	  && CONSTANT_ADDRESS_P (XEXP (reg_equiv_mem [REGNO (inner)], 0)))
-	return (TARGET_AM33 ? DATA_OR_EXTENDED_REGS : DATA_REGS);
+	return DATA_OR_EXTENDED_REGS;
     }
 
   /* Otherwise assume no secondary reloads are needed.  */
@@ -1696,9 +1633,10 @@ mn10300_function_value_regno_p (const unsigned int regno)
  return (regno == FIRST_DATA_REGNUM || regno == FIRST_ADDRESS_REGNUM);
 }
 
-/* Output a tst insn.  */
+/* Output a compare insn.  */
+
 const char *
-output_tst (rtx operand, rtx insn)
+mn10300_output_cmp (rtx operand, rtx insn)
 {
   rtx temp;
   int past_call = 0;
@@ -1786,19 +1724,6 @@ output_tst (rtx operand, rtx insn)
   return "cmp 0,%0";
 }
 
-int
-impossible_plus_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
-  if (GET_CODE (op) != PLUS)
-    return 0;
-
-  if (XEXP (op, 0) == stack_pointer_rtx
-      || XEXP (op, 1) == stack_pointer_rtx)
-    return 1;
-
-  return 0;
-}
-
 /* Similarly, but when using a zero_extract pattern for a btst where
    the source operand might end up in memory.  */
 int
@@ -1853,7 +1778,7 @@ symbolic_operand (register rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
 
    But on a few ports with segmented architectures and indexed addressing
    (mn10300, hppa) it is used to rewrite certain problematical addresses.  */
-rtx
+static rtx
 mn10300_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
 			    enum machine_mode mode ATTRIBUTE_UNUSED)
 {
@@ -1941,7 +1866,7 @@ legitimate_pic_operand_p (rtx x)
     {
       if (fmt[i] == 'E')
 	{
-	  register int j;
+	  int j;
 
 	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
 	    if (! legitimate_pic_operand_p (XVECEXP (x, i, j)))
@@ -1968,7 +1893,7 @@ legitimate_pic_operand_p (rtx x)
    workaround and solution, see the comments in pa.c before the
    function record_unscaled_index_insn_codes.  */
 
-bool
+static bool
 mn10300_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
 {
   if (CONSTANT_ADDRESS_P (x)
@@ -2009,7 +1934,8 @@ mn10300_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
 	  if (GET_CODE (index) == CONST
 	      && GET_CODE (XEXP (index, 0)) != PLUS
 	      && (! flag_pic
- 		  || legitimate_pic_operand_p (index)))
+ 		  || (legitimate_pic_operand_p (index)
+		      && GET_MODE_SIZE (mode) == 4)))
 	    return TRUE;
 	}
     }
@@ -2017,6 +1943,55 @@ mn10300_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
   return FALSE;
 }
 
+/* Used by LEGITIMATE_CONSTANT_P().  Returns TRUE if X is a valid
+   constant.  Note that some "constants" aren't valid, such as TLS
+   symbols and unconverted GOT-based references, so we eliminate
+   those here.  */
+
+bool
+mn10300_legitimate_constant_p (rtx x)
+{
+  switch (GET_CODE (x))
+    {
+    case CONST:
+      x = XEXP (x, 0);
+
+      if (GET_CODE (x) == PLUS)
+	{
+	  if (GET_CODE (XEXP (x, 1)) != CONST_INT)
+	    return false;
+	  x = XEXP (x, 0);
+	}
+
+      /* Only some unspecs are valid as "constants".  */
+      if (GET_CODE (x) == UNSPEC)
+	{
+	  rtx sym = XVECEXP (x, 0, 0);
+	  switch (XINT (x, 1))
+	    {
+	    case UNSPEC_INT_LABEL:
+	    case UNSPEC_PIC:
+	    case UNSPEC_GOT:
+	    case UNSPEC_GOTOFF:
+	    case UNSPEC_PLT:
+	      return true;
+	    default:
+	      return false;
+	    }
+	}
+
+      /* We must have drilled down to a symbol.  */
+      if (!symbolic_operand (x, Pmode))
+	return false;
+      break;
+
+    default:
+      break;
+    }
+
+  return true;
+}
+
 static int
 mn10300_address_cost_1 (rtx x, int *unsig)
 {
@@ -2215,7 +2190,8 @@ mn10300_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
    were solely optimizing for space, but we keep it "reasonable" to avoid
    serious code efficiency lossage.  */
 
-unsigned int mn10300_case_values_threshold (void)
+static unsigned int
+mn10300_case_values_threshold (void)
 {
   return 6;
 }
@@ -2310,3 +2286,48 @@ mn10300_can_output_mi_thunk (const_tree    thunk_fndecl ATTRIBUTE_UNUSED,
 {
   return true;
 }
+
+bool
+mn10300_hard_regno_mode_ok (unsigned int regno, enum machine_mode mode)
+{
+  if (REGNO_REG_CLASS (regno) == FP_REGS
+      || REGNO_REG_CLASS (regno) == FP_ACC_REGS)
+    /* Do not store integer values in FP registers.  */
+    return GET_MODE_CLASS (mode) == MODE_FLOAT && ((regno & 1) == 0);
+  
+  if (((regno) & 1) == 0 || GET_MODE_SIZE (mode) == 4)
+    return true;
+
+  if (REGNO_REG_CLASS (regno) == DATA_REGS
+      || (TARGET_AM33 && REGNO_REG_CLASS (regno) == ADDRESS_REGS)
+      || REGNO_REG_CLASS (regno) == EXTENDED_REGS)
+    return GET_MODE_SIZE (mode) <= 4;
+  
+  return false;
+}
+
+bool
+mn10300_modes_tieable (enum machine_mode mode1, enum machine_mode mode2)
+{
+  if (GET_MODE_CLASS (mode1) == MODE_FLOAT
+      && GET_MODE_CLASS (mode2) != MODE_FLOAT)
+    return false;
+
+  if (GET_MODE_CLASS (mode2) == MODE_FLOAT
+      && GET_MODE_CLASS (mode1) != MODE_FLOAT)
+    return false;
+
+  if (TARGET_AM33
+      || mode1 == mode2
+      || (GET_MODE_SIZE (mode1) <= 4 && GET_MODE_SIZE (mode2) <= 4))
+    return true;
+
+  return false;
+}
+
+enum machine_mode
+mn10300_select_cc_mode (rtx x)
+{
+  return (GET_MODE_CLASS (GET_MODE (x)) == MODE_FLOAT) ? CC_FLOATmode : CCmode;
+}
+

gcc/config/mn10300/predicates.md

@@ -47,3 +47,10 @@
 
   return (GET_CODE (op) == SYMBOL_REF || GET_CODE (op) == REG);
 })
+
+(define_predicate "impossible_plus_operand"
+  (match_code "plus")
+{
+  return XEXP (op, 0) == stack_pointer_rtx
+      || XEXP (op, 1) == stack_pointer_rtx;
+})