OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* mips-tdep.c (mips_skip_mips16_trampoline_code): Sign-extend 

address chunks retrieved from decoded lui/addiu pairs.
This commit is contained in:
Maciej W. Rozycki 2011-12-08 19:03:24 +00:00
parent 4c2051c6c9
commit 280711e76c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-08 Maciej W. Rozycki <macro@mips.com>
Maciej W. Rozycki <macro@codesourcery.com>
* mips-tdep.c (mips_skip_mips16_trampoline_code): Sign-extend
address chunks retrieved from decoded lui/addiu pairs.
2011-12-08 Maciej W. Rozycki <macro@codesourcery.com> 2011-12-08 Maciej W. Rozycki <macro@codesourcery.com>
* mips-tdep.c (extended_offset): Correct calculation. * mips-tdep.c (extended_offset): Correct calculation.

11
gdb/mips-tdep.c
View File

@ -5356,7 +5356,6 @@ mips_skip_mips16_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
address from those two instructions. */ address from those two instructions. */
CORE_ADDR target_pc = get_frame_register_signed (frame, 2); CORE_ADDR target_pc = get_frame_register_signed (frame, 2);
ULONGEST inst;
int i; int i;
/* See if the name of the target function is __fn_stub_*. */ /* See if the name of the target function is __fn_stub_*. */
@ -5373,11 +5372,15 @@ mips_skip_mips16_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
instructions. FIXME. */ instructions. FIXME. */
for (i = 0, pc = 0; i < 20; i++, target_pc += MIPS_INSN32_SIZE) for (i = 0, pc = 0; i < 20; i++, target_pc += MIPS_INSN32_SIZE)
{ {
inst = mips_fetch_instruction (gdbarch, target_pc); ULONGEST inst = mips_fetch_instruction (gdbarch, target_pc);
CORE_ADDR addr = inst;
if ((inst & 0xffff0000) == 0x3c010000) /* lui $at */ if ((inst & 0xffff0000) == 0x3c010000) /* lui $at */
pc = (inst << 16) & 0xffff0000; /* high word */ pc = (((addr & 0xffff) ^ 0x8000) - 0x8000) << 16;
/* high word */
else if ((inst & 0xffff0000) == 0x24210000) /* addiu $at */ else if ((inst & 0xffff0000) == 0x24210000) /* addiu $at */
return pc | (inst & 0xffff); /* low word */ return pc + ((addr & 0xffff) ^ 0x8000) - 0x8000;
/* low word */
} }
/* Couldn't find the lui/addui pair, so return stub address. */ /* Couldn't find the lui/addui pair, so return stub address. */