* mips-tdep.c (fetch_mips_16): Use unmake_compact_addr.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0919016..0774a13 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-26  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * mips-tdep.c (fetch_mips_16): Use unmake_compact_addr.
+
 2013-06-26  Dmitry Kozlov <ddk@codesourcery.com>
 
        * tracepoint.c (trace_save): Extend tsave to save starttime, stoptime.

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 74f27bc..3993f92 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -2042,7 +2042,8 @@ fetch_mips_16 (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   gdb_byte buf[8];
-  pc &= 0xfffffffe;            /* Clear the low order bit.  */
+
+  pc = unmake_compact_addr (pc);       /* Clear the low order bit.  */
   target_read_memory (pc, buf, 2);
   return extract_unsigned_integer (buf, 2, byte_order);
 }