Oops! Retract last change. Didn't mean to pollute things with energize just

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

diff --git a/gdb/am29k-pinsn.c b/gdb/am29k-pinsn.c
index 1e09a14ade01899aaf2aa9b52a215eb7b431f0ba..337bf90c34bcc630e1fadc5006b94ea9045b7d31 100644 (file)
--- a/gdb/am29k-pinsn.c
+++ b/gdb/am29k-pinsn.c
@@ -18,11 +18,9 @@ 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.  */
 
-#include <stdio.h>
-
 #include "defs.h"
 #include "target.h"
-#include "am29k-opcode.h"
+#include "opcode/a29k.h"
 
 /* Print a symbolic representation of a general-purpose
    register number NUM on STREAM.
@@ -129,18 +127,24 @@ print_insn (memaddr, stream)
   /* The four bytes of the instruction.  */
   unsigned char insn24, insn16, insn8, insn0;
 
-  struct am29k_opcode *opcode;
+  struct a29k_opcode *opcode;
 
   read_memory (memaddr, &insn[0], 4);
 
   find_bytes (insn, &insn0, &insn8, &insn16, &insn24);
 
+  /* Handle the nop (aseq 0x40,gr1,gr1) specially */
+  if ((insn24==0x70) && (insn16==0x40) && (insn8==0x01) && (insn0==0x01)) {
+    fprintf_filtered (stream,"nop");
+    return 4;
+  }
+
   /* The opcode is always in insn24.  */
-  for (opcode = &am29k_opcodes[0];
-       opcode < &am29k_opcodes[NUM_OPCODES];
+  for (opcode = &a29k_opcodes[0];
+       opcode < &a29k_opcodes[num_opcodes];
        ++opcode)
     {
-      if (insn24 == opcode->opcode)
+      if ((insn24<<24) == opcode->opcode)
        {
          char *s;
          
@@ -203,7 +207,7 @@ print_insn (memaddr, stream)
                  break;
 
                case 'v':
-                 fprintf_filtered (stream, "%#x", insn16);
+                 fprintf_filtered (stream, "0x%x", insn16);
                  break;
 
                case 's':
@@ -227,11 +231,11 @@ print_insn (memaddr, stream)
                  break;
 
                case 'F':
-                 fprintf_filtered (stream, "%d", (insn0 >> 18) & 15);
+                 fprintf_filtered (stream, "%d", (insn16 >> 2) & 15);
                  break;
 
                case 'C':
-                 fprintf_filtered (stream, "%d", (insn0 >> 16) & 3);
+                 fprintf_filtered (stream, "%d", insn16 & 3);
                  break;
 
                default:
@@ -290,7 +294,7 @@ print_insn (memaddr, stream)
          return 4;
        }
     }
-  fprintf_filtered (stream, ".word %#8x",
+  fprintf_filtered (stream, ".word 0x%8x",
                    (insn24 << 24) + (insn16 << 16) + (insn8 << 8) + insn0);
   return 4;
 }