Changeset 609 for branches/GNU/src/binutils/opcodes/avr-dis.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/opcodes/avr-dis.c (modified) (5 diffs, 1 prop)

branches/GNU/src/binutils/opcodes/avr-dis.c

@@ -22 +22 @@
 #include "dis-asm.h"
 #include "opintl.h"
-
+#include "libiberty.h"
 
 struct avr_opcodes_s
@@ -32 +32 @@
   int isa;
   unsigned int bin_opcode;
-  unsigned int bin_mask;
 };
 
 #define AVR_INSN(NAME, CONSTR, OPCODE, SIZE, ISA, BIN) \
-{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN, 0},
-
-struct avr_opcodes_s avr_opcodes[] =
+{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN},
+
+const struct avr_opcodes_s avr_opcodes[] =
 {
   #include "opcode/avr.h"
-  {NULL, NULL, NULL, 0, 0, 0, 0}
+  {NULL, NULL, NULL, 0, 0, 0}
 };
 
@@ -258 +257 @@
 {
   unsigned int insn, insn2;
-  struct avr_opcodes_s *opcode;
+  const struct avr_opcodes_s *opcode;
+  static unsigned int *maskptr;
   void *stream = info->stream;
   fprintf_ftype prin = info->fprintf_func;
+  static unsigned int *avr_bin_masks;
   static int initialized;
   int cmd_len = 2;
@@ -268 +269 @@
   if (!initialized)
     {
-      initialized = 1;
-      
-      for (opcode = avr_opcodes; opcode->name; opcode++)
+      unsigned int nopcodes;
+
+      nopcodes = sizeof (avr_opcodes) / sizeof (struct avr_opcodes_s);
+      
+      avr_bin_masks = (unsigned int *)
+        xmalloc (nopcodes * sizeof (unsigned int));
+
+      for (opcode = avr_opcodes, maskptr = avr_bin_masks;
+           opcode->name;
+           opcode++, maskptr++)
         {
           char * s;
@@ -285 +293 @@
           assert (s - opcode->opcode == 16);
           assert (opcode->bin_opcode == bin);
-          opcode->bin_mask = mask;
+          *maskptr = mask;
         }
+
+      initialized = 1;
     }
 
   insn = avrdis_opcode (addr, info);
   
-  for (opcode = avr_opcodes; opcode->name; opcode++)
-    {
-      if ((insn & opcode->bin_mask) == opcode->bin_opcode)
+  for (opcode = avr_opcodes, maskptr = avr_bin_masks;
+       opcode->name;
+       opcode++, maskptr++)
+    {
+      if ((insn & *maskptr) == opcode->bin_opcode)
         break;
     }