Fix disassembly of arm-elf instructions with relocs associated with them.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0bea23d3912ad0f7e998e6723bb80aca204c060a..0f5fecf04ce555bf1da36df2fda6fc5ec9a8f8ee 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-09  Nick Clifton  <nickc@redhat.com>
+
+       * arm-dis.c (print_insn): Set pc to zero for instructions with
+       a reloc associated with them.
+
 2001-01-09  Jeff Johnston  <jjohnstn@redhat.com>
 
        * cgen-asm.in (parse_insn_normal): Changed syn to be

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 262406bd23db2a28c7d0ba89ecb2e3d467e80464..686b18a1a919dd83e0e505fd4aa45d7882025f88 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -1043,6 +1043,14 @@ print_insn (pc, info, little)
        given = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
     }
   
+  if (info->flags & INSN_HAS_RELOC)
+    /* If the instruction has a reloc associated with it, then
+       the offset field in the instruction will actually be the
+       addend for the reloc.  (We are using REL type relocs).
+       In such cases, we can ignore the pc when computing
+       addresses, since the addend is not currently pc-relative.  */
+    pc = 0;
+  
   if (is_thumb)
     status = print_insn_thumb (pc, info, given);
   else

diff --git a/opcodes/po/opcodes.pot b/opcodes/po/opcodes.pot
index 6bc8d82609910b13076315d578fcd42b75a87e0b..f2868722c13feda6fe99e3c2e901f240595f5abb 100644 (file)
--- a/opcodes/po/opcodes.pot
+++ b/opcodes/po/opcodes.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-16 13:55-0800\n"
+"POT-Creation-Date: 2001-01-09 12:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgstr ""
 msgid "Unrecognised disassembler option: %s\n"
 msgstr ""
 
-#: arm-dis.c:1075
+#: arm-dis.c:1083
 msgid ""
 "\n"
 "The following ARM specific disassembler options are supported for use with\n"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "%02x\t\t*unknown*"
 msgstr ""
 
-#: i386-dis.c:1949
+#: i386-dis.c:2624
 msgid "<internal disassembler error>"
 msgstr ""