gas/:

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

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 569a89e96903dda15d16244ddb5b791a2c176cb3..9d422c7d8ff841461bbbde7348652709c114a9d4 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -309,7 +309,7 @@ static const enum m68k_register mcf5485_ctrl[] = {
   0
 };
 static const enum m68k_register fido_ctrl[] = {
-  SFC, DFC, USP, VBR, CAC, MBB,
+  SFC, DFC, USP, VBR, CAC, MBO,
   0
 };
 #define cpu32_ctrl m68010_ctrl
@@ -2178,7 +2178,7 @@ m68k_ip (char *instring)
 
              the_ins.error = buf;
              /* Make sure there's a NUL at the end of the buffer -- strncpy
-                won't write one when it runs out of buffer */
+                won't write one when it runs out of buffer.  */
              buf[space] = 0;
 #define APPEND(STRING) \
   (strncpy (buf, STRING, space), len = strlen (buf), buf += len, space -= len)
@@ -2187,37 +2187,41 @@ m68k_ip (char *instring)
              switch (ok_arch)
                {
                case mcfisa_a:
-                 APPEND (_("ColdFire ISA_A"));
+                 APPEND ("ColdFire ISA_A");
                  break;
                case mcfhwdiv:
-                 APPEND (_("ColdFire hardware divide"));
+                 APPEND ("ColdFire ");
+                 APPEND (_("hardware divide"));
                  break;
                case mcfisa_aa:
-                 APPEND (_("ColdFire ISA_A+"));
+                 APPEND ("ColdFire ISA_A+");
                  break;
                case mcfisa_b:
-                 APPEND (_("ColdFire ISA_B"));
+                 APPEND ("ColdFire ISA_B");
                  break;
                case mcfisa_c:
-                 APPEND (_("ColdFire ISA_C"));
+                 APPEND ("ColdFire ISA_C");
                  break;
                case cfloat:
-                 APPEND (_("ColdFire fpu"));
+                 APPEND ("ColdFire fpu");
                  break;
                case mfloat:
-                 APPEND (_("M68K fpu"));
+                 APPEND ("M68K fpu");
                  break;
                case mmmu:
-                 APPEND (_("M68K mmu"));
+                 APPEND ("M68K mmu");
                  break;
                case m68020up:
-                 APPEND (_("68020 or higher"));
+                 APPEND ("68020 ");
+                 APPEND (_("or higher"));
                  break;
                case m68000up:
-                 APPEND (_("68000 or higher"));
+                 APPEND ("68000 ");
+                 APPEND (_("or higher"));
                  break;
                case m68010up:
-                 APPEND (_("68010 or higher"));
+                 APPEND ("68010 ");
+                 APPEND (_("or higher"));
                  break;
                default:
                  paren = 0;
@@ -2261,7 +2265,7 @@ m68k_ip (char *instring)
 #undef APPEND
              if (!space)
                {
-                 /* we ran out of space, so replace the end of the list
+                 /* We ran out of space, so replace the end of the list
                     with ellipsis.  */
                  buf -= 4;
                  while (*buf != ' ')
@@ -3265,7 +3269,7 @@ m68k_ip (char *instring)
             case CAC:
               tmpreg = 0xFFE;
               break;
-            case MBB:
+            case MBO:
               tmpreg = 0xFFF;
               break;
            default:
@@ -4006,7 +4010,8 @@ static const struct init_entry init_table[] =
   { "mbar2",    MBAR2 },       /* mcf5249 registers.  */
 
   { "cac",    CAC },           /* fido registers.  */
-  { "mbb",    MBB },           /* fido registers.  */
+  { "mbb",    MBO },           /* fido registers (obsolete).  */
+  { "mbo",    MBO },           /* fido registers.  */
   /* End of control registers.  */
 
   { "ac", AC },
@@ -4680,63 +4685,10 @@ m68k_mri_mode_change (int on)
     }
 }
 
-/* Equal to MAX_PRECISION in atof-ieee.c.  */
-#define MAX_LITTLENUMS 6
-
-/* Turn a string in input_line_pointer into a floating point constant
-   of type TYPE, and store the appropriate bytes in *LITP.  The number
-   of LITTLENUMS emitted is stored in *SIZEP.  An error message is
-   returned, or NULL on OK.  */
-
 char *
 md_atof (int type, char *litP, int *sizeP)
 {
-  int prec;
-  LITTLENUM_TYPE words[MAX_LITTLENUMS];
-  LITTLENUM_TYPE *wordP;
-  char *t;
-
-  switch (type)
-    {
-    case 'f':
-    case 'F':
-    case 's':
-    case 'S':
-      prec = 2;
-      break;
-
-    case 'd':
-    case 'D':
-    case 'r':
-    case 'R':
-      prec = 4;
-      break;
-
-    case 'x':
-    case 'X':
-      prec = 6;
-      break;
-
-    case 'p':
-    case 'P':
-      prec = 6;
-      break;
-
-    default:
-      *sizeP = 0;
-      return _("Bad call to MD_ATOF()");
-    }
-  t = atof_ieee (input_line_pointer, type, words);
-  if (t)
-    input_line_pointer = t;
-
-  *sizeP = prec * sizeof (LITTLENUM_TYPE);
-  for (wordP = words; prec--;)
-    {
-      md_number_to_chars (litP, (long) (*wordP++), sizeof (LITTLENUM_TYPE));
-      litP += sizeof (LITTLENUM_TYPE);
-    }
-  return 0;
+  return ieee_md_atof (type, litP, sizeP, TRUE);
 }
 
 void