Add support for displaying disassembled Thumb instrucitons.
authorNick Clifton <nickc@redhat.com>
Tue, 2 Dec 1997 18:20:31 +0000 (18:20 +0000)
committerNick Clifton <nickc@redhat.com>
Tue, 2 Dec 1997 18:20:31 +0000 (18:20 +0000)
opcodes/ChangeLog
opcodes/arm-dis.c [new file with mode: 0644]
opcodes/disassemble.c

index ec01364f952dbb95b6357d81e02de1d59eee3c47..1e206b8a206fa2e22729b8f31d920db1e8c4a050 100644 (file)
@@ -1,6 +1,12 @@
 Tue Dec  2 09:54:27 1997  Nick Clifton  <nickc@cygnus.com>
 
+       * arm-dis.c: Add support for disassembling Thumb opcodes.
+       (print_insn_thumb): New function.
+
+       * disassemble.c (disasm_symaddr): New function.
+
        * arm-opc.h: Display nop pseudo ops alongside equivalent disassembly.
+       (thumb_opcodes): Table of Thumb opcodes.
 
 Mon Dec  1 12:25:57 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
new file mode 100644 (file)
index 0000000..b6a3568
--- /dev/null
@@ -0,0 +1,803 @@
+/* Instruction printing code for the ARM
+   Copyright (C) 1994, 95, 96, 1997 Free Software Foundation, Inc. 
+   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+   Modification by James G. Smith (jsmith@cygnus.co.uk)
+
+This file is part of libopcodes. 
+
+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 the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version. 
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "dis-asm.h"
+#define DEFINE_TABLE
+#include "arm-opc.h"
+
+
+static char *arm_conditional[] =
+{"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
+ "hi", "ls", "ge", "lt", "gt", "le", "", "nv"};
+
+static char *arm_regnames[] =
+{"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
+ "r8", "r9", "sl", "fp", "ip", "sp", "lr", "pc"};
+
+static char *arm_fp_const[] =
+{"0.0", "1.0", "2.0", "3.0", "4.0", "5.0", "0.5", "10.0"};
+
+static char *arm_shift[] = 
+{"lsl", "lsr", "asr", "ror"};
+
+static int print_insn_arm PARAMS ((bfd_vma, struct disassemble_info *,
+                                  long));
+
+static void
+arm_decode_shift (given, func, stream)
+     long given;
+     fprintf_ftype func;
+     void *stream;
+{
+  func (stream, "%s", arm_regnames[given & 0xf]);
+  if ((given & 0xff0) != 0)
+    {
+      if ((given & 0x10) == 0)
+       {
+         int amount = (given & 0xf80) >> 7;
+         int shift = (given & 0x60) >> 5;
+         if (amount == 0)
+           {
+             if (shift == 3)
+               {
+                 func (stream, ", rrx");
+                 return;
+               }
+             amount = 32;
+           }
+         func (stream, ", %s #%d", arm_shift[shift], amount);
+       }
+      else
+       func (stream, ", %s %s", arm_shift[(given & 0x60) >> 5],
+             arm_regnames[(given & 0xf00) >> 8]);
+    }
+}
+
+/* Print one instruction from PC on INFO->STREAM.
+   Return the size of the instruction (always 4 on ARM). */
+
+static int
+print_insn_arm (pc, info, given)
+     bfd_vma         pc;
+     struct disassemble_info *info;
+     long given;
+{
+  struct arm_opcode *insn;
+  void *stream = info->stream;
+  fprintf_ftype func = info->fprintf_func;
+
+  for (insn = arm_opcodes; insn->assembler; insn++)
+    {
+      if ((given & insn->mask) == insn->value)
+       {
+         char *c;
+         for (c = insn->assembler; *c; c++)
+           {
+             if (*c == '%')
+               {
+                 switch (*++c)
+                   {
+                   case '%':
+                     func (stream, "%%");
+                     break;
+
+                   case 'a':
+                     if (((given & 0x000f0000) == 0x000f0000)
+                         && ((given & 0x02000000) == 0))
+                       {
+                         int offset = given & 0xfff;
+                         if ((given & 0x00800000) == 0)
+                           offset = -offset;
+                         (*info->print_address_func)
+                           (offset + pc + 8, info);
+                       }
+                     else
+                       {
+                         func (stream, "[%s", 
+                               arm_regnames[(given >> 16) & 0xf]);
+                         if ((given & 0x01000000) != 0)
+                           {
+                             if ((given & 0x02000000) == 0)
+                               {
+                                 int offset = given & 0xfff;
+                                 if (offset)
+                                   func (stream, ", %s#%d",
+                                         (((given & 0x00800000) == 0)
+                                          ? "-" : ""), offset);
+                               }
+                             else
+                               {
+                                 func (stream, ", %s",
+                                       (((given & 0x00800000) == 0)
+                                        ? "-" : ""));
+                                 arm_decode_shift (given, func, stream);
+                               }
+
+                             func (stream, "]%s", 
+                                   ((given & 0x00200000) != 0) ? "!" : "");
+                           }
+                         else
+                           {
+                             if ((given & 0x02000000) == 0)
+                               {
+                                 int offset = given & 0xfff;
+                                 if (offset)
+                                   func (stream, "], %s#%d",
+                                         (((given & 0x00800000) == 0)
+                                          ? "-" : ""), offset);
+                                 else 
+                                   func (stream, "]");
+                               }
+                             else
+                               {
+                                 func (stream, "], %s",
+                                       (((given & 0x00800000) == 0) 
+                                        ? "-" : ""));
+                                 arm_decode_shift (given, func, stream);
+                               }
+                           }
+                       }
+                     break;
+
+                   case 's':
+                      if ((given & 0x004f0000) == 0x004f0000)
+                       {
+                          /* PC relative with immediate offset */
+                         int offset = ((given & 0xf00) >> 4) | (given & 0xf);
+                         if ((given & 0x00800000) == 0)
+                           offset = -offset;
+                         (*info->print_address_func)
+                           (offset + pc + 8, info);
+                       }
+                     else
+                       {
+                         func (stream, "[%s", 
+                               arm_regnames[(given >> 16) & 0xf]);
+                         if ((given & 0x01000000) != 0)
+                           {
+                              /* pre-indexed */
+                             if ((given & 0x00400000) == 0x00400000)
+                               {
+                                  /* immediate */
+                                  int offset = ((given & 0xf00) >> 4) | (given & 0xf);
+                                 if (offset)
+                                   func (stream, ", %s#%d",
+                                         (((given & 0x00800000) == 0)
+                                          ? "-" : ""), offset);
+                               }
+                             else
+                               {
+                                  /* register */
+                                 func (stream, ", %s%s",
+                                       (((given & 0x00800000) == 0)
+                                        ? "-" : ""),
+                                        arm_regnames[given & 0xf]);
+                               }
+
+                             func (stream, "]%s", 
+                                   ((given & 0x00200000) != 0) ? "!" : "");
+                           }
+                         else
+                           {
+                              /* post-indexed */
+                             if ((given & 0x00400000) == 0x00400000)
+                               {
+                                  /* immediate */
+                                  int offset = ((given & 0xf00) >> 4) | (given & 0xf);
+                                 if (offset)
+                                   func (stream, "], %s#%d",
+                                         (((given & 0x00800000) == 0)
+                                          ? "-" : ""), offset);
+                                 else 
+                                   func (stream, "]");
+                               }
+                             else
+                               {
+                                  /* register */
+                                 func (stream, "], %s%s",
+                                       (((given & 0x00800000) == 0)
+                                        ? "-" : ""),
+                                        arm_regnames[given & 0xf]);
+                               }
+                           }
+                       }
+                     break;
+                         
+                   case 'b':
+                     (*info->print_address_func)
+                       (BDISP (given) * 4 + pc + 8, info);
+                     break;
+
+                   case 'c':
+                     func (stream, "%s",
+                           arm_conditional [(given >> 28) & 0xf]);
+                     break;
+
+                   case 'm':
+                     {
+                       int started = 0;
+                       int reg;
+
+                       func (stream, "{");
+                       for (reg = 0; reg < 16; reg++)
+                         if ((given & (1 << reg)) != 0)
+                           {
+                             if (started)
+                               func (stream, ", ");
+                             started = 1;
+                             func (stream, "%s", arm_regnames[reg]);
+                           }
+                       func (stream, "}");
+                     }
+                     break;
+
+                   case 'o':
+                     if ((given & 0x02000000) != 0)
+                       {
+                         int rotate = (given & 0xf00) >> 7;
+                         int immed = (given & 0xff);
+                         func (stream, "#%d",
+                               ((immed << (32 - rotate))
+                                | (immed >> rotate)) & 0xffffffff);
+                       }
+                     else
+                       arm_decode_shift (given, func, stream);
+                     break;
+
+                   case 'p':
+                     if ((given & 0x0000f000) == 0x0000f000)
+                       func (stream, "p");
+                     break;
+
+                   case 't':
+                     if ((given & 0x01200000) == 0x00200000)
+                       func (stream, "t");
+                     break;
+
+                   case 'h':
+                     if ((given & 0x00000020) == 0x00000020)
+                       func (stream, "h");
+                      else
+                        func (stream, "b");
+                     break;
+
+                   case 'A':
+                     func (stream, "[%s", arm_regnames [(given >> 16) & 0xf]);
+                     if ((given & 0x01000000) != 0)
+                       {
+                         int offset = given & 0xff;
+                         if (offset)
+                           func (stream, ", %s#%d]%s",
+                                 ((given & 0x00800000) == 0 ? "-" : ""),
+                                 offset * 4,
+                                 ((given & 0x00200000) != 0 ? "!" : ""));
+                         else
+                           func (stream, "]");
+                       }
+                     else
+                       {
+                         int offset = given & 0xff;
+                         if (offset)
+                           func (stream, "], %s#%d",
+                                 ((given & 0x00800000) == 0 ? "-" : ""),
+                                 offset * 4);
+                         else
+                           func (stream, "]");
+                       }
+                     break;
+
+                   case 'C':
+                     switch (given & 0x00090000)
+                       {
+                       case 0:
+                         func (stream, "_???");
+                         break;
+                       case 0x10000:
+                         func (stream, "_ctl");
+                         break;
+                       case 0x80000:
+                         func (stream, "_flg");
+                         break;
+                       }
+                     break;
+
+                   case 'F':
+                     switch (given & 0x00408000)
+                       {
+                       case 0:
+                         func (stream, "4");
+                         break;
+                       case 0x8000:
+                         func (stream, "1");
+                         break;
+                       case 0x00400000:
+                         func (stream, "2");
+                         break;
+                       default:
+                         func (stream, "3");
+                       }
+                     break;
+                       
+                   case 'P':
+                     switch (given & 0x00080080)
+                       {
+                       case 0:
+                         func (stream, "s");
+                         break;
+                       case 0x80:
+                         func (stream, "d");
+                         break;
+                       case 0x00080000:
+                         func (stream, "e");
+                         break;
+                       default:
+                         func (stream, "<illegal precision>");
+                         break;
+                       }
+                     break;
+                   case 'Q':
+                     switch (given & 0x00408000)
+                       {
+                       case 0:
+                         func (stream, "s");
+                         break;
+                       case 0x8000:
+                         func (stream, "d");
+                         break;
+                       case 0x00400000:
+                         func (stream, "e");
+                         break;
+                       default:
+                         func (stream, "p");
+                         break;
+                       }
+                     break;
+                   case 'R':
+                     switch (given & 0x60)
+                       {
+                       case 0:
+                         break;
+                       case 0x20:
+                         func (stream, "p");
+                         break;
+                       case 0x40:
+                         func (stream, "m");
+                         break;
+                       default:
+                         func (stream, "z");
+                         break;
+                       }
+                     break;
+
+                   case '0': case '1': case '2': case '3': case '4': 
+                   case '5': case '6': case '7': case '8': case '9':
+                     {
+                       int bitstart = *c++ - '0';
+                       int bitend = 0;
+                       while (*c >= '0' && *c <= '9')
+                         bitstart = (bitstart * 10) + *c++ - '0';
+
+                       switch (*c)
+                         {
+                         case '-':
+                           c++;
+                           while (*c >= '0' && *c <= '9')
+                             bitend = (bitend * 10) + *c++ - '0';
+                           if (!bitend)
+                             abort ();
+                           switch (*c)
+                             {
+                             case 'r':
+                               {
+                                 long reg;
+                                 reg = given >> bitstart;
+                                 reg &= (2 << (bitend - bitstart)) - 1;
+                                 func (stream, "%s", arm_regnames[reg]);
+                               }
+                               break;
+                             case 'd':
+                               {
+                                 long reg;
+                                 reg = given >> bitstart;
+                                 reg &= (2 << (bitend - bitstart)) - 1;
+                                 func (stream, "%d", reg);
+                               }
+                               break;
+                             case 'x':
+                               {
+                                 long reg;
+                                 reg = given >> bitstart;
+                                 reg &= (2 << (bitend - bitstart)) - 1;
+                                 func (stream, "0x%08x", reg);
+                               }
+                               break;
+                             case 'f':
+                               {
+                                 long reg;
+                                 reg = given >> bitstart;
+                                 reg &= (2 << (bitend - bitstart)) - 1;
+                                 if (reg > 7)
+                                   func (stream, "#%s",
+                                         arm_fp_const[reg & 7]);
+                                 else
+                                   func (stream, "f%d", reg);
+                               }
+                               break;
+                             default:
+                               abort ();
+                             }
+                           break;
+                         case '`':
+                           c++;
+                           if ((given & (1 << bitstart)) == 0)
+                             func (stream, "%c", *c);
+                           break;
+                         case '\'':
+                           c++;
+                           if ((given & (1 << bitstart)) != 0)
+                             func (stream, "%c", *c);
+                           break;
+                         case '?':
+                           ++c;
+                           if ((given & (1 << bitstart)) != 0)
+                             func (stream, "%c", *c++);
+                           else
+                             func (stream, "%c", *++c);
+                           break;
+                         default:
+                           abort ();
+                         }
+                       break;
+
+                     default:
+                       abort ();
+                     }
+                   }
+               }
+             else
+               func (stream, "%c", *c);
+           }
+         return 4;
+       }
+    }
+  abort ();
+}
+
+/* Print one instruction from PC on INFO->STREAM.
+   Return the size of the instruction. */
+
+static int
+print_insn_thumb (pc, info, given)
+     bfd_vma         pc;
+     struct disassemble_info *info;
+     long given;
+{
+  struct thumb_opcode *insn;
+  void *stream = info->stream;
+  fprintf_ftype func = info->fprintf_func;
+
+  for (insn = thumb_opcodes; insn->assembler; insn++)
+    {
+      if ((given & insn->mask) == insn->value)
+        {
+          char *c = insn->assembler;
+
+          /* Special processing for Thumb 2 instruction BL sequence: */
+          if (!*c) /* check for empty (not NULL) assembler string */
+            {
+             info->bytes_per_chunk = 4;
+             info->bytes_per_line  = 4;
+             
+              func (stream, "%04x\tbl\t", given & 0xffff);
+              (*info->print_address_func)
+                (BDISP23 (given) * 2 + pc + 4, info);
+              return 4;
+            }
+          else
+            {
+             info->bytes_per_chunk = 2;
+             info->bytes_per_line  = 4;
+                     
+              given &= 0xffff;
+              func (stream, "%04x\t", given);
+              for (; *c; c++)
+                {
+                  if (*c == '%')
+                    {
+                      int domaskpc = 0;
+                      int domasklr = 0;
+                      switch (*++c)
+                        {
+                        case '%':
+                          func (stream, "%%");
+                          break;
+
+                        case 'S':
+                          {
+                            long reg;
+                            reg = (given >> 3) & 0x7;
+                            if (given & (1 << 6))
+                              reg += 8;
+                            func (stream, "%s", arm_regnames[reg]);
+                          }
+                          break;
+
+                        case 'D':
+                          {
+                            long reg;
+                            reg = given & 0x7;
+                            if (given & (1 << 7))
+                             reg += 8;
+                            func (stream, "%s", arm_regnames[reg]);
+                          }
+                          break;
+
+                        case 'T':
+                          func (stream, "%s",
+                                arm_conditional [(given >> 8) & 0xf]);
+                          break;
+
+                        case 'N':
+                          if (given & (1 << 8))
+                            domasklr = 1;
+                          /* fall through */
+                        case 'O':
+                          if (*c == 'O' && (given & (1 << 8)))
+                            domaskpc = 1;
+                          /* fall through */
+                        case 'M':
+                          {
+                            int started = 0;
+                            int reg;
+                            func (stream, "{");
+                            /* It would be nice if we could spot
+                               ranges, and generate the rS-rE format: */
+                            for (reg = 0; (reg < 8); reg++)
+                              if ((given & (1 << reg)) != 0)
+                                {
+                                  if (started)
+                                    func (stream, ", ");
+                                  started = 1;
+                                  func (stream, "%s", arm_regnames[reg]);
+                                }
+
+                            if (domasklr)
+                              {
+                                if (started)
+                                  func (stream, ", ");
+                                started = 1;
+                                func (stream, "lr");
+                              }
+
+                            if (domaskpc)
+                              {
+                                if (started)
+                                  func (stream, ", ");
+                                func (stream, "pc");
+                              }
+
+                            func (stream, "}");
+                          }
+                          break;
+
+
+                        case '0': case '1': case '2': case '3': case '4': 
+                        case '5': case '6': case '7': case '8': case '9':
+                          {
+                            int bitstart = *c++ - '0';
+                            int bitend = 0;
+                            while (*c >= '0' && *c <= '9')
+                              bitstart = (bitstart * 10) + *c++ - '0';
+
+                            switch (*c)
+                              {
+                              case '-':
+                                {
+                                  long reg;
+                                  c++;
+                                  while (*c >= '0' && *c <= '9')
+                                    bitend = (bitend * 10) + *c++ - '0';
+                                  if (!bitend)
+                                    abort ();
+                                  reg = given >> bitstart;
+                                  reg &= (2 << (bitend - bitstart)) - 1;
+                                  switch (*c)
+                                    {
+                                    case 'r':
+                                      func (stream, "%s", arm_regnames[reg]);
+                                      break;
+
+                                    case 'd':
+                                      func (stream, "%d", reg);
+                                      break;
+
+                                    case 'H':
+                                      func (stream, "%d", reg << 1);
+                                      break;
+
+                                    case 'W':
+                                      func (stream, "%d", reg << 2);
+                                      break;
+
+                                    case 'a':
+                                      info->print_address_func (((pc + 4) & ~1) + (reg << 2), info);
+                                      break;
+
+                                    case 'x':
+                                      func (stream, "0x%04x", reg);
+                                      break;
+
+                                    case 'I':
+                                      reg = ((reg ^ (1 << bitend)) - (1 << bitend));
+                                      func (stream, "%d", reg);
+                                      break;
+
+                                    case 'B':
+                                      reg = ((reg ^ (1 << bitend)) - (1 << bitend));
+                                      (*info->print_address_func)
+                                        (reg * 2 + pc + 4, info);
+                                      break;
+
+                                    default:
+                                      abort();
+                                    }
+                                }
+                                break;
+
+                              case '\'':
+                                c++;
+                                if ((given & (1 << bitstart)) != 0)
+                                  func (stream, "%c", *c);
+                                break;
+
+                              case '?':
+                                ++c;
+                                if ((given & (1 << bitstart)) != 0)
+                                  func (stream, "%c", *c++);
+                                else
+                                  func (stream, "%c", *++c);
+                                break;
+
+                              default:
+                                 abort();
+                              }
+                          }
+                          break;
+
+                        default:
+                          abort ();
+                        }
+                    }
+                  else
+                    func (stream, "%c", *c);
+                }
+             }
+          return 2;
+       }
+    }
+
+  /* no match */
+  abort ();
+}
+
+/* NOTE: There are no checks in these routines that the relevant number of data bytes exist */
+
+int
+print_insn_big_arm (pc, info)
+     bfd_vma pc;
+     struct disassemble_info *info;
+{
+  unsigned char b[4];
+  long given;
+  int status;
+
+  info->bytes_per_chunk = 4;
+  info->display_endian = BFD_ENDIAN_BIG;
+
+  /* Always fetch word aligned values.  */
+  
+  status = (*info->read_memory_func) (pc & ~ 0x3, (bfd_byte *) &b[0], 4, info);
+  if (status != 0)
+    {
+      (*info->memory_error_func) (status, pc, info);
+      return -1;
+    }
+
+  if (info->flags & 0x1)
+    {
+      if (pc & 0x2)
+       {
+         given = (b[2] << 8) | b[3];
+
+         status = info->read_memory_func ((pc + 4) & ~ 0x3, (bfd_byte *) b, 4, info);
+         if (status != 0)
+           {
+             info->memory_error_func (status, pc + 4, info);
+             return -1;
+           }
+         
+         given |= (b[0] << 24) | (b[1] << 16);
+       }
+      else
+       {
+         given = (b[0] << 8) | b[1] | (b[2] << 24) | (b[3] << 16);
+       }
+    }
+  else
+    {
+      given = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
+    }
+
+  if (info->flags & 0x1)
+    {
+      status = print_insn_thumb (pc, info, given);
+      info->flags |= 1;                /* Stop displayed symbols from resetting the flag */
+    }
+  else
+    {
+      status = print_insn_arm (pc, info, given);
+      info->flags &= ~1;       /* Stop displayed symbols from resetting the flag */
+    }
+
+  return status;
+}
+
+int
+print_insn_little_arm (pc, info)
+     bfd_vma pc;
+     struct disassemble_info *info;
+{
+  unsigned char b[4];
+  long given;
+  int status;
+
+  info->bytes_per_chunk = 4;
+  info->display_endian = BFD_ENDIAN_LITTLE;
+
+  status = (*info->read_memory_func) (pc, (bfd_byte *) &b[0], 4, info);
+  if (status != 0 && (info->flags & 0x1))
+    {
+      info->bytes_per_chunk = 2;
+
+      status = info->read_memory_func (pc, (bfd_byte *) b, 2, info);
+      b[3] = b[2] = 0;
+    }
+  if (status != 0)
+    {
+      (*info->memory_error_func) (status, pc, info);
+      return -1;
+    }
+
+  given = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24);
+
+  if (info->flags & 0x1)
+    {
+      status = print_insn_thumb (pc, info, given);
+      info->flags |= 1;                /* Stop displayed symbols from resetting the flag */
+    }
+  else
+    {
+      status = print_insn_arm (pc, info, given);
+      info->flags &= ~1;       /* Stop displayed symbols from resetting the flag */
+    }
+
+  return status;
+}
index 5b48cba5ba4f0393315ba1eaebf7db2a6985982c..8bf16c68642a6886bdb2485976a9a36c1296b398 100644 (file)
@@ -1,5 +1,5 @@
 /* Select disassembly routine for specified architecture.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997 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
@@ -21,9 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifdef ARCH_all
 #define ARCH_a29k
 #define ARCH_alpha
-/* start-sanitize-arc */
 #define ARCH_arc
-/* end-sanitize-arc */
 #define ARCH_arm
 #define ARCH_d10v
 /* start-sanitize-d30v */
@@ -34,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ARCH_hppa
 #define ARCH_i386
 #define ARCH_i960
+#define ARCH_m32r
 #define ARCH_m68k
 #define ARCH_m88k
 #define ARCH_mips
@@ -47,9 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* start-sanitize-tic80 */
 #define ARCH_tic80
 /* end-sanitize-tic80 */
-/* start-sanitize-v850 */
 #define ARCH_v850
-/* end-sanitize-v850 */
 #define ARCH_w65
 #define ARCH_z8k
 #endif
@@ -76,7 +73,6 @@ disassembler (abfd)
       disassemble = print_insn_alpha;
       break;
 #endif
-/* start-sanitize-arc */
 #ifdef ARCH_arc
     case bfd_arch_arc:
       {
@@ -85,7 +81,6 @@ disassembler (abfd)
        break;
       }
 #endif
-/* end-sanitize-arc */
 #ifdef ARCH_arm
     case bfd_arch_arm:
       if (bfd_big_endian (abfd))
@@ -136,6 +131,11 @@ disassembler (abfd)
       disassemble = print_insn_i960;
       break;
 #endif
+#ifdef ARCH_m32r
+    case bfd_arch_m32r:
+      disassemble = print_insn_m32r;
+      break;
+#endif
 #ifdef ARCH_m68k
     case bfd_arch_m68k:
       disassemble = print_insn_m68k;
@@ -202,13 +202,11 @@ disassembler (abfd)
       break;
 #endif
 /* end-sanitize-tic80 */
-/* start-sanitize-v850 */
 #ifdef ARCH_v850
     case bfd_arch_v850:
       disassemble = print_insn_v850;
       break;
 #endif
-/* end-sanitize-v850 */
 #ifdef ARCH_w65
     case bfd_arch_w65:
       disassemble = print_insn_w65;
@@ -227,3 +225,34 @@ disassembler (abfd)
     }
   return disassemble;
 }
+
+/* Notify the disassembler of the address associated with the
+   instruction being decoded: */
+
+void
+disasm_symaddr (sym, info)
+     asymbol *sym;
+     disassemble_info *info;
+{
+#ifdef ARCH_arm
+  /* decide if symbol is thumb or not */
+  if (info->flavour == bfd_target_coff_flavour)
+    {
+/* This is not ideal including these here, since we may not be
+   building a COFF targetted world at all... so coffsymbol() may not
+   be available. (TO BE SORTED OUT) */
+#include "coff/internal.h"
+#include "libcoff.h"
+      coff_symbol_type *cs = coffsymbol (sym);
+      if (   cs->native->u.syment.n_sclass == C_THUMBEXT
+          || cs->native->u.syment.n_sclass == C_THUMBSTAT
+          || cs->native->u.syment.n_sclass == C_THUMBLABEL
+          || cs->native->u.syment.n_sclass == C_THUMBEXTFUNC
+          || cs->native->u.syment.n_sclass == C_THUMBSTATFUNC)
+       info->flags |= 0x1;
+      else
+       info->flags &= ~0x1;
+    }
+#endif
+  /* Do nothing for other architectures at the moment */
+}