X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fblockframe.c;h=d9c28e0a0176a1d91fec1df089fdc4aa382e8672;hb=84e098cdea4eb6a5ddc525a2145ffe66475fa2af;hp=4462274f46d16bbcc9f04d8ccb94cfd3bcc02f69;hpb=dac36daf78653a8e4688b825cdb15461a88470d2;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 4462274f46..d9c28e0a01 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -209,7 +209,7 @@ clear_pc_function_cache (void) /* See symtab.h. */ -int +bool find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, CORE_ADDR *endaddr, const struct block **block) { @@ -219,7 +219,7 @@ find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, struct compunit_symtab *compunit_symtab = NULL; CORE_ADDR mapped_pc; - /* To ensure that the symbol returned belongs to the correct setion + /* To ensure that the symbol returned belongs to the correct section (and that the last [random] symbol from the previous section isn't returned) try to find the section containing PC. First try the overlay code (which by default returns NULL); and second try @@ -269,7 +269,7 @@ find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, { const struct block *b = SYMBOL_BLOCK_VALUE (f); - cache_pc_function_name = SYMBOL_LINKAGE_NAME (f); + cache_pc_function_name = f->linkage_name (); cache_pc_function_section = section; cache_pc_function_block = b; @@ -333,11 +333,11 @@ find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, *endaddr = 0; if (block != nullptr) *block = nullptr; - return 0; + return false; } cache_pc_function_low = BMSYMBOL_VALUE_ADDRESS (msymbol); - cache_pc_function_name = MSYMBOL_LINKAGE_NAME (msymbol.minsym); + cache_pc_function_name = msymbol.minsym->linkage_name (); cache_pc_function_section = section; cache_pc_function_high = minimal_symbol_upper_bound (msymbol); cache_pc_function_block = nullptr; @@ -374,7 +374,7 @@ find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address, if (block != nullptr) *block = cache_pc_function_block; - return 1; + return true; } /* See symtab.h. */