ia64.c (move_operand): Allow symbolic_operand, but not tls_symbolic_operand.

        * config/ia64/ia64.c (move_operand): Allow symbolic_operand,
        but not tls_symbolic_operand.
        (ia64_expand_load_address): Remove scratch operand.
        (ia64_expand_tls_address): Split out from ia64_expand_move.
        (ia64_expand_move): Split symbolics only after reload.
        (ia64_emit_cond_move): New.
        * config/ia64/ia64-protos.h: Update.
        * config/ia64/ia64.md (movsi_symbolic, movdi_symbolic): Remove.
        (symbolic splitter): Accept SImode operands too.
        (cmove splitter): Use ia64_emit_cond_move.

From-SVN: r65399

gcc/ChangeLog

+2003-04-09  Richard Henderson  <rth@redhat.com>
+
+	* config/ia64/ia64.c (move_operand): Allow symbolic_operand,
+	but not tls_symbolic_operand.
+	(ia64_expand_load_address): Remove scratch operand.
+	(ia64_expand_tls_address): Split out from ia64_expand_move.
+	(ia64_expand_move): Split symbolics only after reload.
+	(ia64_emit_cond_move): New.
+	* config/ia64/ia64-protos.h: Update.
+	* config/ia64/ia64.md (movsi_symbolic, movdi_symbolic): Remove.
+	(symbolic splitter): Accept SImode operands too.
+	(cmove splitter): Use ia64_emit_cond_move.
+
 2003-04-09  Nick Clifton  <nickc@redhat.com>
 
 	* doc/install.texi: Note that ARM toolchains need binutils 2.13 or

gcc/config/ia64/ia64-protos.h

@@ -76,6 +76,7 @@ extern int basereg_operand PARAMS((rtx, enum machine_mode));
 
 extern rtx ia64_expand_move PARAMS ((rtx, rtx));
 extern int ia64_move_ok PARAMS((rtx, rtx));
+extern void ia64_emit_cond_move PARAMS((rtx, rtx, rtx));
 extern int ia64_depz_field_mask PARAMS((rtx, rtx));
 extern rtx ia64_split_timode PARAMS((rtx[], rtx, rtx));
 extern rtx spill_tfmode_operand PARAMS((rtx, int));
@@ -89,7 +90,7 @@ extern void ia64_expand_prologue PARAMS((void));
 extern void ia64_expand_epilogue PARAMS((int));
 
 extern int ia64_direct_return PARAMS((void));
-extern void ia64_expand_load_address PARAMS((rtx, rtx, rtx));
+extern void ia64_expand_load_address PARAMS((rtx, rtx));
 extern int ia64_hard_regno_rename_ok PARAMS((int, int));
 
 extern void ia64_initialize_trampoline PARAMS((rtx, rtx, rtx));

gcc/config/ia64/ia64.c

@@ -165,6 +165,7 @@ static int ia64_first_cycle_multipass_dfa_lookahead_guard PARAMS ((rtx));
 static int ia64_dfa_new_cycle PARAMS ((FILE *, int, rtx, int, int, int *));
 static rtx gen_tls_get_addr PARAMS ((void));
 static rtx gen_thread_pointer PARAMS ((void));
+static rtx ia64_expand_tls_address PARAMS ((enum tls_model, rtx, rtx));
 static int find_gr_spill PARAMS ((int));
 static int next_scratch_gr_reg PARAMS ((void));
 static void mark_reg_gr_used_mask PARAMS ((rtx, void *));
@@ -564,21 +565,14 @@ setjmp_operand (op, mode)
   return retval;
 }
 
-/* Return 1 if OP is a general operand, but when pic exclude symbolic
-   operands.  */
-
-/* ??? If we drop no-pic support, can delete SYMBOL_REF, CONST, and LABEL_REF
-   from PREDICATE_CODES.  */
+/* Return 1 if OP is a general operand, excluding tls symbolic operands.  */
 
 int
 move_operand (op, mode)
      rtx op;
      enum machine_mode mode;
 {
-  if (! TARGET_NO_PIC && symbolic_operand (op, mode))
-    return 0;
-
-  return general_operand (op, mode);
+  return general_operand (op, mode) && !tls_symbolic_operand (op, mode);
 }
 
 /* Return 1 if OP is a register operand that is (or could be) a GR reg.  */
@@ -1099,40 +1093,37 @@ ia64_depz_field_mask (rop, rshift)
 }
 
 /* Expand a symbolic constant load.  */
-/* ??? Should generalize this, so that we can also support 32 bit pointers.  */
 
 void
-ia64_expand_load_address (dest, src, scratch)
-      rtx dest, src, scratch;
+ia64_expand_load_address (dest, src)
+      rtx dest, src;
 {
-  rtx temp;
-
-  /* The destination could be a MEM during initial rtl generation,
-     which isn't a valid destination for the PIC load address patterns.  */
-  if (! register_operand (dest, DImode))
-    if (! scratch || ! register_operand (scratch, DImode))
-      temp = gen_reg_rtx (DImode);
-    else
-      temp = scratch;
-  else
-    temp = dest;
-
-  if (tls_symbolic_operand (src, Pmode))
+  if (tls_symbolic_operand (src, VOIDmode))
+    abort ();
+  if (GET_CODE (dest) != REG)
     abort ();
 
   if (TARGET_AUTO_PIC)
-    emit_insn (gen_load_gprel64 (temp, src));
+    {
+      emit_insn (gen_load_gprel64 (dest, src));
+      return;
+    }
   else if (GET_CODE (src) == SYMBOL_REF && SYMBOL_REF_FLAG (src))
-    emit_insn (gen_load_fptr (temp, src));
-  else if ((GET_MODE (src) == Pmode || GET_MODE (src) == ptr_mode)
-           && sdata_symbolic_operand (src, VOIDmode))
-    emit_insn (gen_load_gprel (temp, src));
-  else if (GET_CODE (src) == CONST
+    {
+      emit_insn (gen_load_fptr (dest, src));
+      return;
+    }
+  else if (sdata_symbolic_operand (src, VOIDmode))
+    {
+      emit_insn (gen_load_gprel (dest, src));
+      return;
+    }
+
+  if (GET_CODE (src) == CONST
       && GET_CODE (XEXP (src, 0)) == PLUS
       && GET_CODE (XEXP (XEXP (src, 0), 1)) == CONST_INT
       && (INTVAL (XEXP (XEXP (src, 0), 1)) & 0x1fff) != 0)
     {
-      rtx subtarget = no_new_pseudos ? temp : gen_reg_rtx (DImode);
       rtx sym = XEXP (XEXP (src, 0), 0);
       HOST_WIDE_INT ofs, hi, lo;
 
@@ -1142,33 +1133,11 @@ ia64_expand_load_address (dest, src, scratch)
       lo = ((ofs & 0x3fff) ^ 0x2000) - 0x2000;
       hi = ofs - lo;
 
-      if (! scratch)
-	scratch = no_new_pseudos ? subtarget : gen_reg_rtx (DImode);
-
-      emit_insn (gen_load_symptr (subtarget, plus_constant (sym, hi),
-				  scratch));
-      emit_insn (gen_adddi3 (temp, subtarget, GEN_INT (lo)));
+      emit_insn (gen_load_symptr (dest, plus_constant (sym, hi), dest));
+      emit_insn (gen_adddi3 (dest, dest, GEN_INT (lo)));
     }
   else
-    {
-      rtx insn;
-      if (! scratch)
-	scratch = no_new_pseudos ? temp : gen_reg_rtx (DImode);
-
-      insn = emit_insn (gen_load_symptr (temp, src, scratch));
-#ifdef POINTERS_EXTEND_UNSIGNED
-      if (GET_MODE (temp) != GET_MODE (src))
-	src = convert_memory_address (GET_MODE (temp), src);
-#endif
-      REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EQUAL, src, REG_NOTES (insn));
-    }
-
-  if (temp != dest)
-    {
-      if (GET_MODE (dest) != GET_MODE (temp))
-	temp = convert_to_mode (GET_MODE (dest), temp, 0);
-      emit_move_insn (dest, temp);
-    }
+    emit_insn (gen_load_symptr (dest, src, dest));
 }
 
 static GTY(()) rtx gen_tls_tga;
@@ -1176,9 +1145,7 @@ static rtx
 gen_tls_get_addr ()
 {
   if (!gen_tls_tga)
-    {
     gen_tls_tga = init_one_libfunc ("__tls_get_addr");
-     }
   return gen_tls_tga;
 }
 
@@ -1194,20 +1161,11 @@ gen_thread_pointer ()
   return thread_pointer_rtx;
 }
 
-rtx
-ia64_expand_move (op0, op1)
+static rtx
+ia64_expand_tls_address (tls_kind, op0, op1)
+     enum tls_model tls_kind;
      rtx op0, op1;
 {
-  enum machine_mode mode = GET_MODE (op0);
-
-  if (!reload_in_progress && !reload_completed && !ia64_move_ok (op0, op1))
-    op1 = force_reg (mode, op1);
-
-  if (mode == Pmode || mode == ptr_mode)
-    {
-      enum tls_model tls_kind;
-      if ((tls_kind = tls_symbolic_operand (op1, Pmode)))
-	{
   rtx tga_op1, tga_op2, tga_ret, tga_eqv, tmp, insns;
 
   switch (tls_kind)
@@ -1272,10 +1230,8 @@ ia64_expand_move (op0, op1)
 	}
       else
 	emit_insn (gen_add_dtprel (tga_ret, tmp, op1));
-	      if (tga_ret == op0)
-		return NULL_RTX;
-	      op1 = tga_ret;
-	      break;
+
+      return (tga_ret == op0 ? NULL_RTX : tga_ret);
 
     case TLS_MODEL_INITIAL_EXEC:
       tmp = gen_reg_rtx (Pmode);
@@ -1289,9 +1245,8 @@ ia64_expand_move (op0, op1)
       else
 	op1 = gen_reg_rtx (Pmode);
       emit_insn (gen_adddi3 (op1, tmp, gen_thread_pointer ()));
-	      if (op1 == op0)
-		return NULL_RTX;
-	      break;
+
+      return (op1 == op0 ? NULL_RTX : op1);
 
     case TLS_MODEL_LOCAL_EXEC:
       if (register_operand (op0, Pmode))
@@ -1305,47 +1260,32 @@ ia64_expand_move (op0, op1)
 	}
       else
 	emit_insn (gen_add_tprel (tmp, gen_thread_pointer (), op1));
-	      if (tmp == op0)
-		return NULL_RTX;
-	      op1 = tmp;
-	      break;
+
+      return (tmp == op0 ? NULL_RTX : tmp);
 
     default:
       abort ();
     }
-	}
-      else if (!TARGET_NO_PIC &&
-	       (symbolic_operand (op1, Pmode) ||
-		symbolic_operand (op1, ptr_mode)))
-	{
-	  /* Before optimization starts, delay committing to any particular
-	     type of PIC address load.  If this function gets deferred, we
-	     may acquire information that changes the value of the
-	     sdata_symbolic_operand predicate.
-
-	     But don't delay for function pointers.  Loading a function address
-	     actually loads the address of the descriptor not the function.
-	     If we represent these as SYMBOL_REFs, then they get cse'd with
-	     calls, and we end up with calls to the descriptor address instead
-	     of calls to the function address.  Functions are not candidates
-	     for sdata anyways.
-
-	     Don't delay for LABEL_REF because the splitter loses REG_LABEL
-	     notes.  Don't delay for pool addresses on general principals;
-	     they'll never become non-local behind our back.  */
-
-	  if (rtx_equal_function_value_matters
-	      && GET_CODE (op1) != LABEL_REF
-	      && ! (GET_CODE (op1) == SYMBOL_REF
-		    && (SYMBOL_REF_FLAG (op1)
-			|| CONSTANT_POOL_ADDRESS_P (op1)
-			|| STRING_POOL_ADDRESS_P (op1))))
-	    if (GET_MODE (op1) == DImode)
-	      emit_insn (gen_movdi_symbolic (op0, op1));
-	    else
-	      emit_insn (gen_movsi_symbolic (op0, op1));
-	  else
-	    ia64_expand_load_address (op0, op1, NULL_RTX);
+}
+
+rtx
+ia64_expand_move (op0, op1)
+     rtx op0, op1;
+{
+  enum machine_mode mode = GET_MODE (op0);
+
+  if (!reload_in_progress && !reload_completed && !ia64_move_ok (op0, op1))
+    op1 = force_reg (mode, op1);
+
+  if ((mode == Pmode || mode == ptr_mode) && symbolic_operand (op1, VOIDmode))
+    {
+      enum tls_model tls_kind;
+      if ((tls_kind = tls_symbolic_operand (op1, VOIDmode)))
+	return ia64_expand_tls_address (tls_kind, op0, op1);
+
+      if (!TARGET_NO_PIC && reload_completed)
+	{
+	  ia64_expand_load_address (op0, op1);
 	  return NULL_RTX;
 	}
     }
@@ -1353,6 +1293,22 @@ ia64_expand_move (op0, op1)
   return op1;
 }
 
+/* Split a move from OP1 to OP0 conditional on COND.  */
+
+void
+ia64_emit_cond_move (op0, op1, cond)
+     rtx op0, op1, cond;
+{
+  rtx insn, first = get_last_insn ();
+
+  emit_move_insn (op0, op1);
+
+  for (insn = get_last_insn (); insn != first; insn = PREV_INSN (insn))
+    if (INSN_P (insn))
+      PATTERN (insn) = gen_rtx_COND_EXEC (VOIDmode, copy_rtx (cond),
+					  PATTERN (insn));
+}
+
 /* Split a post-reload TImode reference into two DImode components.  */
 
 rtx

gcc/config/ia64/ia64.md

@@ -292,29 +292,6 @@
   operands[1] = op1;
 })
 
-;; This is used during early compilation to delay the decision on
-;; how to refer to a variable as long as possible.  This is especially
-;; important between initial rtl generation and optimization for
-;; deferred functions, since we may acquire additional information
-;; on the variables used in the meantime.
-
-(define_insn_and_split "movsi_symbolic"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-	(match_operand:SI 1 "symbolic_operand" "s"))
-   (clobber (match_scratch:DI 2 "=r"))
-   (use (reg:DI 1))]
-  ""
-  "* abort ();"
-  "!no_new_pseudos || reload_completed"
-  [(const_int 0)]
-{
-  rtx scratch = operands[2];
-  if (!reload_completed)
-    scratch = gen_reg_rtx (Pmode);
-  ia64_expand_load_address (operands[0], operands[1], scratch); 
-  DONE;
-})
-
 (define_insn "*movsi_internal"
   [(set (match_operand:SI 0 "destination_operand" "=r,r,r,r, m, r,*f,*f, r,*d")
 	(match_operand:SI 1 "move_operand"        "rO,J,i,m,rO,*f,rO,*f,*d,rK"))]
@@ -344,29 +321,6 @@
   operands[1] = op1;
 })
 
-;; This is used during early compilation to delay the decision on
-;; how to refer to a variable as long as possible.  This is especially
-;; important between initial rtl generation and optimization for
-;; deferred functions, since we may acquire additional information
-;; on the variables used in the meantime.
-
-(define_insn_and_split "movdi_symbolic"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-	(match_operand:DI 1 "symbolic_operand" "s"))
-   (clobber (match_scratch:DI 2 "=r"))
-   (use (reg:DI 1))]
-  ""
-  "* abort ();"
-  "!no_new_pseudos || reload_completed"
-  [(const_int 0)]
-{
-  rtx scratch = operands[2];
-  if (!reload_completed)
-    scratch = gen_reg_rtx (Pmode);
-  ia64_expand_load_address (operands[0], operands[1], scratch); 
-  DONE;
-})
-
 (define_insn "*movdi_internal"
   [(set (match_operand:DI 0 "destination_operand"
 		    "=r,r,r,r, m, r,*f,*f,*f, Q, r,*b, r,*e, r,*d, r,*c")
@@ -404,12 +358,12 @@
   [(set_attr "itanium_class" "ialu,ialu,long_i,ld,st,frfr,tofr,fmisc,fld,stf,frbr,tobr,frar_i,toar_i,frar_m,toar_m,frpr,topr")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-	(match_operand:DI 1 "symbolic_operand" ""))]
+  [(set (match_operand 0 "register_operand" "")
+	(match_operand 1 "symbolic_operand" ""))]
   "reload_completed && ! TARGET_NO_PIC"
   [(const_int 0)]
 {
-  ia64_expand_load_address (operands[0], operands[1], NULL_RTX);
+  ia64_expand_load_address (operands[0], operands[1]);
   DONE;
 })
 
@@ -4452,26 +4406,23 @@
   "reload_completed"
   [(const_int 0)]
 {
-  rtx tmp;
-  int emitted_something;
+  bool emitted_something = false;
+  rtx dest = operands[0];
+  rtx srct = operands[2];
+  rtx srcf = operands[3];
+  rtx cond = operands[4];
 
-  emitted_something = 0;
-  if (! rtx_equal_p (operands[0], operands[2]))
+  if (! rtx_equal_p (dest, srct))
     {
-      tmp = gen_rtx_SET (VOIDmode, operands[0], operands[2]);
-      tmp = gen_rtx_COND_EXEC (VOIDmode, operands[4], tmp);
-      emit_insn (tmp);
-      emitted_something = 1;
+      ia64_emit_cond_move (dest, srct, cond);
+      emitted_something = true;
     }
-  if (! rtx_equal_p (operands[0], operands[3]))
+  if (! rtx_equal_p (dest, srcf))
     {
-      tmp = gen_rtx_fmt_ee (GET_CODE (operands[4]) == NE ? EQ : NE,
+      cond = gen_rtx_fmt_ee (GET_CODE (cond) == NE ? EQ : NE,
  			     VOIDmode, operands[1], const0_rtx);
-      tmp = gen_rtx_COND_EXEC (VOIDmode, tmp,
-			       gen_rtx_SET (VOIDmode, operands[0],
-					    operands[3]));
-      emit_insn (tmp);
-      emitted_something = 1;
+      ia64_emit_cond_move (dest, srcf, cond);
+      emitted_something = true;
     }
   if (! emitted_something)
     emit_note (NULL, NOTE_INSN_DELETED);