diff options
| author | Luis Machado <luisgpm@br.ibm.com> | 2013-06-05 20:43:53 +0000 |
|---|---|---|
| committer | Luis Machado <luisgpm@br.ibm.com> | 2013-06-05 20:43:53 +0000 |
| commit | a304d267aecbf5c1100035758bf4aa8135fb8a0d (patch) | |
| tree | 1b3f6d8e9be0e51717f15948d8fc660787986929 /gdb/gnu-v3-abi.c | |
| parent | 1fcafc429220f73ba0e2414832f04e935c8b8271 (diff) | |
| download | gdb-a304d267aecbf5c1100035758bf4aa8135fb8a0d.tar.gz | |
* gnu-v3-abi.c (gnuv3_skip_trampoline): Handle thunk
minimal symbols pointing to function descriptors.
Diffstat (limited to 'gdb/gnu-v3-abi.c')
| -rw-r--r-- | gdb/gnu-v3-abi.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index 6812c1dcd7b..1821f180a55 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -1207,7 +1207,7 @@ gnuv3_get_type_from_type_info (struct value *type_info_ptr) static CORE_ADDR gnuv3_skip_trampoline (struct frame_info *frame, CORE_ADDR stop_pc) { - CORE_ADDR real_stop_pc, method_stop_pc; + CORE_ADDR real_stop_pc, method_stop_pc, func_addr; struct gdbarch *gdbarch = get_frame_arch (frame); struct minimal_symbol *thunk_sym, *fn_sym; struct obj_section *section; @@ -1236,6 +1236,16 @@ gnuv3_skip_trampoline (struct frame_info *frame, CORE_ADDR stop_pc) return 0; method_stop_pc = SYMBOL_VALUE_ADDRESS (fn_sym); + + /* Some targets have minimal symbols pointing to function descriptors + (powerpc 64 for example). Make sure to retrieve the address + of the real function from the function descriptor before passing on + the address to other layers of GDB. */ + func_addr = gdbarch_convert_from_func_ptr_addr (gdbarch, method_stop_pc, + ¤t_target); + if (func_addr != 0) + method_stop_pc = func_addr; + real_stop_pc = gdbarch_skip_trampoline_code (gdbarch, frame, method_stop_pc); if (real_stop_pc == 0) |