fix typo, added @table

[deliverable/binutils-gdb.git] / gdb / m68k-pinsn.c

diff --git a/gdb/m68k-pinsn.c b/gdb/m68k-pinsn.c
index bef5eb890dcc0d6dd391a7603570edb7f49863d6..60c6c592e21a0cd8a500815fe31e93986eadff4f 100644 (file)
--- a/gdb/m68k-pinsn.c
+++ b/gdb/m68k-pinsn.c
@@ -44,9 +44,9 @@ print_insn_arg PARAMS ((char *, unsigned char *, unsigned char *, CORE_ADDR,
 /* Number of elements in the opcode table.  */
 #define NOPCODES (sizeof m68k_opcodes / sizeof m68k_opcodes[0])
 
-extern char *reg_names[];
-char *fpcr_names[] = { "", "fpiar", "fpsr", "fpiar/fpsr", "fpcr",
-                    "fpiar/fpcr", "fpsr/fpcr", "fpiar-fpcr"};
+const char * const fpcr_names[] = {
+  "", "fpiar", "fpsr", "fpiar/fpsr", "fpcr",
+  "fpiar/fpcr", "fpsr/fpcr", "fpiar/fpsr/fpcr"};
 
 /* Define accessors for 68K's 1, 2, and 4-byte signed quantities.
    The _SHIFT values move the quantity to the high order end of an
@@ -181,13 +181,37 @@ print_insn_arg (d, buffer, p, addr, stream)
   register int val;
   register int place = d[1];
   int regno;
-  register char *regname;
+  register const char *regname;
   register unsigned char *p1;
   double flval;
   int flt_p;
 
   switch (*d)
     {
+    case 'c':          /* cache identifier */
+      {
+        static char *cacheFieldName[] = { "NOP", "dc", "ic", "bc" };
+        val = fetch_arg (buffer, place, 2);
+        fprintf_filtered (stream, cacheFieldName[val]);
+        break;
+      }
+
+    case 'a':          /* address register indirect only. Cf. case '+'. */
+      {
+        fprintf_filtered (stream,
+                         "%s@",
+                         reg_names [fetch_arg (buffer, place, 3) + 8]);
+        break;
+      }
+
+    case '_':          /* 32-bit absolute address for move16. */
+      {
+        val = NEXTLONG (p);
+        fprintf_filtered (stream, "@#");
+       print_address (val, stream);
+        break;
+      }
+
     case 'C':
       fprintf_filtered (stream, "ccr");
       break;
@@ -204,8 +228,11 @@ print_insn_arg (d, buffer, p, addr, stream)
       {
        static struct { char *name; int value; } names[]
          = {{"sfc", 0x000}, {"dfc", 0x001}, {"cacr", 0x002},
+            {"tc",  0x003}, {"itt0",0x004}, {"itt1", 0x005},
+             {"dtt0",0x006}, {"dtt1",0x007},
             {"usp", 0x800}, {"vbr", 0x801}, {"caar", 0x802},
-            {"msp", 0x803}, {"isp", 0x804}};
+            {"msp", 0x803}, {"isp", 0x804}, {"mmusr",0x805},
+             {"urp", 0x806}, {"srp", 0x807}};
 
        val = fetch_arg (buffer, place, 12);
        for (regno = sizeof names / sizeof names[0] - 1; regno >= 0; regno--)
@@ -252,6 +279,10 @@ print_insn_arg (d, buffer, p, addr, stream)
       fprintf_filtered (stream, "%s", reg_names[fetch_arg (buffer, place, 4)]);
       break;
 
+    case 'r':
+      fprintf_filtered (stream, "%s@", reg_names[fetch_arg (buffer, place, 4)]);
+      break;
+
     case 'F':
       fprintf_filtered (stream, "fp%d", fetch_arg (buffer, place, 3));
       break;
@@ -372,6 +403,7 @@ print_insn_arg (d, buffer, p, addr, stream)
     case '?':
     case '/':
     case '&':
+    case '`':
 
       if (place == 'd')
        {
@@ -466,10 +498,12 @@ print_insn_arg (d, buffer, p, addr, stream)
                  flval = NEXTDOUBLE(p);
                  break;
 
+#ifdef HAVE_68881
                case 'x':
-                 ieee_extended_to_double (ext_format_68881, p, &flval);
+                 ieee_extended_to_double (&ext_format_68881, p, &flval);
                  p += 12;
                  break;
+#endif
 
                case 'p':
                  p += 12;
@@ -653,12 +687,18 @@ fetch_arg (buffer, code, bits)
       val >>= 10;
       break;
 
+    case 'e':
+      val = (buffer[1] >> 6);
+      break;
+
     default:
       abort ();
     }
 
   switch (bits)
     {
+    case 2:
+      return val & 3;
     case 3:
       return val & 7;
     case 4: