2001-07-21 Chris Demetriou <cgd@broadcom.com>

[deliverable/binutils-gdb.git] / opcodes / mcore-dis.c

diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
index 42c1793b6d7964fd9dd53e1c8d26368c93c24ce6..bbf0f977209b8605a5fb2d9a79b483f3cd06823c 100644 (file)
--- a/opcodes/mcore-dis.c
+++ b/opcodes/mcore-dis.c
@@ -1,5 +1,5 @@
-/* Disassemble Motorolla M*Core instructions.
-   Copyright (C) 1993, 1999 Free Software Foundation, Inc.
+/* Disassemble Motorola M*Core instructions.
+   Copyright 1993, 1999, 2000 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,8 +13,9 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include "sysdep.h"
 #include <stdio.h>
 #define STATIC_TABLE
 #define DEFINE_TABLE
@@ -28,7 +29,7 @@ static const unsigned short imsk[] =
     /* O0  */ 0xFFFF,
     /* OT  */ 0xFFFC,
     /* O1  */ 0xFFF0,
-    /* OC  */ 0xFFE0,
+    /* OC  */ 0xFE00,
     /* O2  */ 0xFF00,
     /* X1  */ 0xFFF0,
     /* OI  */ 0xFE00,
@@ -57,6 +58,8 @@ static const unsigned short imsk[] =
     /* OMc */ 0xFF00,
     /* SIa */ 0xFE00,
 
+  /* MULSH */ 0xFF00,    
+  /* OPSR  */ 0xFFF8,   /* psrset/psrclr */
                 
     /* JC  */ 0,               /* JC,JU,JL don't appear in object */
     /* JU  */ 0,
@@ -96,6 +99,8 @@ print_insn_mcore (memaddr, info)
   mcore_opcode_info * op;
   int                 status;
 
+  info->bytes_per_chunk = 2;
+
   status = info->read_memory_func (memaddr, ibytes, 2, info);
 
   if (status != 0) 
@@ -104,17 +109,20 @@ print_insn_mcore (memaddr, info)
       return -1;
     }
 
-  inst = (ibytes[0] << 8) | ibytes[1];
+  if (info->endian == BFD_ENDIAN_BIG)
+    inst = (ibytes[0] << 8) | ibytes[1];
+  else if (info->endian == BFD_ENDIAN_LITTLE)
+    inst = (ibytes[1] << 8) | ibytes[0];
+  else
+    abort ();
 
   /* Just a linear search of the table.  */
   for (op = mcore_table; op->name != 0; op ++)
-    {
-      if (op->inst == (inst & imsk[op->opclass]))
-       break;
-    }
+    if (op->inst == (inst & imsk[op->opclass]))
+      break;
 
   if (op->name == 0)
-    fprintf (stream, ".word 0x%04x", inst);
+    fprintf (stream, ".short 0x%04x", inst);
   else
     {
       const char * name = grname[inst & 0x0F];
@@ -130,6 +138,7 @@ print_insn_mcore (memaddr, info)
        case JSR: fprintf (stream, "\t%s", name); break;
        case OC:  fprintf (stream, "\t%s, %s", name, crname[(inst >> 4) & 0x1F]); break;
        case O1R1: fprintf (stream, "\t%s, r1", name); break;
+       case MULSH:
        case O2: fprintf (stream, "\t%s, %s", name, grname[(inst >> 4) & 0xF]); break;
        case X1: fprintf (stream, "\tr1, %s", name); break;
        case OI: fprintf (stream, "\t%s, %d", name, ((inst >> 4) & 0x1F) + 1); break;
@@ -160,7 +169,7 @@ print_insn_mcore (memaddr, info)
            
            if (strcmp (op->name, "bsr") == 0)
              {
-               /* for bsr, we'll try to get a symbol for the target */
+               /* For bsr, we'll try to get a symbol for the target.  */
                val = memaddr + 2 + (val << 1);
                
                if (info->print_address_func && val != 0)
@@ -191,11 +200,15 @@ print_insn_mcore (memaddr, info)
            if (status != 0) 
              {
                info->memory_error_func (status, memaddr, info);
-               return -1;
+               break;
              }
            
-           val = (ibytes[0] << 24) | (ibytes[1] << 16)
-             | (ibytes[2] << 8) | (ibytes[3]);
+           if (info->endian == BFD_ENDIAN_LITTLE)
+             val = (ibytes[3] << 24) | (ibytes[2] << 16)
+               | (ibytes[1] << 8) | (ibytes[0]);
+           else
+             val = (ibytes[0] << 24) | (ibytes[1] << 16)
+               | (ibytes[2] << 8) | (ibytes[3]);
            
            /* Removed [] around literal value to match ABI syntax 12/95.  */
            fprintf (stream, "\t%s, 0x%X", grname[(inst >> 8) & 0xF], val);
@@ -216,11 +229,15 @@ print_insn_mcore (memaddr, info)
            if (status != 0) 
              {
                info->memory_error_func (status, memaddr, info);
-               return -1;
+               break;
              }
-           
-           val = (ibytes[0] << 24) | (ibytes[1] << 16)
-             | (ibytes[2] << 8) | (ibytes[3]);
+
+           if (info->endian == BFD_ENDIAN_LITTLE)
+             val = (ibytes[3] << 24) | (ibytes[2] << 16)
+               | (ibytes[1] << 8) | (ibytes[0]);
+           else
+             val = (ibytes[0] << 24) | (ibytes[1] << 16)
+               | (ibytes[2] << 8) | (ibytes[3]);
            
            /* Removed [] around literal value to match ABI syntax 12/95.  */
            fprintf (stream, "\t0x%X", val);
@@ -238,13 +255,25 @@ print_insn_mcore (memaddr, info)
          }
          break;
          
+       case OPSR:
+         {
+           static char * fields[] = 
+           {
+             "af", "ie",    "fe",    "fe,ie", 
+             "ee", "ee,ie", "ee,fe", "ee,fe,ie"
+           };
+           
+           fprintf (stream, "\t%s", fields[inst & 0x7]);
+         }
+         break;
+         
        default:
-         /* if the disassembler lags the instruction set */
+         /* If the disassembler lags the instruction set.  */
          fprintf (stream, "\tundecoded operands, inst is 0x%04x", inst);
          break;
        }
     }
   
-  /* Say how many bytes we consumed? */
+  /* Say how many bytes we consumed.  */
   return 2;
 }