+2007-08-08 Richard Sandiford <richard@codesourcery.com>
+
+ * config/mips/mips-protos.h (SYMBOL_FORCE_TO_MEM): New symbol type.
+ * config/mips/mips.c (mips_classify_symbol): Skip TARGET_ABICALLS
+ block for locally-binding symbols if TARGET_ABSOLUTE_ABICALLS.
+ Return SYMBOL_FORCE_TO_MEM instead of SYMBOL_ABSOLUTE for
+ non-call contexts if TARGET_MIPS16.
+ (mips_symbolic_constant_p): Handle SYMBOL_FORCE_TO_MEM.
+ (mips_symbolic_address_p): Likewise. Remove special TARGET_MIPS16
+ code for SYMBOL_ABSOLUTE.
+ (mips_symbol_insns): Likewise.
+
2007-08-08 Richard Sandiford <richard@codesourcery.com>
* config/mips/mips-protos.h (mips_symbol_context): New enumeration.
LABEL_REF X in context CONTEXT. */
static enum mips_symbol_type
-mips_classify_symbol (rtx x, enum mips_symbol_context context ATTRIBUTE_UNUSED)
+mips_classify_symbol (rtx x, enum mips_symbol_context context)
{
if (TARGET_RTP_PIC)
return SYMBOL_GOT_DISP;
&& !SYMBOL_REF_WEAK (x))
return SYMBOL_GP_RELATIVE;
- if (TARGET_ABICALLS)
+ /* Don't use GOT accesses for locally-binding symbols when -mno-shared
+ is in effect. */
+ if (TARGET_ABICALLS
+ && !(TARGET_ABSOLUTE_ABICALLS && mips_symbol_binds_local_p (x)))
{
- /* Don't use GOT accesses for locally-binding symbols; we can use
- %hi and %lo instead. */
- if (TARGET_ABSOLUTE_ABICALLS && mips_symbol_binds_local_p (x))
- return SYMBOL_ABSOLUTE;
-
/* There are three cases to consider:
- o32 PIC (either with or without explicit relocs)
return SYMBOL_GOT_PAGE_OFST;
}
+ if (TARGET_MIPS16 && context != SYMBOL_CONTEXT_CALL)
+ return SYMBOL_FORCE_TO_MEM;
return SYMBOL_ABSOLUTE;
}
switch (*symbol_type)
{
case SYMBOL_ABSOLUTE:
+ case SYMBOL_FORCE_TO_MEM:
case SYMBOL_64_HIGH:
case SYMBOL_64_MID:
case SYMBOL_64_LOW:
switch (symbol_type)
{
case SYMBOL_ABSOLUTE:
- return !TARGET_MIPS16;
-
case SYMBOL_GP_RELATIVE:
return true;
case SYMBOL_GOT_PAGE_OFST:
return true;
+ case SYMBOL_FORCE_TO_MEM:
case SYMBOL_GOT_DISP:
- /* The address will have to be loaded from the GOT first. */
+ /* The address will have to be loaded from the constant pool
+ or GOT before it is used in an address. */
return false;
case SYMBOL_GOTOFF_PAGE:
switch (type)
{
case SYMBOL_ABSOLUTE:
- /* In mips16 code, general symbols must be fetched from the
- constant pool. */
- if (TARGET_MIPS16)
- return 0;
-
/* When using 64-bit symbols, we need 5 preparatory instructions,
such as:
extended instruction. */
return 2;
+ case SYMBOL_FORCE_TO_MEM:
+ /* The constant must be loaded from the constant pool. */
+ return 0;
+
case SYMBOL_GOT_PAGE_OFST:
case SYMBOL_GOT_DISP:
/* Unless -funit-at-a-time is in effect, we can't be sure whether