Commit: 2c5d8f7b95da577e030a8d61c81c0550887d28c4 - gcc (git)

Commit MetaInfo

• Revision: 2c5d8f7b95da577e030a8d61c81c0550887d28c4 (tree)
• Time: 2022-11-25 21:00:18
• Author: Yoshinori Sato <yo-satoh@sios...>
• Commiter: Yoshinori Sato

Log Message

Merge branch 'rx-pic' into rx-fdpic

Change Summary

• modified: gcc/config/rx/rx-protos.h
• modified: gcc/config/rx/rx.cc
• modified: gcc/config/rx/rx.h
• modified: gcc/config/rx/rx.md

Incremental Difference

--- a/gcc/config/rx/rx-protos.h
+++ b/gcc/config/rx/rx-protos.h
@@ -172,6 +172,7 @@ rx_find_use_of_reg (rtx reg, rtx_insn* insn, F stepfunc)
 #endif
 
 bool nonpic_symbol_mentioned_p (rtx x);
-void rx_expand_sym_label2reg (rtx reg, rtx sym, rtx lab, bool sibcall_p);
+rtx legitimize_pic_address (rtx orig,
+			    machine_mode mode ATTRIBUTE_UNUSED, rtx reg);
 
 #endif /* GCC_RX_PROTOS_H */

--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -143,11 +143,9 @@ rx_pid_data_operand (rtx op)
   return PID_NOT_PID;
 }
 
-rtx
-legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, rtx reg);
-
 static rtx
-rx_legitimize_address (rtx x, rtx oldx ,
+rx_legitimize_address (rtx x,
+		       rtx oldx ATTRIBUTE_UNUSED,
 		       machine_mode mode ATTRIBUTE_UNUSED)
 {
   if (flag_pic)
@@ -168,6 +166,32 @@ rx_legitimize_address (rtx x, rtx oldx ,
   return x;
 }
 
+/* Convert a non-PIC address in `orig' to a PIC address using @GOT or
+   @GOTOFF in `reg'.  */
+rtx
+legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, rtx reg)
+{
+  if (GET_CODE (orig) == LABEL_REF || GET_CODE (orig) == SYMBOL_REF)
+    {
+      if (reg == NULL_RTX)
+       reg = gen_reg_rtx (Pmode);
+
+      emit_insn (gen_symGOTOFF2reg (reg, orig));
+      crtl->uses_pic_offset_table = 1;
+      return reg;
+    }
+  else if (GET_CODE (orig) == SYMBOL_REF)
+    {
+      if (reg == NULL_RTX)
+       reg = gen_reg_rtx (Pmode);
+
+      emit_insn (gen_symGOT2reg (reg, orig));
+      crtl->uses_pic_offset_table = 1;
+      return reg;
+    }
+  return orig;
+}
+
 /* Return true if OP is a reference to an object in a small data area.  */
 
 static bool
@@ -303,44 +327,18 @@ nonpic_symbol_mentioned_p (rtx x)
   for (int i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
     {
       if (fmt[i] == 'E')
-	{
+       {
 	  for (int j = XVECLEN (x, i) - 1; j >= 0; j--)
 	    if (nonpic_symbol_mentioned_p (XVECEXP (x, i, j)))
 	      return true;
-	}
+       }
       else if (fmt[i] == 'e' && nonpic_symbol_mentioned_p (XEXP (x, i)))
-	return true;
+       return true;
     }
 
   return false;
 }
 
-/* Convert a non-PIC address in `orig' to a PIC address using @GOT or
-   @GOTOFF in `reg'.  */
-rtx
-legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, rtx reg)
-{
-  if (GET_CODE (orig) == LABEL_REF || GET_CODE (orig) == SYMBOL_REF)
-    {
-      if (reg == NULL_RTX)
-	reg = gen_reg_rtx (Pmode);
-
-      emit_insn (gen_symGOTOFF2reg (reg, orig));
-      crtl->uses_pic_offset_table = 1;
-      return reg;
-    }
-  else if (GET_CODE (orig) == SYMBOL_REF)
-    {
-      if (reg == NULL_RTX)
-	reg = gen_reg_rtx (Pmode);
-
-      emit_insn (gen_symGOT2reg (reg, orig));
-      crtl->uses_pic_offset_table = 1;
-      return reg;
-    }
-  return orig;
-}
-
 /* Returns TRUE for simple memory addresses, ie ones
    that do not involve register indirect addressing
    or pre/post increment/decrement.  */
@@ -536,10 +534,8 @@ rx_print_operand_address (FILE * file, machine_mode /*mode*/, rtx addr)
 	switch (post)
 	  {
 	  case UNSPEC_GOTOFF:
-	    fprintf (file, "#");
 	    output_addr_const (file, addr);
 	    fprintf (file, "@GOTOFF");
-	    crtl->uses_pic_offset_table = 1;
 	    return;
 	  }
       }
@@ -598,8 +594,8 @@ rx_assemble_integer (rtx x, unsigned int size, int is_aligned)
      %P  Register used for PID addressing
      %Q  If the operand is a MEM, then correctly generate
          register indirect or register relative addressing.
-     %R  Like %Q but for zero-extending loads. 
-     %T  symbol@PLT  */
+	 %R  Like %Q but for zero-extending loads.   */
+
 
 static void
 rx_print_operand (FILE * file, rtx op, int letter)
@@ -886,20 +882,6 @@ rx_print_operand (FILE * file, rtx op, int letter)
 	    }
 	  break;
 	}
-    case 'T':
-      /* Print an operand and @PLT.  */
-      if (MEM_P (op))
-	op = XEXP (op, 0);
-
-      switch (GET_CODE (op))
-	{
-	case LABEL_REF:
-	case SYMBOL_REF:
-	  output_addr_const (file, op);
-	  fprintf (file, "@PLT");
-	  break;
-	}
-      break;
 
       /* Fall through.  */
 
@@ -1030,47 +1012,6 @@ rx_print_operand (FILE * file, rtx op, int letter)
     }
 }
 
-/* Implement TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA.  */
-static bool
-rx_asm_output_addr_const_extra (FILE *file, rtx x)
-{
-  if (GET_CODE (x) == UNSPEC)
-    {
-      switch (XINT (x, 1))
-	{
-	case UNSPEC_PIC:
-	  /* GLOBAL_OFFSET_TABLE or local symbols, no suffix.  */
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  break;
-	case UNSPEC_GOT:
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  fputs ("@GOT", file);
-	  break;
-	case UNSPEC_GOTOFF:
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  fputs ("@GOTOFF", file);
-	  break;
-	case UNSPEC_PLT:
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  fputs ("@PLT", file);
-	  break;
-	case UNSPEC_GOTPLT:
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  fputs ("@GOTPLT", file);
-	  break;
-	case UNSPEC_PCREL:
-	  output_addr_const (file, XVECEXP (x, 0, 0));
-	  fputs ("@PCREL", file);
-	  break;
-	default:
-	  return false;
-	}
-      return true;
-    }
-  else
-    return false;
-}
-
 /* Maybe convert an operand into its PID format.  */
 
 rtx
@@ -1634,8 +1575,8 @@ rx_get_stack_layout (unsigned int * lowest,
 		 they can be used in the fast interrupt handler without
 		 saving them on the stack.  */
 	      || (is_fast_interrupt_func (NULL_TREE)
-		  && ! IN_RANGE (reg, 10, 13)))
 	      || (flag_pic && reg == PIC_REGNUM))
+		  && ! IN_RANGE (reg, 10, 13)))
 	{
 	  if (low == 0)
 	    low = reg;
@@ -1906,9 +1847,6 @@ rx_expand_prologue (void)
   else if (low)
     push_regs (high, low);
 
-  //  if (flag_pic && df_regs_ever_live_p (PIC_REGNUM))
-  //    emit_insn (gen_GOTaddr2picreg (const0_rtx));
-
   if (MUST_SAVE_ACC_REGISTER)
     {
       unsigned int acc_high, acc_low;
@@ -3103,9 +3041,9 @@ rx_is_legitimate_constant (machine_mode mode ATTRIBUTE_UNUSED, rtx x)
 
 	case UNSPEC:
 	  return XINT (x, 1) == UNSPEC_CONST ||
-	         XINT (x, 1) == UNSPEC_PID_ADDR ||
-	         XINT (x, 1) == UNSPEC_GOTOFF ||
-	         XINT (x, 1) == UNSPEC_PLT;
+		 XINT (x, 1) == UNSPEC_PID_ADDR ||
+		 XINT (x, 1) == UNSPEC_GOTOFF ||
+		 XINT (x, 1) == UNSPEC_PLT;
 
 	default:
 	  /* FIXME: Can this ever happen ?  */
@@ -3807,11 +3745,6 @@ int rx_legitimate_pic_operand_p(rtx x)
 	       || ! nonpic_symbol_mentioned_p (get_pool_constant (x)))));
 }
 
-static void
-rx_asm_final_postscan_insn (FILE *, rtx_insn *insn, rtx operands[], int num_rtx)
-{
-  return;
-}
 
 #undef  TARGET_NARROW_VOLATILE_BITFIELD
 #define TARGET_NARROW_VOLATILE_BITFIELD		rx_narrow_volatile_bitfield
@@ -3971,13 +3904,6 @@ rx_asm_final_postscan_insn (FILE *, rtx_insn *insn, rtx operands[], int num_rtx)
 #undef  TARGET_HAVE_SPECULATION_SAFE_VALUE
 #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed
 
-#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA
-#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA rx_asm_output_addr_const_extra
-
-#undef TARGET_ASM_FINAL_POSTSCAN_INSN
-#define TARGET_ASM_FINAL_POSTSCAN_INSN rx_asm_final_postscan_insn
-
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-rx.h"
-

--- a/gcc/config/rx/rx.h
+++ b/gcc/config/rx/rx.h
@@ -650,7 +650,7 @@ typedef unsigned int CUMULATIVE_ARGS;
 /* We can't directly access anything that contains a symbol,
    nor can we indirect via the constant pool.  */
 int rx_legitimate_pic_operand_p(rtx x);
-#define LEGITIMATE_PIC_OPERAND_P(X)				\
+#define LEGITIMATE_PIC_OPERAND_P(X)		\
   rx_legitimate_pic_operand_p (X)
 
 #define SYMBOLIC_CONST_P(X)	\

--- a/gcc/config/rx/rx.md
+++ b/gcc/config/rx/rx.md
@@ -460,39 +460,31 @@
    (set_attr "timings" "33")]
 )
 
-(define_expand "call_site"
-  [(unspec [(match_dup 0)] 0)]
-  ""
-{
-  static HOST_WIDE_INT i = 0;
-  operands[0] = GEN_INT (i);
-  i++;
-})
-
 (define_expand "call_value"
   [(set (match_operand          0 "register_operand")
 	(call (match_operand:QI 1 "general_operand")
 	      (match_operand:SI 2 "general_operand")))]
   ""
-  {
-    rtx dest = XEXP (operands[1], 0);
+{
+  rtx dest = XEXP (operands[1], 0);
 
-    if (! rx_call_operand (dest, Pmode))
-      dest = force_reg (Pmode, dest);
-    if (1 || !flag_pic || !(GET_CODE (dest) == SYMBOL_REF && !SYMBOL_REF_LOCAL_P (dest)))
-        emit_call_insn (gen_call_value_internal (operands[0], dest));
-    else
-      {
-	if (TARGET_JSR)
-          emit_call_insn (gen_call_value_got (operands[0], dest));
-	else {
-	  printf("%s\n", __func__);
-	  emit_call_insn (gen_call_value_plt (dest));
-	}
-      }
-    DONE;
-  }
-)
+  if (flag_pic &&
+      (GET_CODE (dest) == SYMBOL_REF) && (!SYMBOL_REF_LOCAL_P (dest)))
+    {
+      if (flag_plt)
+        emit_call_insn (gen_call_value_internal_plt (operands[0], dest));
+      else
+        emit_call_insn (gen_call_value_internal_got (operands[0], dest));
+      DONE;
+    }
+  else
+    {
+      if (! rx_call_operand (dest, Pmode))
+        dest = force_reg (Pmode, dest);
+      emit_call_insn (gen_call_value_internal (operands[0], dest));
+    }
+  DONE;
+})
 
 (define_insn "call_value_internal"
   [(set (match_operand                  0 "register_operand" "=r,r")
@@ -2924,45 +2916,73 @@
   ""
   "")
 
-(define_insn "mov_from_rirb"
-  [(match_operand 0 "" "") (match_operand 1 "" "")]
-  ""
-{
-  return "mov.l\t[%0,%1],%0";
-}
-)
-
 (define_expand "symGOTOFF2reg"
   [(match_operand 0 "" "") (match_operand 1 "" "")]
   ""
 {
   rtx gotoffsym;
   rtx t = (!can_create_pseudo_p ()
-	   ? operands[0]
-	   : gen_reg_rtx (GET_MODE (operands[0])));
+          ? operands[0]
+          : gen_reg_rtx (GET_MODE (operands[0])));
 
   rtx picreg = gen_rtx_REG (Pmode, PIC_REG);
 
   gotoffsym = gen_sym2GOTOFF (operands[1]);
-  emit_move_insn (t, gotoffsym);
+  emit_insn (gen_mov_from_got(t, picreg, gotoffsym));
   emit_move_insn (operands[0], t);
-  emit_insn(gen_mov_from_rirb(operands[0], picreg));
+  //emit_insn(gen_mov_from_rirb(operands[0], picreg));
 //  set_unique_reg_note (insn, REG_EQUAL, operands[1]);
   DONE;
 })
 
-(define_expand "sym2PIC"
-  [(const (unspec [(match_operand:SI 0 "" "")] UNSPEC_PIC))]
+(define_insn "mov_from_got"
+  [(match_operand 0 "register_operand" "r")
+        (match_operand 1 "register_operand" "r")
+        (match_operand 2 "" "g")]
   ""
-  "")
+  "mov.l\t%A2[%1],%0"
+)
 
 (define_insn "loadGOT"
   [(set (match_operand:SI 0 "register_operand" "=r")
-	(unspec:SI [(const_int 0)] UNSPEC_GOT))]
+       (unspec:SI [(const_int 0)] UNSPEC_GOT))]
   ""
 {
   return "mvfc\tpc,%0\n\tadd\t#_GLOBAL_OFFSET_TABLE_,%0";
-}
+})
+
+(define_expand "call_value_internal_got"
+  [(set (match_operand                  0 "register_operand" "=r,r")
+       (call (mem:QI (match_operand:SI 1 "rx_call_operand"   "r,CALL_OP_SYMBOL_REF"))
+             (const_int 0)))
+   (clobber (reg:CC CC_REG))]
+  ""
+{
+  rtx gotoffsym;
+  rtx t = (!can_create_pseudo_p ()
+          ? operands[0]
+          : gen_reg_rtx (GET_MODE (operands[0])));
+
+  rtx picreg = gen_rtx_REG (Pmode, PIC_REG);
+
+  gotoffsym = gen_sym2GOTOFF (operands[1]);
+  emit_move_insn (t, gotoffsym);
+  emit_insn (gen_mov_from_got(t, picreg, gotoffsym));
+  emit_move_insn (operands[0], t);
+  emit_call_insn (gen_call_internal (operands[0]));
+  DONE;
+})
+
+(define_insn "call_value_internal_plt"
+  [(set (match_operand                  0 "register_operand" "=r")
+	(call (mem:QI (match_operand:SI 1 "rx_symbolic_call_operand" ""))
+	      (const_int 0)))
+   (use (reg:SI PIC_REG))
+   (clobber (reg:CC CC_REG))]
+  ""
+  "bsr\t%A1@PLT"
+  [(set_attr "length" "4")
+   (set_attr "timings" "33")]
 )
 
 (define_expand "call_value_got"
@@ -2981,8 +3001,8 @@
 
   gotoffsym = gen_sym2GOTOFF (operands[1]);
   emit_move_insn (t, gotoffsym);
+  emit_insn (gen_mov_from_got(t, picreg, gotoffsym));
   emit_move_insn (operands[0], t);
-  emit_insn(gen_mov_from_rirb(operands[0], picreg));
   emit_call_insn (gen_call_internal (operands[0]));
   DONE;
 })