X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Famd64-sol2-tdep.c;h=74358d88f43e902ad93127f2d2b34a9152454cd8;hb=488d02fe7729dda5b9414a3942df68e0c316ce53;hp=416d1118fe6a728505f7a58a37806c23a52d8978;hpb=081bf9da7d553463fabcf98e15ea9b57b4e4e018;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c index 416d1118fe..74358d88f4 100644 --- a/gdb/amd64-sol2-tdep.c +++ b/gdb/amd64-sol2-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for AMD64 Solaris. - Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. Contributed by Joseph Myers, CodeSourcery, LLC. @@ -8,7 +8,7 @@ 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, @@ -17,9 +17,7 @@ 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 "frame.h" @@ -28,10 +26,9 @@ #include "osabi.h" #include "symtab.h" -#include "gdb_string.h" - #include "sol2-tdep.h" #include "amd64-tdep.h" +#include "gdbsupport/x86-xstate.h" #include "solib-svr4.h" /* Mapping between the general-purpose registers in gregset_t format @@ -47,7 +44,7 @@ static int amd64_sol2_gregset_reg_offset[] = { 8 * 8, /* %rdi */ 10 * 8, /* %rbp */ 20 * 8, /* %rsp */ - 7 * 8, /* %r8 ... */ + 7 * 8, /* %r8 ... */ 6 * 8, 5 * 8, 4 * 8, @@ -56,7 +53,7 @@ static int amd64_sol2_gregset_reg_offset[] = { 1 * 8, 0 * 8, /* ... %r15 */ 17 * 8, /* %rip */ - 16 * 8, /* %eflags */ + 19 * 8, /* %eflags */ 18 * 8, /* %cs */ 21 * 8, /* %ss */ 25 * 8, /* %ds */ @@ -66,30 +63,31 @@ static int amd64_sol2_gregset_reg_offset[] = { }; -/* 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 -amd64_sol2_sigtramp_p (struct frame_info *next_frame) +amd64_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 -amd64_sol2_mcontext_addr (struct frame_info *next_frame) +amd64_sol2_mcontext_addr (struct frame_info *this_frame) { CORE_ADDR sp, ucontext_addr; - sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM); - ucontext_addr = get_frame_memory_unsigned (next_frame, sp + 8, 8); + sp = get_frame_register_unsigned (this_frame, AMD64_RSP_REGNUM); + ucontext_addr = get_frame_memory_unsigned (this_frame, sp + 8, 8); return ucontext_addr + 72; } @@ -103,7 +101,8 @@ amd64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_sol2_gregset_reg_offset); tdep->sizeof_gregset = 28 * 8; - amd64_init_abi (info, gdbarch); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK, true)); tdep->sigtramp_p = amd64_sol2_sigtramp_p; tdep->sigcontext_addr = amd64_sol2_mcontext_addr; @@ -114,11 +113,10 @@ amd64_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_lp64_fetch_link_map_offsets); -} - -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern void _initialize_amd64_sol2_tdep (void); + /* How to print LWP PTIDs from core files. */ + set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str); +} void _initialize_amd64_sol2_tdep (void)