From ce1f96de2eb40b231d2c8a1e50f64f5000b7cde8 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 20 Jul 2007 15:31:56 +0000 Subject: [PATCH] * mips-tdep.c (mips_next_pc): Use is_mips16_addr() instead of a direct test. --- gdb/ChangeLog | 5 +++++ gdb/mips-tdep.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 475f380..aaac11d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-07-20 Maciej W. Rozycki + + * mips-tdep.c (mips_next_pc): Use is_mips16_addr() instead of + a direct test. + 2007-07-20 Chris Dearman Maciej W. Rozycki diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 751945e..b4153fd 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -1435,11 +1435,11 @@ mips16_next_pc (struct frame_info *frame, CORE_ADDR pc) target monitor or stub is not developed enough to do a single_step. It works by decoding the current instruction and predicting where a branch will go. This isnt hard because all the data is available. - The MIPS32 and MIPS16 variants are quite different */ + The MIPS32 and MIPS16 variants are quite different. */ static CORE_ADDR mips_next_pc (struct frame_info *frame, CORE_ADDR pc) { - if (pc & 0x01) + if (is_mips16_addr (pc)) return mips16_next_pc (frame, pc); else return mips32_next_pc (frame, pc); -- 2.7.4