Commit: 2269d21b750f07d15e95905ad14d3f3886c64566 - gcc (git)

Commit MetaInfo

• Révision: 2269d21b750f07d15e95905ad14d3f3886c64566 (tree)
• l'heure: 2022-11-24 19:25:15
• Auteur: Yoshinori Sato <yo-satoh@sios...>
• Commiter: Yoshinori Sato

Message de Log

WIP: rx plt

Signed-off-by: Yoshinori Sato <[e-mail]>

Change Summary

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

Modification

--- a/gcc/config/rx/rx-protos.h
+++ b/gcc/config/rx/rx-protos.h
@@ -172,5 +172,6 @@ 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);
 
 #endif /* GCC_RX_PROTOS_H */

--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -540,7 +540,6 @@ rx_print_operand_address (FILE * file, machine_mode /*mode*/, rtx addr)
 	    output_addr_const (file, addr);
 	    fprintf (file, "@GOTOFF");
 	    crtl->uses_pic_offset_table = 1;
-	    printf("%s %p %d\n", __func__, &(crtl->uses_pic_offset_table), crtl->uses_pic_offset_table);
 	    return;
 	  }
       }
@@ -599,7 +598,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.  */
+     %R  Like %Q but for zero-extending loads. 
+     %T  symbol@PLT  */
 
 static void
 rx_print_operand (FILE * file, rtx op, int letter)
@@ -886,6 +886,20 @@ 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.  */
 
@@ -1092,7 +1106,6 @@ rx_gen_move_template (rtx * operands, bool is_movu)
   rtx          dest = operands[0];
   rtx          src  = operands[1];
 
-  printf("%s\n", __func__);
   /* Decide which extension, if any, should be given to the move instruction.  */
   switch (CONST_INT_P (src) ? GET_MODE (dest) : GET_MODE (src))
     {
@@ -2483,6 +2496,7 @@ rx_select_section (tree decl,
 
   return default_elf_select_section (decl, reloc, align);
 }
+
 
 enum rx_builtin
 {
@@ -3090,7 +3104,8 @@ 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_GOTOFF ||
+	         XINT (x, 1) == UNSPEC_PLT;
 
 	default:
 	  /* FIXME: Can this ever happen ?  */

--- a/gcc/config/rx/rx.md
+++ b/gcc/config/rx/rx.md
@@ -460,6 +460,15 @@
    (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")
@@ -470,10 +479,17 @@
 
     if (! rx_call_operand (dest, Pmode))
       dest = force_reg (Pmode, dest);
-    if (!flag_pic || !(GET_CODE (dest) == SYMBOL_REF && !SYMBOL_REF_LOCAL_P (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
-        emit_call_insn (gen_call_value_pcrel (operands[0], dest));
+      {
+	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;
   }
 )
@@ -2889,26 +2905,6 @@
 )
 
 ;; PIC stuff
-
-(define_expand "sym_label2reg"
-  [(set (match_operand:SI 0 "" "")
-	(const:SI (unspec:SI [(match_operand:SI 1 "" "")
-			      (const (plus:SI (match_operand:SI 2 "" "")
-					      (const_int 2)))]
-			     UNSPEC_SYMOFF)))]
-  ""
-  "")
-
-(define_expand "symPCREL_label2reg"
-  [(set (match_operand:SI 0 "" "")
-	(const:SI
-	 (unspec:SI
-	  [(const:SI (unspec:SI [(match_operand:SI 1 "" "")] UNSPEC_PCREL))
-	   (const:SI (plus:SI (match_operand:SI 2 "" "")
-			      (const_int 2)))] UNSPEC_PCREL_SYMOFF)))]
-  ""
-  "")
-
 (define_expand "sym2GOT"
   [(const (unspec [(match_operand 0 "" "")] UNSPEC_GOT))]
   ""
@@ -2923,17 +2919,6 @@
   DONE;
 })
 
-(define_expand "symGOTPLT2reg"
-  [(match_operand 0 "" "") (match_operand 1 "" "")]
-  ""
-{
-  rtx pltsym = gen_rtx_CONST (Pmode,
-			      gen_rtx_UNSPEC (Pmode,
-					      gen_rtvec (1, operands[1]),
-					      UNSPEC_GOTPLT));
-  DONE;
-})
-
 (define_expand "sym2GOTOFF"
   [(const (unspec [(match_operand 0 "" "")] UNSPEC_GOTOFF))]
   ""
@@ -2966,28 +2951,6 @@
   DONE;
 })
 
-(define_expand "symPLT_label2reg"
-  [(set (match_operand:SI 0 "" "")
-	(const:SI
-	 (unspec:SI
-	  [(const:SI (unspec:SI [(match_operand:SI 1 "" "")] UNSPEC_PLT))
-	   (const:SI (plus:SI (match_operand:SI 2 "" "")
-			      (const_int 2)))] UNSPEC_PCREL_SYMOFF)))
-   ;; Even though the PIC register is not really used by the call
-   ;; sequence in which this is expanded, the PLT code assumes the PIC
-   ;; register is set, so we must not skip its initialization.  Since
-   ;; we only use this expand as part of calling sequences, and never
-   ;; to take the address of a function, this is the best point to
-   ;; insert the (use).  Using the PLT to take the address of a
-   ;; function would be wrong, not only because the PLT entry could
-   ;; then be called from a function that doesn't initialize the PIC
-   ;; register to the proper GOT, but also because pointers to the
-   ;; same function might not compare equal, should they be set by
-   ;; different shared libraries.
-   (use (reg:SI PIC_REG))]
-  ""
-  "")
-
 (define_expand "sym2PIC"
   [(const (unspec [(match_operand:SI 0 "" "")] UNSPEC_PIC))]
   ""
@@ -3002,7 +2965,7 @@
 }
 )
 
-(define_expand "call_value_pcrel"
+(define_expand "call_value_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)))
@@ -3023,3 +2986,13 @@
   emit_call_insn (gen_call_internal (operands[0]));
   DONE;
 })
+
+(define_insn "call_value_plt"
+  [(call (mem:QI (match_operand:SI 0 "rx_call_operand" "CALL_OP_SYMBOL_REF"))
+	 (const_int 0))
+   (clobber (reg:CC CC_REG))]
+  ""
+  "bsr\t%T0"
+  [(set_attr "length" "4")
+   (set_attr "timings" "33")]
+)