Thu Nov 12 19:21:57 1998 Dave Brolley <brolley@cygnus.com>

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

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index cd8c0ba3d98e3b214f1b2d14b8f4ac5ff79890d9..3e4e002f1c2465e63bb7a006439eb6abc0a08a8f 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -26,11 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libcoff.h"
 #include "opintl.h"
 
-/* start-sanitize-armelf */
 /* FIXME: This shouldn't be done here */
 #include "elf-bfd.h"
 #include "elf/internal.h"
-/* end-sanitize-armelf */
 
 static char *arm_conditional[] =
 {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
@@ -724,9 +722,7 @@ print_insn_big_arm (pc, info)
   long               given;
   int                status;
   coff_symbol_type   *cs;
-/* start-sanitize-armelf */
   elf_symbol_type    *es;
-/* end-sanitize-armelf */
   int                is_thumb;
   
   is_thumb = false;
@@ -734,25 +730,20 @@ print_insn_big_arm (pc, info)
     {
     if (bfd_asymbol_flavour (*info->symbols) == bfd_target_coff_flavour)
      {
-     cs = coffsymbol (*info->symbols);
-     is_thumb = (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);
+       cs = coffsymbol (*info->symbols);
+       is_thumb = (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);
   
      }
-/* start-sanitize-armelf */
     else if (bfd_asymbol_flavour (*info->symbols) == bfd_target_elf_flavour)
      {
-     es = *(elf_symbol_type **)(info->symbols);
-     is_thumb = (es->internal_elf_sym.st_other == C_THUMBEXT
-                 || es->internal_elf_sym.st_other == C_THUMBSTAT
-                 || es->internal_elf_sym.st_other == C_THUMBLABEL
-                 || es->internal_elf_sym.st_other == C_THUMBEXTFUNC
-                 || es->internal_elf_sym.st_other == C_THUMBSTATFUNC);
+       es = *(elf_symbol_type **)(info->symbols);
+       is_thumb = ELF_ST_TYPE (es->internal_elf_sym.st_info) ==
+        STT_ARM_TFUNC;
       }
-/* end-sanitize-armelf */
    }
 
   info->bytes_per_chunk = 4;
@@ -813,9 +804,7 @@ print_insn_little_arm (pc, info)
   long               given;
   int                status;
   coff_symbol_type   *cs;
-/* start-sanitize-armelf */
   elf_symbol_type    *es;
-/* end-sanitize-armelf */
   int                is_thumb;
 
   is_thumb = false;
@@ -823,27 +812,21 @@ print_insn_little_arm (pc, info)
     {
     if (bfd_asymbol_flavour (*info->symbols) == bfd_target_coff_flavour)
      {
-     cs = coffsymbol (*info->symbols);
-     is_thumb = (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);
+       cs = coffsymbol (*info->symbols);
+       is_thumb = (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);
   
      }
-/* start-sanitize-armelf */
     else if (bfd_asymbol_flavour (*info->symbols) == bfd_target_elf_flavour)
      {
-     es = *(elf_symbol_type **)(info->symbols);
-     is_thumb = (es->internal_elf_sym.st_other == C_THUMBEXT
-                 || es->internal_elf_sym.st_other == C_THUMBSTAT
-                 || es->internal_elf_sym.st_other == C_THUMBLABEL
-                 || es->internal_elf_sym.st_other == C_THUMBEXTFUNC
-                 || es->internal_elf_sym.st_other == C_THUMBSTATFUNC);
+       es = *(elf_symbol_type **)(info->symbols);
+       is_thumb = ELF_ST_TYPE (es->internal_elf_sym.st_info) ==
+        STT_ARM_TFUNC;
       }
-/* end-sanitize-armelf */
    }
-  
 
   info->bytes_per_chunk = 4;
   info->display_endian = BFD_ENDIAN_LITTLE;