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.
57 lines
2.1 KiB
C
57 lines
2.1 KiB
C
/* Code dealing with dummy stack frames, for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2002-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/>. */
|
|
|
|
#if !defined (DUMMY_FRAME_H)
|
|
#define DUMMY_FRAME_H 1
|
|
|
|
#include "frame.h"
|
|
|
|
struct infcall_suspend_state;
|
|
struct frame_unwind;
|
|
|
|
/* Push the information needed to identify, and unwind from, a dummy
|
|
frame onto the dummy frame stack. */
|
|
|
|
/* NOTE: cagney/2004-08-02: In the case of ABIs using push_dummy_code
|
|
containing more than one instruction, this interface many need to
|
|
be expanded so that it knowns the lower/upper extent of the dummy
|
|
frame's code. */
|
|
|
|
extern void dummy_frame_push (struct infcall_suspend_state *caller_state,
|
|
const struct frame_id *dummy_id, ptid_t ptid);
|
|
|
|
/* Pop the dummy frame DUMMY_ID, 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.
|
|
|
|
NOTE: This can only pop the one frame, even if it is in the middle of the
|
|
stack, because the other frames may be for different threads, and there's
|
|
currently no way to tell which stack frame is for which thread. */
|
|
|
|
extern void dummy_frame_pop (struct frame_id dummy_id, ptid_t ptid);
|
|
|
|
extern void dummy_frame_discard (struct frame_id dummy_id, ptid_t ptid);
|
|
|
|
/* If the PC falls in a dummy frame, return a dummy frame
|
|
unwinder. */
|
|
|
|
extern const struct frame_unwind dummy_frame_unwind;
|
|
|
|
#endif /* !defined (DUMMY_FRAME_H) */
|