b67a2c6fd4
This patch is to add ptid into dummy_frame and extend frame_id to dummy_frame_id (which has a ptid field). With this change, GDB uses dummy_frame_id (thread ptid and frame_id) to find the dummy frames. Currently, dummy frames are looked up by frame_id, which isn't accurate in non-stop or multi-process mode. The test case gdb.multi/dummy-frame-restore.exp shows the problem and this patch can fix it. Test dummy-frame-restore.exp makes two inferiors stop at different functions, say, inferior 1 stops at f1 while inferior 2 stops at f2. Set a breakpoint to a function, do the inferior call in two inferiors, and GDB has two dummy frames of the same frame_id. When the inferior call is finished, GDB will look up a dummy frame from its stack/list and restore the inferior's regcache. Two inferiors are finished in different orders, the inferiors' states are restored differently, which is wrong. Running dummy-frame-restore.exp under un-patched GDB, we'll get two fails: FAIL: gdb.multi/dummy-frame-restore.exp: inf 2 first: after infcall: bt in inferior 2 FAIL: gdb.multi/dummy-frame-restore.exp: inf 2 first: after infcall: bt in inferior 1 With this patch applied, GDB will choose the correct dummy_frame to restore for a given inferior, because ptid is considered when looking up dummy frames. Two fails above are fixed. Regression tested on x86_64-linux, both native and gdbserver. gdb: 2014-06-27 Yao Qi <yao@codesourcery.com> * breakpoint.c (check_longjmp_breakpoint_for_call_dummy): Change parameter type to 'struct thread_info *'. Caller updated. * breakpoint.h (check_longjmp_breakpoint_for_call_dummy): Update declaration. * dummy-frame.c (struct dummy_frame_id): New. (dummy_frame_id_eq): New function. (struct dummy_frame) <id>: Change its type to 'struct dummy_frame_id'. (dummy_frame_push): Add parameter ptid and save it in dummy_frame_id. (pop_dummy_frame_bpt): Use ptid of dummy_frame instead of inferior_ptid. (pop_dummy_frame): Assert that the ptid of dummy_frame equals to inferior_ptid. (lookup_dummy_frame): Change parameter type to 'struct dummy_frame_id *'. Callers updated. Call dummy_frame_id_eq instead of frame_id_eq. (dummy_frame_pop): Add parameter ptid. Callers updated. Update comments. Compose dummy_frame_id and pass it to lookup_dummy_frame. (dummy_frame_discard): Add parameter ptid. (dummy_frame_sniffer): Compose dummy_frame_id and call dummy_frame_id_eq instead of frame_id_eq. (fprint_dummy_frames): Print ptid. * dummy-frame.h: Remove comments. (dummy_frame_push): Add ptid in declaration. (dummy_frame_pop, dummy_frame_discard): Likewise. gdb/testsuite: 2014-06-27 Yao Qi <yao@codesourcery.com> * gdb.multi/dummy-frame-restore.exp: New. * gdb.multi/dummy-frame-restore.c: New. gdb/doc: 2014-06-27 Yao Qi <yao@codesourcery.com> * gdb.texinfo (Maintenance Commands): Update the output of 'maint print dummy-frames' command.
358 lines
9.9 KiB
C
358 lines
9.9 KiB
C
/* Code dealing with dummy stack frames, for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1986-2014 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#include "defs.h"
|
|
#include "dummy-frame.h"
|
|
#include "regcache.h"
|
|
#include "frame.h"
|
|
#include "inferior.h"
|
|
#include "gdb_assert.h"
|
|
#include "frame-unwind.h"
|
|
#include "command.h"
|
|
#include "gdbcmd.h"
|
|
#include <string.h>
|
|
#include "observer.h"
|
|
#include "gdbthread.h"
|
|
|
|
struct dummy_frame_id
|
|
{
|
|
/* This frame's ID. Must match the value returned by
|
|
gdbarch_dummy_id. */
|
|
struct frame_id id;
|
|
|
|
/* The thread this dummy_frame relates to. */
|
|
ptid_t ptid;
|
|
};
|
|
|
|
/* Return whether dummy_frame_id *ID1 and *ID2 are equal. */
|
|
|
|
static int
|
|
dummy_frame_id_eq (struct dummy_frame_id *id1,
|
|
struct dummy_frame_id *id2)
|
|
{
|
|
return frame_id_eq (id1->id, id2->id) && ptid_equal (id1->ptid, id2->ptid);
|
|
}
|
|
|
|
/* Dummy frame. This saves the processor state just prior to setting
|
|
up the inferior function call. Older targets save the registers
|
|
on the target stack (but that really slows down function calls). */
|
|
|
|
struct dummy_frame
|
|
{
|
|
struct dummy_frame *next;
|
|
|
|
/* An id represents a dummy frame. */
|
|
struct dummy_frame_id id;
|
|
|
|
/* The caller's state prior to the call. */
|
|
struct infcall_suspend_state *caller_state;
|
|
};
|
|
|
|
static struct dummy_frame *dummy_frame_stack = NULL;
|
|
|
|
/* Push the caller's state, along with the dummy frame info, onto the
|
|
dummy-frame stack. */
|
|
|
|
void
|
|
dummy_frame_push (struct infcall_suspend_state *caller_state,
|
|
const struct frame_id *dummy_id, ptid_t ptid)
|
|
{
|
|
struct dummy_frame *dummy_frame;
|
|
|
|
dummy_frame = XCNEW (struct dummy_frame);
|
|
dummy_frame->caller_state = caller_state;
|
|
dummy_frame->id.id = (*dummy_id);
|
|
dummy_frame->id.ptid = ptid;
|
|
dummy_frame->next = dummy_frame_stack;
|
|
dummy_frame_stack = dummy_frame;
|
|
}
|
|
|
|
/* Remove *DUMMY_PTR from the dummy frame stack. */
|
|
|
|
static void
|
|
remove_dummy_frame (struct dummy_frame **dummy_ptr)
|
|
{
|
|
struct dummy_frame *dummy = *dummy_ptr;
|
|
|
|
*dummy_ptr = dummy->next;
|
|
discard_infcall_suspend_state (dummy->caller_state);
|
|
xfree (dummy);
|
|
}
|
|
|
|
/* Delete any breakpoint B which is a momentary breakpoint for return from
|
|
inferior call matching DUMMY_VOIDP. */
|
|
|
|
static int
|
|
pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp)
|
|
{
|
|
struct dummy_frame *dummy = dummy_voidp;
|
|
|
|
if (b->thread == pid_to_thread_id (dummy->id.ptid)
|
|
&& b->disposition == disp_del && frame_id_eq (b->frame_id, dummy->id.id))
|
|
{
|
|
while (b->related_breakpoint != b)
|
|
delete_breakpoint (b->related_breakpoint);
|
|
|
|
delete_breakpoint (b);
|
|
|
|
/* Stop the traversal. */
|
|
return 1;
|
|
}
|
|
|
|
/* Continue the traversal. */
|
|
return 0;
|
|
}
|
|
|
|
/* Pop *DUMMY_PTR, restoring program state to that before the
|
|
frame was created. */
|
|
|
|
static void
|
|
pop_dummy_frame (struct dummy_frame **dummy_ptr)
|
|
{
|
|
struct dummy_frame *dummy = *dummy_ptr;
|
|
|
|
gdb_assert (ptid_equal (dummy->id.ptid, inferior_ptid));
|
|
restore_infcall_suspend_state (dummy->caller_state);
|
|
|
|
iterate_over_breakpoints (pop_dummy_frame_bpt, dummy);
|
|
|
|
/* restore_infcall_control_state frees inf_state,
|
|
all that remains is to pop *dummy_ptr. */
|
|
*dummy_ptr = dummy->next;
|
|
xfree (dummy);
|
|
|
|
/* We've made right mess of GDB's local state, just discard
|
|
everything. */
|
|
reinit_frame_cache ();
|
|
}
|
|
|
|
/* Look up DUMMY_ID.
|
|
Return NULL if not found. */
|
|
|
|
static struct dummy_frame **
|
|
lookup_dummy_frame (struct dummy_frame_id *dummy_id)
|
|
{
|
|
struct dummy_frame **dp;
|
|
|
|
for (dp = &dummy_frame_stack; *dp != NULL; dp = &(*dp)->next)
|
|
{
|
|
if (dummy_frame_id_eq (&(*dp)->id, dummy_id))
|
|
return dp;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Find the dummy frame by DUMMY_ID and PTID, and pop it, restoring
|
|
program state to that before the frame was created.
|
|
On return reinit_frame_cache has been called.
|
|
If the frame isn't found, flag an internal error. */
|
|
|
|
void
|
|
dummy_frame_pop (struct frame_id dummy_id, ptid_t ptid)
|
|
{
|
|
struct dummy_frame **dp;
|
|
struct dummy_frame_id id = { dummy_id, ptid };
|
|
|
|
dp = lookup_dummy_frame (&id);
|
|
gdb_assert (dp != NULL);
|
|
|
|
pop_dummy_frame (dp);
|
|
}
|
|
|
|
/* Find the dummy frame by DUMMY_ID and PTID and drop it. Do nothing
|
|
if it is not found. Do not restore its state into inferior, just
|
|
free its memory. */
|
|
|
|
void
|
|
dummy_frame_discard (struct frame_id dummy_id, ptid_t ptid)
|
|
{
|
|
struct dummy_frame **dp;
|
|
struct dummy_frame_id id = { dummy_id, ptid };
|
|
|
|
dp = lookup_dummy_frame (&id);
|
|
if (dp)
|
|
remove_dummy_frame (dp);
|
|
}
|
|
|
|
/* There may be stale dummy frames, perhaps left over from when an uncaught
|
|
longjmp took us out of a function that was called by the debugger. Clean
|
|
them up at least once whenever we start a new inferior. */
|
|
|
|
static void
|
|
cleanup_dummy_frames (struct target_ops *target, int from_tty)
|
|
{
|
|
while (dummy_frame_stack != NULL)
|
|
remove_dummy_frame (&dummy_frame_stack);
|
|
}
|
|
|
|
/* Return the dummy frame cache, it contains both the ID, and a
|
|
pointer to the regcache. */
|
|
struct dummy_frame_cache
|
|
{
|
|
struct frame_id this_id;
|
|
struct regcache *prev_regcache;
|
|
};
|
|
|
|
static int
|
|
dummy_frame_sniffer (const struct frame_unwind *self,
|
|
struct frame_info *this_frame,
|
|
void **this_prologue_cache)
|
|
{
|
|
/* When unwinding a normal frame, the stack structure is determined
|
|
by analyzing the frame's function's code (be it using brute force
|
|
prologue analysis, or the dwarf2 CFI). In the case of a dummy
|
|
frame, that simply isn't possible. The PC is either the program
|
|
entry point, or some random address on the stack. Trying to use
|
|
that PC to apply standard frame ID unwind techniques is just
|
|
asking for trouble. */
|
|
|
|
/* Don't bother unless there is at least one dummy frame. */
|
|
if (dummy_frame_stack != NULL)
|
|
{
|
|
struct dummy_frame *dummyframe;
|
|
/* Use an architecture specific method to extract this frame's
|
|
dummy ID, assuming it is a dummy frame. */
|
|
struct frame_id this_id
|
|
= gdbarch_dummy_id (get_frame_arch (this_frame), this_frame);
|
|
struct dummy_frame_id dummy_id = { this_id, inferior_ptid };
|
|
|
|
/* Use that ID to find the corresponding cache entry. */
|
|
for (dummyframe = dummy_frame_stack;
|
|
dummyframe != NULL;
|
|
dummyframe = dummyframe->next)
|
|
{
|
|
if (dummy_frame_id_eq (&dummyframe->id, &dummy_id))
|
|
{
|
|
struct dummy_frame_cache *cache;
|
|
|
|
cache = FRAME_OBSTACK_ZALLOC (struct dummy_frame_cache);
|
|
cache->prev_regcache = get_infcall_suspend_state_regcache
|
|
(dummyframe->caller_state);
|
|
cache->this_id = this_id;
|
|
(*this_prologue_cache) = cache;
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Given a call-dummy dummy-frame, return the registers. Here the
|
|
register value is taken from the local copy of the register buffer. */
|
|
|
|
static struct value *
|
|
dummy_frame_prev_register (struct frame_info *this_frame,
|
|
void **this_prologue_cache,
|
|
int regnum)
|
|
{
|
|
struct dummy_frame_cache *cache = (*this_prologue_cache);
|
|
struct gdbarch *gdbarch = get_frame_arch (this_frame);
|
|
struct value *reg_val;
|
|
|
|
/* The dummy-frame sniffer always fills in the cache. */
|
|
gdb_assert (cache != NULL);
|
|
|
|
/* Describe the register's location. Generic dummy frames always
|
|
have the register value in an ``expression''. */
|
|
reg_val = value_zero (register_type (gdbarch, regnum), not_lval);
|
|
|
|
/* Use the regcache_cooked_read() method so that it, on the fly,
|
|
constructs either a raw or pseudo register from the raw
|
|
register cache. */
|
|
regcache_cooked_read (cache->prev_regcache, regnum,
|
|
value_contents_writeable (reg_val));
|
|
return reg_val;
|
|
}
|
|
|
|
/* Assuming that THIS_FRAME is a dummy, return its ID. That ID is
|
|
determined by examining the NEXT frame's unwound registers using
|
|
the method dummy_id(). As a side effect, THIS dummy frame's
|
|
dummy cache is located and saved in THIS_PROLOGUE_CACHE. */
|
|
|
|
static void
|
|
dummy_frame_this_id (struct frame_info *this_frame,
|
|
void **this_prologue_cache,
|
|
struct frame_id *this_id)
|
|
{
|
|
/* The dummy-frame sniffer always fills in the cache. */
|
|
struct dummy_frame_cache *cache = (*this_prologue_cache);
|
|
|
|
gdb_assert (cache != NULL);
|
|
(*this_id) = cache->this_id;
|
|
}
|
|
|
|
const struct frame_unwind dummy_frame_unwind =
|
|
{
|
|
DUMMY_FRAME,
|
|
default_frame_unwind_stop_reason,
|
|
dummy_frame_this_id,
|
|
dummy_frame_prev_register,
|
|
NULL,
|
|
dummy_frame_sniffer,
|
|
};
|
|
|
|
static void
|
|
fprint_dummy_frames (struct ui_file *file)
|
|
{
|
|
struct dummy_frame *s;
|
|
|
|
for (s = dummy_frame_stack; s != NULL; s = s->next)
|
|
{
|
|
gdb_print_host_address (s, file);
|
|
fprintf_unfiltered (file, ":");
|
|
fprintf_unfiltered (file, " id=");
|
|
fprint_frame_id (file, s->id.id);
|
|
fprintf_unfiltered (file, ", ptid=%s",
|
|
target_pid_to_str (s->id.ptid));
|
|
fprintf_unfiltered (file, "\n");
|
|
}
|
|
}
|
|
|
|
static void
|
|
maintenance_print_dummy_frames (char *args, int from_tty)
|
|
{
|
|
if (args == NULL)
|
|
fprint_dummy_frames (gdb_stdout);
|
|
else
|
|
{
|
|
struct cleanup *cleanups;
|
|
struct ui_file *file = gdb_fopen (args, "w");
|
|
|
|
if (file == NULL)
|
|
perror_with_name (_("maintenance print dummy-frames"));
|
|
cleanups = make_cleanup_ui_file_delete (file);
|
|
fprint_dummy_frames (file);
|
|
do_cleanups (cleanups);
|
|
}
|
|
}
|
|
|
|
extern void _initialize_dummy_frame (void);
|
|
|
|
void
|
|
_initialize_dummy_frame (void)
|
|
{
|
|
add_cmd ("dummy-frames", class_maintenance, maintenance_print_dummy_frames,
|
|
_("Print the contents of the internal dummy-frame stack."),
|
|
&maintenanceprintlist);
|
|
|
|
observer_attach_inferior_created (cleanup_dummy_frames);
|
|
}
|