X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386-sol2-tdep.c;h=1980485cd4db3684bcad75ed65a956e104a8f5b7;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=dfe6d705f1345d170cb7e335fb0b579151c56ac6;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c index dfe6d705f1..1980485cd4 100644 --- a/gdb/i386-sol2-tdep.c +++ b/gdb/i386-sol2-tdep.c @@ -1,12 +1,12 @@ /* Target-dependent code for Solaris x86. - Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2002-2020 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 2 of the License, or + 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, @@ -15,16 +15,12 @@ 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, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "value.h" #include "osabi.h" -#include "gdb_string.h" - #include "sol2-tdep.h" #include "i386-tdep.h" #include "solib-svr4.h" @@ -50,34 +46,59 @@ static int i386_sol2_gregset_reg_offset[] = 0 * 4 /* %gs */ }; -/* Return whether the frame preceding NEXT_FRAME corresponds to a - Solaris sigtramp routine. */ +/* Return whether THIS_FRAME corresponds to a Solaris sigtramp + routine. */ static int -i386_sol2_sigtramp_p (struct frame_info *next_frame) +i386_sol2_sigtramp_p (struct frame_info *this_frame) { - CORE_ADDR pc = frame_pc_unwind (next_frame); - char *name; + CORE_ADDR pc = get_frame_pc (this_frame); + const char *name; find_pc_partial_function (pc, &name, NULL, NULL); return (name && (strcmp ("sigacthandler", name) == 0 - || strcmp (name, "ucbsigvechandler") == 0)); + || strcmp (name, "ucbsigvechandler") == 0 + || strcmp (name, "__sighndlr") == 0)); } /* Solaris doesn't have a `struct sigcontext', but it does have a `mcontext_t' that contains the saved set of machine registers. */ static CORE_ADDR -i386_sol2_mcontext_addr (struct frame_info *next_frame) +i386_sol2_mcontext_addr (struct frame_info *this_frame) { CORE_ADDR sp, ucontext_addr; - sp = frame_unwind_register_unsigned (next_frame, I386_ESP_REGNUM); - ucontext_addr = get_frame_memory_unsigned (next_frame, sp + 8, 4); + sp = get_frame_register_unsigned (this_frame, I386_ESP_REGNUM); + ucontext_addr = get_frame_memory_unsigned (this_frame, sp + 8, 4); return ucontext_addr + 36; } +/* SunPRO encodes the static variables. This is not related to C++ + mangling, it is done for C too. */ + +static const char * +i386_sol2_static_transform_name (const char *name) +{ + if (name[0] == '.') + { + const char *p; + + /* For file-local statics there will be a period, a bunch of + junk (the contents of which match a string given in the + N_OPT), a period and the name. For function-local statics + there will be a bunch of junk (which seems to change the + second character from 'A' to 'B'), a period, the name of the + function, and the name. So just skip everything before the + last period. */ + p = strrchr (name, '.'); + if (p != NULL) + name = p + 1; + } + return name; +} + /* Solaris 2. */ static void @@ -88,6 +109,13 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* Solaris is SVR4-based. */ i386_svr4_init_abi (info, gdbarch); + /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols, + and for SunPRO 3.0, N_FUN symbols too. */ + set_gdbarch_sofun_address_maybe_missing (gdbarch, 1); + + /* Handle SunPRO encoding of static symbols. */ + set_gdbarch_static_transform_name (gdbarch, i386_sol2_static_transform_name); + /* Solaris reserves space for its FPU emulator in `fpregset_t'. There is also some space reserved for the registers of a Weitek math coprocessor. */ @@ -106,6 +134,9 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_skip_solib_resolver (gdbarch, sol2_skip_solib_resolver); set_solib_svr4_fetch_link_map_offsets (gdbarch, svr4_ilp32_fetch_link_map_offsets); + + /* How to print LWP PTIDs from core files. */ + set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str); } @@ -120,11 +151,9 @@ i386_sol2_osabi_sniffer (bfd *abfd) return GDB_OSABI_UNKNOWN; } -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_i386_sol2_tdep (void); - +void _initialize_i386_sol2_tdep (); void -_initialize_i386_sol2_tdep (void) +_initialize_i386_sol2_tdep () { /* Register an ELF OS ABI sniffer for Solaris 2 binaries. */ gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour,