* tc-m68hc11.c (s_m68hc11_parse_pseudo_instruction):

[deliverable/binutils-gdb.git] / gas / config / tc-moxie.c

diff --git a/gas/config/tc-moxie.c b/gas/config/tc-moxie.c
index 84563ce555c874b1d2a99c2a5a70eac8fd1d322c..2fffc6594c8c8831125cbdf67b6ee29ad0c9a9d1 100644 (file)
--- a/gas/config/tc-moxie.c
+++ b/gas/config/tc-moxie.c
@@ -43,6 +43,8 @@ const pseudo_typeS md_pseudo_table[] =
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 const char EXP_CHARS[] = "eE";
 
+static int md_chars_to_number (char *val, int n);
+
 void
 md_operand (expressionS *op __attribute__((unused)))
 {
@@ -67,7 +69,7 @@ md_begin (void)
   for (count = 0, opcode = moxie_form2_opc_info; count++ < 4; opcode++)
     hash_insert (opcode_hash_control, opcode->name, (char *) opcode);
 
-  for (count = 0, opcode = moxie_form3_opc_info; count++ < 4; opcode++)
+  for (count = 0, opcode = moxie_form3_opc_info; count++ < 10; opcode++)
     hash_insert (opcode_hash_control, opcode->name, (char *) opcode);
 
   bfd_set_arch_mach (stdoutput, TARGET_ARCH, 0);
@@ -95,7 +97,7 @@ parse_register_operand (char **ptr)
 
   if (*s != '$')
     {
-      as_bad ("expecting register");
+      as_bad (_("expecting register"));
       ignore_rest_of_line ();
       return -1;
     }
@@ -114,7 +116,7 @@ parse_register_operand (char **ptr)
       reg = s[2] - '0';
       if ((reg < 0) || (reg > 9))
        {
-         as_bad ("illegal register number");
+         as_bad (_("illegal register number"));
          ignore_rest_of_line ();
          return -1;
        }
@@ -130,7 +132,7 @@ parse_register_operand (char **ptr)
     }
   else
     {
-      as_bad ("illegal register number");
+      as_bad (_("illegal register number"));
       ignore_rest_of_line ();
       return -1;
     }
@@ -197,7 +199,7 @@ md_assemble (char *str)
        reg = parse_register_operand (&op_end);
        iword += (reg << 8);
        if (*op_end != ',')
-         as_warn ("expecting comma delimeted register operands");
+         as_warn (_("expecting comma delimited register operands"));
        op_end++;
        op_end = parse_exp_save_ilp (op_end, &arg);
        fix_new_exp (frag_now,
@@ -216,14 +218,14 @@ md_assemble (char *str)
        int dest, src;
        dest = parse_register_operand (&op_end);
        if (*op_end != ',')
-         as_warn ("expecting comma delimeted register operands");
+         as_warn (_("expecting comma delimited register operands"));
        op_end++;
        src  = parse_register_operand (&op_end);
        iword += (dest << 4) + src;
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
       }
       break;
     case MOXIE_F1_A4:
@@ -243,7 +245,7 @@ md_assemble (char *str)
 
        if (*op_end != ',')
          {
-           as_bad ("expecting comma delimited operands");
+           as_bad (_("expecting comma delimited operands"));
            ignore_rest_of_line ();
            return;
          }
@@ -259,6 +261,7 @@ md_assemble (char *str)
                     BFD_RELOC_32);
       }
       break;
+    case MOXIE_F1_M:
     case MOXIE_F1_4:
       iword = opcode->opcode << 8;
       while (ISSPACE (*op_end))
@@ -282,7 +285,7 @@ md_assemble (char *str)
       while (ISSPACE (*op_end))
        op_end++;
       if (*op_end != 0)
-       as_warn ("extra stuff on line ignored");
+       as_warn (_("extra stuff on line ignored"));
       break;
     case MOXIE_F1_A:
       iword = opcode->opcode << 8;
@@ -294,7 +297,7 @@ md_assemble (char *str)
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
        iword += (reg << 4);
       }
       break;
@@ -306,11 +309,11 @@ md_assemble (char *str)
        int a, b;
        a = parse_register_operand (&op_end);
        if (*op_end != ',')
-         as_warn ("expecting comma delimeted register operands");
+         as_warn (_("expecting comma delimited register operands"));
        op_end++;
        if (*op_end != '(')
          {
-           as_bad ("expecting indirect register `($rA)'");
+           as_bad (_("expecting indirect register `($rA)'"));
            ignore_rest_of_line ();
            return;
          }
@@ -318,7 +321,7 @@ md_assemble (char *str)
        b = parse_register_operand (&op_end);
        if (*op_end != ')')
          {
-           as_bad ("missing closing parenthesis");
+           as_bad (_("missing closing parenthesis"));
            ignore_rest_of_line ();
            return;
          }
@@ -327,7 +330,7 @@ md_assemble (char *str)
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
       }
       break;
     case MOXIE_F1_AiB:
@@ -338,7 +341,7 @@ md_assemble (char *str)
        int a, b;
        if (*op_end != '(')
          {
-           as_bad ("expecting indirect register `($rA)'");
+           as_bad (_("expecting indirect register `($rA)'"));
            ignore_rest_of_line ();
            return;
          }
@@ -346,20 +349,20 @@ md_assemble (char *str)
        a = parse_register_operand (&op_end);
        if (*op_end != ')')
          {
-           as_bad ("missing closing parenthesis");
+           as_bad (_("missing closing parenthesis"));
            ignore_rest_of_line ();
            return;
          }
        op_end++;
        if (*op_end != ',')
-         as_warn ("expecting comma delimeted register operands");
+         as_warn (_("expecting comma delimited register operands"));
        op_end++;
        b = parse_register_operand (&op_end);
        iword += (a << 4) + b;
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
       }
       break;
     case MOXIE_F1_4A:
@@ -382,7 +385,7 @@ md_assemble (char *str)
 
        if (*op_end != ',')
          {
-           as_bad ("expecting comma delimited operands");
+           as_bad (_("expecting comma delimited operands"));
            ignore_rest_of_line ();
            return;
          }
@@ -392,7 +395,7 @@ md_assemble (char *str)
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
 
        iword += (a << 4);
       }
@@ -412,7 +415,7 @@ md_assemble (char *str)
 
        if (*op_end != ',')
          {
-           as_bad ("expecting comma delimited operands");
+           as_bad (_("expecting comma delimited operands"));
            ignore_rest_of_line ();
            return;
          }
@@ -429,7 +432,7 @@ md_assemble (char *str)
 
        if (*op_end != '(')
          {
-           as_bad ("expecting indirect register `($rX)'");
+           as_bad (_("expecting indirect register `($rX)'"));
            ignore_rest_of_line ();
            return;
          }
@@ -437,7 +440,7 @@ md_assemble (char *str)
        b = parse_register_operand (&op_end);
        if (*op_end != ')')
          {
-           as_bad ("missing closing parenthesis");
+           as_bad (_("missing closing parenthesis"));
            ignore_rest_of_line ();
            return;
          }
@@ -446,7 +449,7 @@ md_assemble (char *str)
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
 
        iword += (a << 4) + b;
       }
@@ -471,7 +474,7 @@ md_assemble (char *str)
 
        if (*op_end != '(')
          {
-           as_bad ("expecting indirect register `($rX)'");
+           as_bad (_("expecting indirect register `($rX)'"));
            ignore_rest_of_line ();
            return;
          }
@@ -479,7 +482,7 @@ md_assemble (char *str)
        a = parse_register_operand (&op_end);
        if (*op_end != ')')
          {
-           as_bad ("missing closing parenthesis");
+           as_bad (_("missing closing parenthesis"));
            ignore_rest_of_line ();
            return;
          }
@@ -487,7 +490,7 @@ md_assemble (char *str)
 
        if (*op_end != ',')
          {
-           as_bad ("expecting comma delimited operands");
+           as_bad (_("expecting comma delimited operands"));
            ignore_rest_of_line ();
            return;
          }
@@ -500,7 +503,7 @@ md_assemble (char *str)
        while (ISSPACE (*op_end))
          op_end++;
        if (*op_end != 0)
-         as_warn ("extra stuff on line ignored");
+         as_warn (_("extra stuff on line ignored"));
 
        iword += (a << 4) + b;
       }
@@ -510,10 +513,26 @@ md_assemble (char *str)
       while (ISSPACE (*op_end))
        op_end++;
       if (*op_end != 0)
-       as_warn ("extra stuff on line ignored");
+       as_warn (_("extra stuff on line ignored"));
+      break;
+    case MOXIE_F3_PCREL:
+      iword = (3<<14) | (opcode->opcode << 10);
+      while (ISSPACE (*op_end))
+       op_end++;
+      {
+       expressionS arg;
+
+       op_end = parse_exp_save_ilp (op_end, &arg);
+       fix_new_exp (frag_now,
+                    (p - frag_now->fr_literal),
+                    2,
+                    &arg,
+                    TRUE,
+                    BFD_RELOC_MOXIE_10_PCREL);
+      }
       break;
     default:
-      abort();
+      abort ();
     }
 
   md_number_to_chars (p, iword, 2);
@@ -522,10 +541,10 @@ md_assemble (char *str)
     op_end++;
 
   if (*op_end != 0)
-    as_warn ("extra stuff on line ignored");
+    as_warn (_("extra stuff on line ignored"));
 
   if (pending_reloc)
-    as_bad ("Something forgot to clean up\n");
+    as_bad (_("Something forgot to clean up\n"));
 }
 
 /* Turn a string in input_line_pointer into a floating point constant
@@ -595,15 +614,15 @@ md_show_usage (FILE *stream ATTRIBUTE_UNUSED)
 /* Apply a fixup to the object file.  */
 
 void
-md_apply_fix (fixS *fixP ATTRIBUTE_UNUSED, valueT * valP ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP ATTRIBUTE_UNUSED, 
+             valueT * valP ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long val = *valP;
+  long newval;
   long max, min;
-  int shift;
 
   max = min = 0;
-  shift = 0;
   switch (fixP->fx_r_type)
     {
     case BFD_RELOC_32:
@@ -622,6 +641,19 @@ md_apply_fix (fixS *fixP ATTRIBUTE_UNUSED, valueT * valP ATTRIBUTE_UNUSED, segT
       *buf++ = val;
       break;
 
+    case BFD_RELOC_MOXIE_10_PCREL:
+      if (!val)
+       break;
+      if (val < -1024 || val > 1022)
+       as_bad_where (fixP->fx_file, fixP->fx_line,
+                      _("pcrel too far BFD_RELOC_MOXIE_10"));
+      /* 11 bit offset even numbered, so we remove right bit.  */
+      val >>= 1;
+      newval = md_chars_to_number (buf, 2);
+      newval |= val & 0x03ff;
+      md_number_to_chars (buf, newval, 2);
+      break;
+
     default:
       abort ();
     }
@@ -641,6 +673,22 @@ md_number_to_chars (char *ptr, valueT use, int nbytes)
   number_to_chars_bigendian (ptr, use, nbytes);
 }
 
+/* Convert from target byte order to host byte order.  */
+
+static int
+md_chars_to_number (char *val, int n)
+{
+  int retval = 0;
+
+  while (n--)
+    {
+      retval <<= 8;
+      retval |= (*val++ & 255);
+    }
+
+  return retval;
+}
+
 /* Generate a machine-dependent relocation.  */
 arelent *
 tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP)
@@ -653,6 +701,9 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP)
     case BFD_RELOC_32:
       code = fixP->fx_r_type;
       break;
+    case BFD_RELOC_MOXIE_10_PCREL:
+      code = fixP->fx_r_type;
+      break;
     default:
       as_bad_where (fixP->fx_file, fixP->fx_line,
                    _("Semantics error.  This type of operand can not be relocated, it must be an assembly-time constant"));
@@ -660,7 +711,7 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP)
     }
 
   relP = xmalloc (sizeof (arelent));
-  assert (relP != 0);
+  gas_assert (relP != 0);
   relP->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
   *relP->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy);
   relP->address = fixP->fx_frag->fr_address + fixP->fx_where;
@@ -718,12 +769,12 @@ md_pcrel_from (fixS *fixP)
 {
   valueT addr = fixP->fx_where + fixP->fx_frag->fr_address;
 
-  fprintf (stderr, "md_pcrel_from 0x%d\n", fixP->fx_r_type);
-
   switch (fixP->fx_r_type)
     {
     case BFD_RELOC_32:
       return addr + 4;
+    case BFD_RELOC_MOXIE_10_PCREL:
+      return addr;
     default:
       abort ();
       return addr;