mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 18:44:20 +08:00
edb3359dff
* NEWS: Document inlined function support. * Makefile.in (SFILES): Add inline-frame.c. (COMMON_OBS): Add inline-frame.o. * block.c (contained_in): Rewrite to use lexical nesting. (block_linkage_function): Skip inlined function blocks. (block_inlined_p): New. * block.h (struct block): Update comment. (block_inlined_p): New prototype. * blockframe.c (get_frame_block): Handle inlined functions. (get_frame_function): Do not use block_linkage_function. (block_innermost_frame): Use get_frame_block and contained_in. * breakpoint.c (watchpoint_check): Remove extra reinit_frame_cache. Skip over inlined functions. Simplify epilogue check. (bpstat_check_breakpoint_conditions): Use get_stack_frame_id. Update comments. (set_momentary_breakpoint): Only accept non-inlined frames. (watch_command_1): Use frame_unwind_caller_pc and frame_unwind_caller_id instead of get_prev_frame. (until_break_command): Likewise. Use get_stack_frame_id. * buildsym.c (end_symtab): Set SYMBOL_SYMTAB for block functions. * dwarf2loc.c (dwarf_expr_frame_base): Use block_linkage_function. * dwarf2read.c (process_die): Handle DW_TAG_inlined_subroutine. (read_func_scope, new_symbol): Likewise. Handle arguments specially for inlined functions without call site information. (inherit_abstract_dies): Allow tag mismatch for inlined subroutines. (die_specification): Treat DW_AT_abstract_origin as a specification. (read_type_die): Handle DW_TAG_inlined_subroutine. * frame-unwind.c (frame_unwind_init): Add inline_frame_unwind. * frame.c (fprint_frame_id): Print inline depth. (fprint_frame_type): Handle INLINE_FRAME and SENTINEL_FRAME. (skip_inlined_frames, get_stack_frame_id): New. (frame_unwind_caller_id): Use skip_inlined_frames. (frame_id_inlined_p): New. (frame_id_eq): Make the logic match the comments. Add inline_depth check. (frame_id_inner): Handle inlined functions. (frame_unwind_pc): New function, copied from frame_unwind_caller_pc. (frame_unwind_caller_pc): Use skip_inlined_frames and frame_unwind_pc. (get_prev_frame_1): Check for inline frames. Split out frame allocation to get_prev_frame_raw. (get_prev_frame_raw): New function. (get_prev_frame): Handle inline frames. (get_frame_pc): Use frame_unwind_pc. (get_frame_address_in_block): Skip inlined frames on both sides. (pc_notcurrent): Delete. (find_frame_sal): Rewrite to handle inline call sites. Use get_frame_address_in_block. (deprecated_update_frame_pc_hack): Make static. * frame.h: Update comments. (struct frame_id): Add inline_depth. (enum frame_type): Add INLINE_FRAME. (frame_id_inlined_p, get_stack_frame_id): New prototypes. * gdbthread.h (struct thread_info): Add step_stack_frame_id field. * infcmd.c (set_step_frame): New function. (step_once): Use set_step_frame. Handle inlined functions. (until_next_command): Use set_step_frame. (finish_backward), finish_forward): Use get_stack_frame_id. (finish_command): Support inlined functions. * inferior.h (set_step_info): New prototype. * infrun.c (RESUME_ALL): Use minus_one_ptid. (clear_proceed_status): Clear step_stack_frame_id. (init_wait_for_inferior): Call clear_inline_frame_state. (init_execution_control_state): Make static. (set_step_info): New function. (init_thread_stepping_state): Do not set the symtab or line here. (stepped_in_from): New function. (handle_inferior_event): Handle inlined functions. Use set_step_info. (insert_step_resume_breakpoint_at_frame): Use get_stack_frame_id. (struct inferior_status): Add step_stack_frame_id. (save_inferior_status, restore_inferior_status): Save and restore step_stack_frame_id. * inline-frame.c, inline-frame.h: New files. * minsyms.c (prim_record_minimal_symbol_and_info): Use XCALLOC. * regcache.c (regcache_write_pc): Call reinit_frame_cache. * s390-tdep.c (s390_prologue_frame_unwind_cache): Handle INLINE_FRAME. * stack.c (frame_show_address): New. (print_frame_info, print_frame): Use it. (find_frame_funname): Use get_frame_function. Handle inlined blocks. (frame_info): Mark inlined functions. (backtrace_command_1): Use get_current_user_frame. (print_frame_local_vars, print_frame_label_vars): Update comments. (return_command): Refuse inlined functions. * symtab.c (lookup_symbol_aux_local): Stop at inlined function boundaries. (find_function_start_sal): Avoid inlined functions. (completion_list_add_fields): New function. (default_make_symbol_completion_list): Use it. Use block_static_block and block_global_block. Check for inlined functions. (skip_prologue_using_sal): Avoid line number comparison across inlining. * symtab.h (struct symbol): Add is_inlined. (SYMBOL_INLINED): New. * target.c (target_resume): Call clear_inline_frame_state. * valops.c (value_of_variable): Check block_inlined_p. gdb/doc/ * gdb.texinfo (Debugging Optimized Code): New chapter. (Compiling for Debugging): Reference it. Move some text to the new section. gdb/testsuite/ * gdb.base/break.exp: Add an XFAIL for gcc/36748. * gdb.cp/annota2.exp: Accept frames-invalid in more places. * gdb.opt/Makefile.in (EXECUTABLES): Update. * gdb.opt/clobbered-registers-O2.exp: Update to GPL v3. * gdb.opt/inline-bt.c, gdb.opt/inline-bt.exp, gdb.opt/inline-cmds.c, gdb.opt/inline-cmds.exp, gdb.opt/inline-locals.c, gdb.opt/inline-locals.exp, gdb.opt/inline-markers.c: New files. * lib/gdb.exp (skip_inline_frame_tests): New function. (skip_inline_var_tests): New function.
320 lines
8.2 KiB
C
320 lines
8.2 KiB
C
/* Block-related functions for the GNU debugger, GDB.
|
|
|
|
Copyright (C) 2003, 2007, 2008, 2009 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 "block.h"
|
|
#include "symtab.h"
|
|
#include "symfile.h"
|
|
#include "gdb_obstack.h"
|
|
#include "cp-support.h"
|
|
#include "addrmap.h"
|
|
|
|
/* This is used by struct block to store namespace-related info for
|
|
C++ files, namely using declarations and the current namespace in
|
|
scope. */
|
|
|
|
struct block_namespace_info
|
|
{
|
|
const char *scope;
|
|
struct using_direct *using;
|
|
};
|
|
|
|
static void block_initialize_namespace (struct block *block,
|
|
struct obstack *obstack);
|
|
|
|
/* Return Nonzero if block a is lexically nested within block b,
|
|
or if a and b have the same pc range.
|
|
Return zero otherwise. */
|
|
|
|
int
|
|
contained_in (const struct block *a, const struct block *b)
|
|
{
|
|
if (!a || !b)
|
|
return 0;
|
|
|
|
do
|
|
{
|
|
if (a == b)
|
|
return 1;
|
|
a = BLOCK_SUPERBLOCK (a);
|
|
}
|
|
while (a != NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Return the symbol for the function which contains a specified
|
|
lexical block, described by a struct block BL. The return value
|
|
will not be an inlined function; the containing function will be
|
|
returned instead. */
|
|
|
|
struct symbol *
|
|
block_linkage_function (const struct block *bl)
|
|
{
|
|
while ((BLOCK_FUNCTION (bl) == NULL || block_inlined_p (bl))
|
|
&& BLOCK_SUPERBLOCK (bl) != NULL)
|
|
bl = BLOCK_SUPERBLOCK (bl);
|
|
|
|
return BLOCK_FUNCTION (bl);
|
|
}
|
|
|
|
/* Return one if BL represents an inlined function. */
|
|
|
|
int
|
|
block_inlined_p (const struct block *bl)
|
|
{
|
|
return BLOCK_FUNCTION (bl) != NULL && SYMBOL_INLINED (BLOCK_FUNCTION (bl));
|
|
}
|
|
|
|
/* Return the blockvector immediately containing the innermost lexical
|
|
block containing the specified pc value and section, or 0 if there
|
|
is none. PBLOCK is a pointer to the block. If PBLOCK is NULL, we
|
|
don't pass this information back to the caller. */
|
|
|
|
struct blockvector *
|
|
blockvector_for_pc_sect (CORE_ADDR pc, struct obj_section *section,
|
|
struct block **pblock, struct symtab *symtab)
|
|
{
|
|
struct block *b;
|
|
int bot, top, half;
|
|
struct blockvector *bl;
|
|
|
|
if (symtab == 0) /* if no symtab specified by caller */
|
|
{
|
|
/* First search all symtabs for one whose file contains our pc */
|
|
symtab = find_pc_sect_symtab (pc, section);
|
|
if (symtab == 0)
|
|
return 0;
|
|
}
|
|
|
|
bl = BLOCKVECTOR (symtab);
|
|
|
|
/* Then search that symtab for the smallest block that wins. */
|
|
|
|
/* If we have an addrmap mapping code addresses to blocks, then use
|
|
that. */
|
|
if (BLOCKVECTOR_MAP (bl))
|
|
{
|
|
b = addrmap_find (BLOCKVECTOR_MAP (bl), pc);
|
|
if (b)
|
|
{
|
|
if (pblock)
|
|
*pblock = b;
|
|
return bl;
|
|
}
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Otherwise, use binary search to find the last block that starts
|
|
before PC. */
|
|
bot = 0;
|
|
top = BLOCKVECTOR_NBLOCKS (bl);
|
|
|
|
while (top - bot > 1)
|
|
{
|
|
half = (top - bot + 1) >> 1;
|
|
b = BLOCKVECTOR_BLOCK (bl, bot + half);
|
|
if (BLOCK_START (b) <= pc)
|
|
bot += half;
|
|
else
|
|
top = bot + half;
|
|
}
|
|
|
|
/* Now search backward for a block that ends after PC. */
|
|
|
|
while (bot >= 0)
|
|
{
|
|
b = BLOCKVECTOR_BLOCK (bl, bot);
|
|
if (BLOCK_END (b) > pc)
|
|
{
|
|
if (pblock)
|
|
*pblock = b;
|
|
return bl;
|
|
}
|
|
bot--;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Return the blockvector immediately containing the innermost lexical block
|
|
containing the specified pc value, or 0 if there is none.
|
|
Backward compatibility, no section. */
|
|
|
|
struct blockvector *
|
|
blockvector_for_pc (CORE_ADDR pc, struct block **pblock)
|
|
{
|
|
return blockvector_for_pc_sect (pc, find_pc_mapped_section (pc),
|
|
pblock, NULL);
|
|
}
|
|
|
|
/* Return the innermost lexical block containing the specified pc value
|
|
in the specified section, or 0 if there is none. */
|
|
|
|
struct block *
|
|
block_for_pc_sect (CORE_ADDR pc, struct obj_section *section)
|
|
{
|
|
struct blockvector *bl;
|
|
struct block *b;
|
|
|
|
bl = blockvector_for_pc_sect (pc, section, &b, NULL);
|
|
if (bl)
|
|
return b;
|
|
return 0;
|
|
}
|
|
|
|
/* Return the innermost lexical block containing the specified pc value,
|
|
or 0 if there is none. Backward compatibility, no section. */
|
|
|
|
struct block *
|
|
block_for_pc (CORE_ADDR pc)
|
|
{
|
|
return block_for_pc_sect (pc, find_pc_mapped_section (pc));
|
|
}
|
|
|
|
/* Now come some functions designed to deal with C++ namespace issues.
|
|
The accessors are safe to use even in the non-C++ case. */
|
|
|
|
/* This returns the namespace that BLOCK is enclosed in, or "" if it
|
|
isn't enclosed in a namespace at all. This travels the chain of
|
|
superblocks looking for a scope, if necessary. */
|
|
|
|
const char *
|
|
block_scope (const struct block *block)
|
|
{
|
|
for (; block != NULL; block = BLOCK_SUPERBLOCK (block))
|
|
{
|
|
if (BLOCK_NAMESPACE (block) != NULL
|
|
&& BLOCK_NAMESPACE (block)->scope != NULL)
|
|
return BLOCK_NAMESPACE (block)->scope;
|
|
}
|
|
|
|
return "";
|
|
}
|
|
|
|
/* Set BLOCK's scope member to SCOPE; if needed, allocate memory via
|
|
OBSTACK. (It won't make a copy of SCOPE, however, so that already
|
|
has to be allocated correctly.) */
|
|
|
|
void
|
|
block_set_scope (struct block *block, const char *scope,
|
|
struct obstack *obstack)
|
|
{
|
|
block_initialize_namespace (block, obstack);
|
|
|
|
BLOCK_NAMESPACE (block)->scope = scope;
|
|
}
|
|
|
|
/* This returns the using directives list associated with BLOCK, if
|
|
any. */
|
|
|
|
struct using_direct *
|
|
block_using (const struct block *block)
|
|
{
|
|
if (block == NULL || BLOCK_NAMESPACE (block) == NULL)
|
|
return NULL;
|
|
else
|
|
return BLOCK_NAMESPACE (block)->using;
|
|
}
|
|
|
|
/* Set BLOCK's using member to USING; if needed, allocate memory via
|
|
OBSTACK. (It won't make a copy of USING, however, so that already
|
|
has to be allocated correctly.) */
|
|
|
|
void
|
|
block_set_using (struct block *block,
|
|
struct using_direct *using,
|
|
struct obstack *obstack)
|
|
{
|
|
block_initialize_namespace (block, obstack);
|
|
|
|
BLOCK_NAMESPACE (block)->using = using;
|
|
}
|
|
|
|
/* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and
|
|
ititialize its members to zero. */
|
|
|
|
static void
|
|
block_initialize_namespace (struct block *block, struct obstack *obstack)
|
|
{
|
|
if (BLOCK_NAMESPACE (block) == NULL)
|
|
{
|
|
BLOCK_NAMESPACE (block)
|
|
= obstack_alloc (obstack, sizeof (struct block_namespace_info));
|
|
BLOCK_NAMESPACE (block)->scope = NULL;
|
|
BLOCK_NAMESPACE (block)->using = NULL;
|
|
}
|
|
}
|
|
|
|
/* Return the static block associated to BLOCK. Return NULL if block
|
|
is NULL or if block is a global block. */
|
|
|
|
const struct block *
|
|
block_static_block (const struct block *block)
|
|
{
|
|
if (block == NULL || BLOCK_SUPERBLOCK (block) == NULL)
|
|
return NULL;
|
|
|
|
while (BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) != NULL)
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
return block;
|
|
}
|
|
|
|
/* Return the static block associated to BLOCK. Return NULL if block
|
|
is NULL. */
|
|
|
|
const struct block *
|
|
block_global_block (const struct block *block)
|
|
{
|
|
if (block == NULL)
|
|
return NULL;
|
|
|
|
while (BLOCK_SUPERBLOCK (block) != NULL)
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
return block;
|
|
}
|
|
|
|
/* Allocate a block on OBSTACK, and initialize its elements to
|
|
zero/NULL. This is useful for creating "dummy" blocks that don't
|
|
correspond to actual source files.
|
|
|
|
Warning: it sets the block's BLOCK_DICT to NULL, which isn't a
|
|
valid value. If you really don't want the block to have a
|
|
dictionary, then you should subsequently set its BLOCK_DICT to
|
|
dict_create_linear (obstack, NULL). */
|
|
|
|
struct block *
|
|
allocate_block (struct obstack *obstack)
|
|
{
|
|
struct block *bl = obstack_alloc (obstack, sizeof (struct block));
|
|
|
|
BLOCK_START (bl) = 0;
|
|
BLOCK_END (bl) = 0;
|
|
BLOCK_FUNCTION (bl) = NULL;
|
|
BLOCK_SUPERBLOCK (bl) = NULL;
|
|
BLOCK_DICT (bl) = NULL;
|
|
BLOCK_NAMESPACE (bl) = NULL;
|
|
|
|
return bl;
|
|
}
|