This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: mips tls with -mlong64/-mgp32

Like this?

	* config/mips/mips.c (mips_offset_within_alignment_p): New.
	(mips_symbolic_constant_p): Call it for TPREL and DTPREL symbols.

Index: mips.c
--- mips.c	(revision 124810)
+++ mips.c	(working copy)
@@ -409,12 +409,13 @@ static rtx mips_expand_builtin_compare (
 					enum insn_code, enum mips_fp_condition,
 					rtx, tree);
 static rtx mips_expand_builtin_bposge (enum mips_builtin_type, rtx);
 static void mips_encode_section_info (tree, rtx, int);
 static void mips_extra_live_on_entry (bitmap);
 static int mips_mode_rep_extended (enum machine_mode, enum machine_mode);
+static bool mips_offset_within_alignment_p (rtx, HOST_WIDE_INT);
 /* Structure to be filled in by compute_frame_size with register
    save masks, and offsets for the current function.  */
 struct mips_frame_info GTY(())
@@ -1347,24 +1348,49 @@ mips_classify_symbol (rtx x)
       return SYMBOL_GOT_PAGE_OFST;
+/* Returns true if OFFSET is within the range [0, ALIGN), where ALIGN
+   is the alignment (in bytes) of SYMBOL_REF X.  */
+static bool
+mips_offset_within_alignment_p (rtx x, HOST_WIDE_INT offset)
+  /* If for some reason we can't get the alignment for the
+     symbol, initializing this to zero means we won't accept any
+     offset.  */
+  HOST_WIDE_INT align = 0;
+  tree t;
+  /* Get the alignment of the symbol we're referring to.  */
+  t = SYMBOL_REF_DECL (x);
+  if (t)
+    align = DECL_ALIGN_UNIT (t);
+  if (offset < align)
+    return true;
+  return false;
 /* Return true if X is a symbolic constant that can be calculated in
    the same way as a bare symbol.  If it is, store the type of the
    symbol in *SYMBOL_TYPE.  */
 mips_symbolic_constant_p (rtx x, enum mips_symbol_type *symbol_type)
   rtx offset;
   split_const (x, &x, &offset);
   if (UNSPEC_ADDRESS_P (x))
-    *symbol_type = UNSPEC_ADDRESS_TYPE (x);
+    {
+      *symbol_type = UNSPEC_ADDRESS_TYPE (x);
+      x = UNSPEC_ADDRESS (x);
+    }
   else if (GET_CODE (x) == SYMBOL_REF || GET_CODE (x) == LABEL_REF)
       *symbol_type = mips_classify_symbol (x);
       if (*symbol_type == SYMBOL_TLS)
 	return false;
@@ -1413,20 +1439,26 @@ mips_symbolic_constant_p (rtx x, enum mi
 	 address, and we will apply a 16-bit offset after loading it.
 	 If the symbol is local, the linker should provide enough local
 	 GOT entries for a 16-bit offset, but larger offsets may lead
 	 to GOT overflow.  */
       return SMALL_INT (offset);
+    case SYMBOL_TPREL:
+    case SYMBOL_DTPREL:
+      /* There is no carry between the HI and LO REL relocations, so the
+	 offset is only valid if we know it won't lead to such a carry.  */
+      if (mips_offset_within_alignment_p (x, INTVAL (offset)))
+	return true;
+      /* Fall through.  */
     case SYMBOL_GOT_DISP:
     case SYMBOL_TLSGD:
     case SYMBOL_TLSLDM:
-    case SYMBOL_DTPREL:
-    case SYMBOL_TPREL:
     case SYMBOL_TLS:
     case SYMBOL_HALF:
       return false;
   gcc_unreachable ();

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]