minor formatting changes

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

diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
index 42c1793b6d7964fd9dd53e1c8d26368c93c24ce6..793de68c73f9073da3e84097240f76cce8d16f76 100644 (file)
--- a/opcodes/mcore-dis.c
+++ b/opcodes/mcore-dis.c
@@ -13,7 +13,7 @@ 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 <stdio.h>
 #define STATIC_TABLE
@@ -57,7 +57,6 @@ static const unsigned short imsk[] =
     /* OMc */ 0xFF00,
     /* SIa */ 0xFE00,
 
-                
     /* JC  */ 0,               /* JC,JU,JL don't appear in object */
     /* JU  */ 0,
     /* JL  */ 0,
@@ -96,6 +95,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 +105,15 @@ print_insn_mcore (memaddr, info)
       return -1;
     }
 
-  inst = (ibytes[0] << 8) | ibytes[1];
+    inst = (ibytes[0] << 8) | ibytes[1];
 
   /* 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];
@@ -191,11 +190,11 @@ 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]);
+             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 +215,11 @@ 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]);
+
+             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);