* gdb.base/attach.exp (do_attach_tests): Don't forget to kill second

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

diff --git a/opcodes/h8500-dis.c b/opcodes/h8500-dis.c
index 856e580d7aee6a56e51717b4407f2bd6843ff7d1..5fa52fbf99e911b17a49811ba80fd25018a6b8f4 100644 (file)
--- a/opcodes/h8500-dis.c
+++ b/opcodes/h8500-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble h8500 instructions.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1998, 2000, 2001, 2002 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,21 +13,25 @@ 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 DISASSEMBLER_TABLE
 #define DEFINE_TABLE
 
+#include "sysdep.h"
 #include "h8500-opc.h"
 #include "dis-asm.h"
+#include "opintl.h"
 
 /* Maximum length of an instruction.  */
 #define MAXLEN 8
 
 #include <setjmp.h>
 
+static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+
 struct private
 {
   /* Points to first byte not fetched.  */
@@ -50,7 +54,7 @@ fetch_data (info, addr)
      bfd_byte *addr;
 {
   int status;
-  struct private *priv = (struct private *)info->private_data;
+  struct private *priv = (struct private *) info->private_data;
   bfd_vma start = priv->insn_start + (priv->max_fetched - priv->the_buffer);
 
   status = (*info->read_memory_func) (start,
@@ -60,49 +64,64 @@ fetch_data (info, addr)
   if (status != 0)
     {
       (*info->memory_error_func) (status, start, info);
-      longjmp (priv->bailout);
+      longjmp (priv->bailout, 1);
     }
   else
     priv->max_fetched = addr;
   return 1;
 }
 
-static char *crname[] =
-{"sr", "ccr", "*", "br", "ep", "dp", "*", "tp"};
+static char *crname[] = { "sr", "ccr", "*", "br", "ep", "dp", "*", "tp" };
 
 int
 print_insn_h8500 (addr, info)
-     unsigned long addr;
+     bfd_vma addr;
      disassemble_info *info;
 {
-  h8500_opcode_info *opcode;
+  const h8500_opcode_info *opcode;
   void *stream = info->stream;
   fprintf_ftype func = info->fprintf_func;
 
   struct private priv;
   bfd_byte *buffer = priv.the_buffer;
 
-  info->private_data = (PTR) &priv;
+  info->private_data = (PTR) & priv;
   priv.max_fetched = priv.the_buffer;
   priv.insn_start = addr;
   if (setjmp (priv.bailout) != 0)
     /* Error return.  */
     return -1;
 
-  /* Run down the table to find the one which matches */
+  if (0)
+    {
+      static int one;
+
+      if (!one)
+       {
+         one = 1;
+         for (opcode = h8500_table; opcode->name; opcode++)
+           {
+             if ((opcode->bytes[0].contents & 0x8) == 0)
+               printf ("%s\n", opcode->name);
+           }
+       }
+    }
+
+  /* Run down the table to find the one which matches.  */
   for (opcode = h8500_table; opcode->name; opcode++)
     {
       int byte;
-      int rn;
-      int rd;
-      int rs;
-      int disp;
-      int abs;
-      int imm;
-      int pcrel;
-      int qim;
+      int rn = 0;
+      int rd = 0;
+      int rs = 0;
+      int disp = 0;
+      int abs = 0;
+      int imm = 0;
+      int pcrel = 0;
+      int qim = 0;
       int i;
-      int cr;
+      int cr = 0;
+
       for (byte = 0; byte < opcode->length; byte++)
        {
          FETCH_DATA (info, buffer + byte + 1);
@@ -113,14 +132,15 @@ print_insn_h8500 (addr, info)
            }
          else
            {
-             /* extract any info parts */
+             /* Extract any info parts.  */
              switch (opcode->bytes[byte].insert)
                {
                case 0:
                case FP:
                  break;
                default:
-                 func (stream, "can't cope with insert %d\n",
+                 /* xgettext:c-format */
+                 func (stream, _("can't cope with insert %d\n"),
                        opcode->bytes[byte].insert);
                  break;
                case RN:
@@ -204,8 +224,8 @@ print_insn_h8500 (addr, info)
                }
            }
        }
-      /* We get here when all the masks have passed so we can output the
-        operands*/
+      /* We get here when all the masks have passed so we can output
+        the operands.  */
       FETCH_DATA (info, buffer + opcode->length);
       for (i = 0; i < opcode->length; i++)
        {
@@ -292,11 +312,11 @@ print_insn_h8500 (addr, info)
                  {
                    if (imm & (1 << i))
                      {
+                       func (stream, "r%d", i);
                        if (nc)
                          func (stream, ",");
-                       nc += 1;
+                       nc = 1;
                      }
-                   func (stream, "r%d", i);
                  }
                func (stream, ")");
              }
@@ -305,7 +325,8 @@ print_insn_h8500 (addr, info)
              func (stream, "#0x%0x:8", imm & 0xff);
              break;
            case PCREL16:
-             func (stream, "0x%0x:16", (pcrel + addr + opcode->length) & 0xffff);
+             func (stream, "0x%0x:16",
+                   (pcrel + addr + opcode->length) & 0xffff);
              break;
            case PCREL8:
              func (stream, "#0x%0x:8",
@@ -320,11 +341,12 @@ print_insn_h8500 (addr, info)
            }
        }
       return opcode->length;
-    next:;
+    next:
+      ;
     }
 
-  /* Couldn't understand anything */
-  func (stream, "%02x\t\t*unknown*", buffer[0]);
+  /* Couldn't understand anything.  */
+  /* xgettext:c-format */
+  func (stream, _("%02x\t\t*unknown*"), buffer[0]);
   return 1;
-
 }