Changeset 1973 for binutils/trunk/gas/config/tc-rl78.c

Timestamp:

Feb 6, 2017, 1:00:00 PM (8 years ago)

Author:

Silvan Scherrer

Message:

binutils: update trunk to version 2.27

Location:

binutils/trunk

Files:

• . (modified) (1 prop)
• gas/config/tc-rl78.c (modified) (39 diffs)

binutils/trunk/gas/config/tc-rl78.c ¶

@@ -1 +1 @@
 /* tc-rl78.c -- Assembler for the Renesas RL78
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -103 +103 @@
 rl78_linkrelax_branch (void)
 {
+  rl78_relax (RL78_RELAX_BRANCH, 0);
   rl78_bytes.link_relax |= RL78_RELAXA_BRA;
 }
@@ -131 +132 @@
 
 int
-rl78_has_prefix ()
+rl78_has_prefix (void)
 {
   return rl78_bytes.n_prefix;
@@ -281 +282 @@
 {
   OPTION_RELAX = OPTION_MD_BASE,
+  OPTION_NORELAX,
   OPTION_G10,
+  OPTION_G13,
+  OPTION_G14,
   OPTION_32BIT_DOUBLES,
   OPTION_64BIT_DOUBLES,
@@ -293 +297 @@
 {
   {"relax", no_argument, NULL, OPTION_RELAX},
+  {"norelax", no_argument, NULL, OPTION_NORELAX},
   {"mg10", no_argument, NULL, OPTION_G10},
+  {"mg13", no_argument, NULL, OPTION_G13},
+  {"mg14", no_argument, NULL, OPTION_G14},
+  {"mrl78", no_argument, NULL, OPTION_G14},
   {"m32bit-doubles", no_argument, NULL, OPTION_32BIT_DOUBLES},
   {"m64bit-doubles", no_argument, NULL, OPTION_64BIT_DOUBLES},
@@ -301 +309 @@
 
 int
-md_parse_option (int c, char * arg ATTRIBUTE_UNUSED)
+md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
 {
   switch (c)
@@ -308 +316 @@
       linkrelax = 1;
       return 1;
+    case OPTION_NORELAX:
+      linkrelax = 0;
+      return 1;
 
     case OPTION_G10:
+      elf_flags &= ~ E_FLAG_RL78_CPU_MASK;
       elf_flags |= E_FLAG_RL78_G10;
+      return 1;
+
+    case OPTION_G13:
+      elf_flags &= ~ E_FLAG_RL78_CPU_MASK;
+      elf_flags |= E_FLAG_RL78_G13;
+      return 1;
+
+    case OPTION_G14:
+      elf_flags &= ~ E_FLAG_RL78_CPU_MASK;
+      elf_flags |= E_FLAG_RL78_G14;
       return 1;
 
@@ -324 +346 @@
 }
 
-void
-md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
+int
+rl78_isa_g10 (void)
+{
+  return (elf_flags & E_FLAG_RL78_CPU_MASK) == E_FLAG_RL78_G10;
+}
+
+int
+rl78_isa_g13 (void)
+{
+  return (elf_flags & E_FLAG_RL78_CPU_MASK) == E_FLAG_RL78_G13;
+}
+
+int
+rl78_isa_g14 (void)
+{
+  return (elf_flags & E_FLAG_RL78_CPU_MASK) == E_FLAG_RL78_G14;
+}
+
+void
+md_show_usage (FILE * stream)
 {
   fprintf (stream, _(" RL78 specific command line options:\n"));
+  fprintf (stream, _("  --mrelax          Enable link time relaxation\n"));
   fprintf (stream, _("  --mg10            Enable support for G10 variant\n"));
+  fprintf (stream, _("  --mg13            Selects the G13 core.\n"));
+  fprintf (stream, _("  --mg14            Selects the G14 core [default]\n"));
+  fprintf (stream, _("  --mrl78           Alias for --mg14\n"));
   fprintf (stream, _("  --m32bit-doubles  [default]\n"));
-  fprintf (stream, _("  --m64bit-doubles\n"));
+  fprintf (stream, _("  --m64bit-doubles  Source code uses 64-bit doubles\n"));
 }
 
@@ -365 +409 @@
 };
 
+static symbolS * rl78_abs_sym = NULL;
+
 void
 md_begin (void)
 {
+  rl78_abs_sym = symbol_make ("__rl78_abs__");
 }
 
@@ -390 +437 @@
 
 static void
-require_end_of_expr (char *fname)
+require_end_of_expr (const char *fname)
 {
   while (* input_line_pointer == ' '
@@ -408 +455 @@
 static struct
 {
-  char * fname;
+  const char * fname;
   int    reloc;
 }
@@ -456 +503 @@
   if (rl78_bytes.n_relax || rl78_bytes.link_relax)
     {
-      fragP->tc_frag_data = malloc (sizeof (rl78_bytesT));
+      fragP->tc_frag_data = XNEW (rl78_bytesT);
       memcpy (fragP->tc_frag_data, & rl78_bytes, sizeof (rl78_bytesT));
     }
@@ -487 +534 @@
 }
 
-char *
+const char *
 md_atof (int type, char * litP, int * sizeP)
 {
@@ -644 +691 @@
     case BFD_RELOC_RL78_HI16:
       if (size != 2)
-        as_bad (_("%%hi16/%%lo16 only applies to .short or .hword"));
-      type = exp->X_md;
+        {
+          /* Fixups to assembler generated expressions do not use %hi or %lo.  */
+          if (frag->fr_file)
+            as_bad (_("%%hi16/%%lo16 only applies to .short or .hword"));
+        }
+      else
+        type = exp->X_md;
       break;
     case BFD_RELOC_RL78_HI8:
       if (size != 1)
-        as_bad (_("%%hi8 only applies to .byte"));
-      type = exp->X_md;
+        {
+          /* Fixups to assembler generated expressions do not use %hi or %lo.  */
+          if (frag->fr_file)
+            as_bad (_("%%hi8 only applies to .byte"));
+        }
+      else
+        type = exp->X_md;
       break;
     default:
@@ -708 +765 @@
   OT_bt_es,
   OT_bc,
-  OT_bh
+  OT_bh,
+  OT_sk,
+  OT_call,
+  OT_br,
 } op_type_T;
 
@@ -731 +791 @@
 
 static op_type_T
-rl78_opcode_type (char * op)
-{
+rl78_opcode_type (char * ops)
+{
+  unsigned char *op = (unsigned char *)ops;
+
   if (op[0] == 0x31
       && ((op[1] & 0x0f) == 0x05
@@ -755 +817 @@
       && (op[1] & 0xef) == 0xc3)
     return OT_bh;
+
+  if (op[0] == 0x61
+      && (op[1] & 0xcf) == 0xc8)
+    return OT_sk;
+
+  if (op[0] == 0x61
+      && (op[1] & 0xef) == 0xe3)
+    return OT_sk;
+
+  if (op[0] == 0xfc)
+    return OT_call;
+
+  if ((op[0] & 0xec) == 0xec)
+    return OT_br;
 
   return OT_other;
@@ -806 +882 @@
    value is the difference between fr_fix and the actual size.  We
    compute the total size in rl78_relax_frag and store it in fr_subtype,
-   sowe only need to subtract fx_fix and return it.  */
+   so we only need to subtract fx_fix and return it.  */
 
 int
@@ -852 +928 @@
                            & sym_addr))
     {
+      /* If we don't expect the linker to do relaxing, don't emit
+         expanded opcodes that only the linker will relax.  */
+      if (!linkrelax)
+        return newsize - oldsize;
+
       /* If we don't, we must use the maximum size for the linker.  */
       switch (fragP->tc_frag_data->relax[ri].type)
@@ -871 +952 @@
               newsize = 6;
               break;
-            case OT_other:
+            case OT_sk:
+              newsize = 2;
+              break;
+            default:
               newsize = oldsize;
               break;
@@ -918 +1002 @@
             newsize = 6;
           break;
-        case OT_other:
+        case OT_sk:
+          newsize = 2;
+          break;
+        default:
           newsize = oldsize;
           break;
@@ -943 +1030 @@
   tprintf (" -> new %d old %d delta %d\n", newsize, oldsize, newsize-oldsize);
   return newsize - oldsize;
- }
- 
+}
+
 /* This lets us test for the opcode type and the desired size in a
    switch statement.  */
@@ -978 +1065 @@
      be the frag address.  */
   mypc = fragP->fr_address + (fragP->fr_opcode - fragP->fr_literal);
-  tprintf("\033[32mmypc: 0x%x\033[0m\n", (int)mypc);
+  tprintf ("\033[32mmypc: 0x%x\033[0m\n", (int)mypc);
 
   /* Try to get the target address.  If we fail here, we just use the
      largest format.  */
   if (rl78_frag_fix_value (fragP, segment, 0, & addr0,
-                         fragP->tc_frag_data->relax[ri].type != RL78_RELAX_BRANCH, 0))
+                           fragP->tc_frag_data->relax[ri].type != RL78_RELAX_BRANCH, 0))
     {
       /* We don't know the target address.  */
@@ -1013 +1100 @@
           disp -= 3;
           op[2] = disp;
+          reloc_type = keep_reloc ? BFD_RELOC_8_PCREL : BFD_RELOC_NONE;
           break;
 
@@ -1030 +1118 @@
           disp -= 4;
           op[3] = disp;
+          reloc_type = keep_reloc ? BFD_RELOC_8_PCREL : BFD_RELOC_NONE;
           break;
 
@@ -1047 +1136 @@
           disp -= 4;
           op[3] = disp;
+          reloc_type = keep_reloc ? BFD_RELOC_8_PCREL : BFD_RELOC_NONE;
           break;
 
@@ -1064 +1154 @@
           disp -= 2;
           op[1] = disp;
+          reloc_type = keep_reloc ? BFD_RELOC_8_PCREL : BFD_RELOC_NONE;
           break;
 
@@ -1081 +1172 @@
           disp -= 3;
           op[2] = disp;
+          reloc_type = keep_reloc ? BFD_RELOC_8_PCREL : BFD_RELOC_NONE;
           break;
 
@@ -1095 +1187 @@
           break;
 
+        case OPCODE (OT_sk, 2): /* SK<cond> - no change */
+          reloc_type = keep_reloc ? BFD_RELOC_16_PCREL : BFD_RELOC_NONE;
+          break;
+
         default:
-          fprintf(stderr, "Missed case %d %d at 0x%lx\n",
-                  rl78_opcode_type (fragP->fr_opcode), fragP->fr_subtype, mypc);
-          abort ();
-          
+          reloc_type = fix ? fix->fx_r_type : BFD_RELOC_NONE;
+          break;
         }
       break;
@@ -1167 +1261 @@
     }
 
+  if (fixp->fx_r_type == BFD_RELOC_RL78_RELAX && !linkrelax)
+    {
+      reloc[0] = NULL;
+      return reloc;
+    }
+
   if (fixp->fx_subsy
       && S_GET_SEGMENT (fixp->fx_subsy) == absolute_section)
@@ -1174 +1274 @@
     }
 
-  reloc[0]                = (arelent *) xmalloc (sizeof (arelent));
-  reloc[0]->sym_ptr_ptr   = (asymbol **) xmalloc (sizeof (asymbol *));
+  reloc[0]                = XNEW (arelent);
+  reloc[0]->sym_ptr_ptr   = XNEW (asymbol *);
   * reloc[0]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
   reloc[0]->address       = fixp->fx_frag->fr_address + fixp->fx_where;
@@ -1187 +1287 @@
 
 #define OPX(REL,SYM,ADD)                                                        \
-  reloc[rp]                = (arelent *) xmalloc (sizeof (arelent));            \
-  reloc[rp]->sym_ptr_ptr   = (asymbol **) xmalloc (sizeof (asymbol *));         \
+  reloc[rp]                = XNEW (arelent);            \
+  reloc[rp]->sym_ptr_ptr   = XNEW (asymbol *);          \
   reloc[rp]->howto         = bfd_reloc_type_lookup (stdoutput, REL);            \
   reloc[rp]->addend        = ADD;                                               \
@@ -1195 +1295 @@
   reloc[++rp] = NULL
 #define OPSYM(SYM) OPX(BFD_RELOC_RL78_SYM, SYM, 0)
-#define OPIMM(IMM) OPX(BFD_RELOC_RL78_SYM, abs_symbol.bsym, IMM)
+
+  /* FIXME: We cannot do the normal thing for an immediate value reloc,
+     ie creating a RL78_SYM reloc in the *ABS* section with an offset
+     equal to the immediate value we want to store.  This fails because
+     the reloc processing in bfd_perform_relocation and bfd_install_relocation
+     will short circuit such relocs and never pass them on to the special
+     reloc processing code.  So instead we create a RL78_SYM reloc against
+     the __rl78_abs__ symbol and arrange for the linker scripts to place
+     this symbol at address 0.  */
+#define OPIMM(IMM) OPX (BFD_RELOC_RL78_SYM, symbol_get_bfdsym (rl78_abs_sym), IMM)
+
 #define OP(OP) OPX(BFD_RELOC_RL78_##OP, *reloc[0]->sym_ptr_ptr, 0)
 #define SYM0() reloc[0]->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_RL78_SYM)
@@ -1318 +1428 @@
   unsigned long val;
 
+  /* We always defer overflow checks for these to the linker, as it
+     needs to do PLT stuff.  */
+  if (f->fx_r_type == BFD_RELOC_RL78_CODE)
+    f->fx_no_overflow = 1;
+
   if (f->fx_addsy && S_FORCE_RELOC (f->fx_addsy, 1))
     return;
@@ -1326 +1441 @@
   val = (unsigned long) * t;
 
+  if (f->fx_addsy == NULL)
+    f->fx_done = 1;
+
   switch (f->fx_r_type)
     {
@@ -1332 +1450 @@
 
     case BFD_RELOC_RL78_RELAX:
-      f->fx_done = 1;
+      f->fx_done = 0;
       break;
 
@@ -1342 +1460 @@
       /* Fall through.  */
     case BFD_RELOC_8:
+    case BFD_RELOC_RL78_SADDR: /* We need to store the 8 LSB, but this works.  */
       op[0] = val;
       break;
@@ -1402 +1521 @@
     }
 
-  if (f->fx_addsy == NULL)
-    f->fx_done = 1;
 }
 
@@ -1410 +1527 @@
 {
   int align = bfd_get_section_alignment (stdoutput, segment);
-  return ((size + (1 << align) - 1) & (-1 << align));
-}
+  return ((size + (1 << align) - 1) & -(1 << align));
+}