* mips-tdep.c (mips_next_pc): Use is_mips16_addr() instead of

a direct test.
This commit is contained in:
Maciej W. Rozycki
2007-07-20 15:31:56 +00:00
parent bcf1ea1e61
commit ce1f96de2e
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2007-07-20 Maciej W. Rozycki <macro@mips.com>
* mips-tdep.c (mips_next_pc): Use is_mips16_addr() instead of
a direct test.
2007-07-20 Chris Dearman <chris@mips.com> 2007-07-20 Chris Dearman <chris@mips.com>
Maciej W. Rozycki <macro@mips.com> Maciej W. Rozycki <macro@mips.com>

View File

@ -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. target monitor or stub is not developed enough to do a single_step.
It works by decoding the current instruction and predicting where a It works by decoding the current instruction and predicting where a
branch will go. This isnt hard because all the data is available. 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 static CORE_ADDR
mips_next_pc (struct frame_info *frame, CORE_ADDR pc) mips_next_pc (struct frame_info *frame, CORE_ADDR pc)
{ {
if (pc & 0x01) if (is_mips16_addr (pc))
return mips16_next_pc (frame, pc); return mips16_next_pc (frame, pc);
else else
return mips32_next_pc (frame, pc); return mips32_next_pc (frame, pc);