FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* hppa-tdep.c (push_dummy_frame): Refine code to determine what

Browse source 
space ID to place in the stack & inf_status structure.
	(hppa_pop_frame): Don't walk through trampoline code if popping a
	call dummy frame.
	(hppa_fix_call_dummy): Call the stack dummy directly if the
	current PC is in a shared library.
This commit is contained in:
Jeff Law 1994-12-28 21:55:21 +00:00
parent 4a9c666ec2
commit 244f7460fb
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,5 +1,12 @@
Wed Dec 28 12:21:39 1994 Jeff Law (law@snake.cs.utah.edu) Wed Dec 28 12:21:39 1994 Jeff Law (law@snake.cs.utah.edu)
* hppa-tdep.c (push_dummy_frame): Refine code to determine what
space ID to place in the stack & inf_status structure.
(hppa_pop_frame): Don't walk through trampoline code if popping a
call dummy frame.
(hppa_fix_call_dummy): Call the stack dummy directly if the
current PC is in a shared library.
* hppa-tdep.c (push_dummy_frame): Return type is void. Clear * hppa-tdep.c (push_dummy_frame): Return type is void. Clear
in_syscall bit in flags. Don't depend on the PC queue registers in_syscall bit in flags. Don't depend on the PC queue registers
when in_syscall is set, they're not valid. when in_syscall is set, they're not valid.

21
gdb/hppa-tdep.c
View file

@ -1101,13 +1101,18 @@ push_dummy_frame (inf_status)
int_buffer = read_register (FLAGS_REGNUM); int_buffer = read_register (FLAGS_REGNUM);
if (int_buffer & 0x2) if (int_buffer & 0x2)
{ {
unsigned int sid;
int_buffer &= ~0x2; int_buffer &= ~0x2;
memcpy (inf_status->registers, &int_buffer, 4); memcpy (inf_status->registers, &int_buffer, 4);
memcpy (inf_status->registers + REGISTER_BYTE (PCOQ_HEAD_REGNUM), &pc, 4); memcpy (inf_status->registers + REGISTER_BYTE (PCOQ_HEAD_REGNUM), &pc, 4);
pc += 4; pc += 4;
memcpy (inf_status->registers + REGISTER_BYTE (PCOQ_TAIL_REGNUM), &pc, 4); memcpy (inf_status->registers + REGISTER_BYTE (PCOQ_TAIL_REGNUM), &pc, 4);
pc -= 4; pc -= 4;
sid = (pc >> 30) & 0x3;
if (sid == 0)
pcspace = read_register (SR4_REGNUM); pcspace = read_register (SR4_REGNUM);
else
pcspace = read_register (SR4_REGNUM + 4 + sid);
memcpy (inf_status->registers + REGISTER_BYTE (PCSQ_HEAD_REGNUM), memcpy (inf_status->registers + REGISTER_BYTE (PCSQ_HEAD_REGNUM),
&pcspace, 4); &pcspace, 4);
memcpy (inf_status->registers + REGISTER_BYTE (PCSQ_TAIL_REGNUM), memcpy (inf_status->registers + REGISTER_BYTE (PCSQ_TAIL_REGNUM),
@ -1241,9 +1246,11 @@ hppa_pop_frame ()
we want to restart the inferior and run it through the trampoline. we want to restart the inferior and run it through the trampoline.
Do this by setting a momentary breakpoint at the location the Do this by setting a momentary breakpoint at the location the
trampoline returns to. */ trampoline returns to.
Don't skip through the trampoline if we're popping a dummy frame. */
target_pc = SKIP_TRAMPOLINE_CODE (npc & ~0x3) & ~0x3; target_pc = SKIP_TRAMPOLINE_CODE (npc & ~0x3) & ~0x3;
if (target_pc) if (target_pc && !fsr.regs[IPSW_REGNUM])
{ {
struct symtab_and_line sal; struct symtab_and_line sal;
struct breakpoint *breakpoint; struct breakpoint *breakpoint;
@ -1491,9 +1498,17 @@ hppa_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p)
directly. $$dyncall is not needed as the kernel sets up the directly. $$dyncall is not needed as the kernel sets up the
space id registers properly based on the value in %r31. In space id registers properly based on the value in %r31. In
fact calling $$dyncall will not work because the value in %r22 fact calling $$dyncall will not work because the value in %r22
will be clobbered on the syscall exit path. */ will be clobbered on the syscall exit path.
Similarly if the current PC is in a shared library. Note however,
this scheme won't work if the shared library isn't mapped into
the same space as the stack. */
if (flags & 2) if (flags & 2)
return pc; return pc;
#ifndef GDB_TARGET_IS_PA_ELF
else if (som_solib_get_got_by_pc (target_read_pc (inferior_pid)))
return pc;
#endif
else else
return dyncall_addr; return dyncall_addr;