+2020-06-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * amd64-sol2-tdep.c (amd64_sol2_sigtramp_p): Remove.
+ (amd64_sol2_init_abi): Use sol2_sigtramp_p.
+ Call sol2_init_abi.
+ Remove calls to set_gdbarch_skip_solib_resolver,
+ set_gdbarch_core_pid_to_str.
+ * i386-sol2-tdep.c (i386_sol2_sigtramp_p): Remove.
+ (i386_sol2_static_transform_name): Remove.
+ (i386_sol2_init_abi): Call sol2_init_abi.
+ Remove calls to set_gdbarch_sofun_address_maybe_missing,
+ set_gdbarch_static_transform_name,
+ set_gdbarch_skip_solib_resolver, set_gdbarch_core_pid_to_str.
+ Use sol2_sigtramp_p.
+ * sol2-tdep.c (sol2_pc_in_sigtramp): New function.
+ (sol2_sigtramp_p): New function.
+ (sol2_static_transform_name): New function.
+ (sol2_skip_solib_resolver, sol2_core_pid_to_str): Make static.
+ (sol2_init_abi): New function.
+ * sol2-tdep.h (sol2_sigtramp_p, sol2_init_abi): Declare.
+ (sol2_skip_solib_resolver, sol2_core_pid_to_str): Remove.
+ * sparc-sol2-tdep.c (sparc_sol2_pc_in_sigtramp): Remove.
+ (sparc32_sol2_sigtramp_frame_sniffer): Just call sol2_sigtramp_p.
+ (sparc_sol2_static_transform_name): Remove.
+ (sparc32_sol2_init_abi): Call sol2_init_abi.
+ Remove calls to set_gdbarch_sofun_address_maybe_missing,
+ set_gdbarch_static_transform_name,
+ set_gdbarch_skip_solib_resolver,
+ set_gdbarch_core_pid_to_str.
+ * sparc-tdep.h (sparc_sol2_pc_in_sigtramp)
+ (sparc_sol2_static_transform_name): Remove
+ * sparc64-sol2-tdep.c (sparc64_sol2_sigtramp_frame_sniffer): Just
+ call sol2_sigtramp_p.
+ (sparc64_sol2_init_abi): Call sol2_init_abi.
+ Remove calls to set_gdbarch_sofun_address_maybe_missing,
+ set_gdbarch_static_transform_name,
+ set_gdbarch_skip_solib_resolver, set_gdbarch_core_pid_to_str.
+
2020-06-24 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* symfile-add-flags.h: New flag SYMFILE_ALWAYS_CONFIRM.
};
\f
-/* Return whether THIS_FRAME corresponds to a Solaris sigtramp
- routine. */
-
-static int
-amd64_sol2_sigtramp_p (struct frame_info *this_frame)
-{
- 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, "__sighndlr") == 0));
-}
-
/* Solaris doesn't have a 'struct sigcontext', but it does have a
'mcontext_t' that contains the saved set of machine registers. */
amd64_init_abi (info, gdbarch,
amd64_target_description (X86_XSTATE_SSE_MASK, true));
- tdep->sigtramp_p = amd64_sol2_sigtramp_p;
+ sol2_init_abi (info, gdbarch);
+
+ tdep->sigtramp_p = sol2_sigtramp_p;
tdep->sigcontext_addr = amd64_sol2_mcontext_addr;
tdep->sc_reg_offset = tdep->gregset_reg_offset;
tdep->sc_num_regs = tdep->gregset_num_regs;
/* Solaris uses SVR4-style shared libraries. */
- set_gdbarch_skip_solib_resolver (gdbarch, sol2_skip_solib_resolver);
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_lp64_fetch_link_map_offsets);
-
- /* 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 ();
0 * 4 /* %gs */
};
-/* Return whether THIS_FRAME corresponds to a Solaris sigtramp
- routine. */
-
-static int
-i386_sol2_sigtramp_p (struct frame_info *this_frame)
-{
- 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, "__sighndlr") == 0));
-}
-
/* Solaris doesn't have a `struct sigcontext', but it does have a
`mcontext_t' that contains the saved set of machine registers. */
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
/* 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);
+ sol2_init_abi (info, gdbarch);
/* Solaris reserves space for its FPU emulator in `fpregset_t'.
There is also some space reserved for the registers of a Weitek
tdep->sizeof_fpregset = 380;
/* Signal trampolines are slightly different from SVR4. */
- tdep->sigtramp_p = i386_sol2_sigtramp_p;
+ tdep->sigtramp_p = sol2_sigtramp_p;
tdep->sigcontext_addr = i386_sol2_mcontext_addr;
tdep->sc_reg_offset = tdep->gregset_reg_offset;
tdep->sc_num_regs = tdep->gregset_num_regs;
/* Solaris has SVR4-style shared libraries. */
- 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);
}
\f
#include "sol2-tdep.h"
-CORE_ADDR
+/* The Solaris signal trampolines reside in libc. For normal signals,
+ the function `sigacthandler' is used. This signal trampoline will
+ call the signal handler using the System V calling convention,
+ where the third argument is a pointer to an instance of
+ `ucontext_t', which has a member `uc_mcontext' that contains the
+ saved registers. Incidentally, the kernel passes the `ucontext_t'
+ pointer as the third argument of the signal trampoline too, and
+ `sigacthandler' simply passes it on. However, if you link your
+ program with "-L/usr/ucblib -R/usr/ucblib -lucb", the function
+ `ucbsigvechandler' will be used, which invokes the using the BSD
+ convention, where the third argument is a pointer to an instance of
+ `struct sigcontext'. It is the `ucbsigvechandler' function that
+ converts the `ucontext_t' to a `sigcontext', and back. Unless the
+ signal handler modifies the `struct sigcontext' we can safely
+ ignore this. */
+
+static int
+sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name)
+{
+ return (name && (strcmp (name, "sigacthandler") == 0
+ || strcmp (name, "ucbsigvechandler") == 0
+ || strcmp (name, "__sighndlr") == 0));
+}
+
+/* Return whether THIS_FRAME corresponds to a Solaris sigtramp routine. */
+
+int
+sol2_sigtramp_p (struct frame_info *this_frame)
+{
+ CORE_ADDR pc = get_frame_pc (this_frame);
+ const char *name;
+
+ find_pc_partial_function (pc, &name, NULL, NULL);
+ return sol2_pc_in_sigtramp (pc, name);
+}
+
+/* Unglobalize NAME. */
+
+static const char *
+sol2_static_transform_name (const char *name)
+{
+ /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop,
+ SunPRO) convert file static variables into global values, a
+ process known as globalization. In order to do this, the
+ compiler will create a unique prefix and prepend it to each file
+ static variable. For static variables within a function, this
+ globalization prefix is followed by the function name (nested
+ static variables within a function are supposed to generate a
+ warning message, and are left alone). The procedure is
+ documented in the Stabs Interface Manual, which is distributed
+ with the compilers, although version 4.0 of the manual seems to
+ be incorrect in some places, at least for SPARC. The
+ globalization prefix is encoded into an N_OPT stab, with the form
+ "G=<prefix>". The globalization prefix always seems to start
+ with a dollar sign '$' (sparc) resp. a dot '.' (x86); a dot '.'
+ is used as a separator. So we simply strip everything up until
+ the last dot. */
+ int prefix;
+
+ switch (gdbarch_bfd_arch_info (target_gdbarch ())->arch)
+ {
+ case bfd_arch_i386:
+ prefix = '.';
+ break;
+ case bfd_arch_sparc:
+ prefix = '$';
+ break;
+ default:
+ internal_error (__FILE__, __LINE__, "Unexpected arch");
+ break;
+ }
+
+ if (name[0] == prefix)
+ {
+ const char *p = strrchr (name, '.');
+ if (p)
+ return p + 1;
+ }
+
+ return name;
+}
+
+static CORE_ADDR
sol2_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
{
struct bound_minimal_symbol msym;
return 0;
}
-/* This is how we want PTIDs from Solaris core files to be
- printed. */
+/* This is how we want PTIDs from Solaris core files to be printed. */
-std::string
+static std::string
sol2_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
{
struct inferior *inf;
int pid;
- /* Check whether we're printing an LWP (gdb thread) or a
- process. */
+ /* Check whether we're printing an LWP (gdb thread) or a process. */
pid = ptid.lwp ();
if (pid != 0)
{
}
/* GDB didn't use to put a NT_PSTATUS note in Solaris cores. If
- that's missing, then we're dealing with a fake PID corelow.c made
- up. */
+ that's missing, then we're dealing with a fake PID corelow.c made up. */
inf = find_inferior_ptid (current_inferior ()->process_target (), ptid);
if (inf == NULL || inf->fake_pid_p)
return "<core>";
/* Not fake; print as usual. */
return normal_pid_to_str (ptid);
}
+
+/* To be called from GDB_OSABI_SOLARIS handlers. */
+
+void
+sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+ /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO)
+ compiler puts out 0 instead of the address in N_SO stabs. Starting with
+ SunPRO 3.0, the compiler does this for N_FUN stabs too. */
+ set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
+
+ /* The Sun compilers also do "globalization"; see the comment in
+ sol2_static_transform_name for more information. */
+ set_gdbarch_static_transform_name (gdbarch, sol2_static_transform_name);
+
+ /* Solaris uses SVR4-style shared libraries. */
+ set_gdbarch_skip_solib_resolver (gdbarch, sol2_skip_solib_resolver);
+
+ /* How to print LWP PTIDs from core files. */
+ set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str);
+}
struct gdbarch;
-CORE_ADDR sol2_skip_solib_resolver (struct gdbarch *, CORE_ADDR);
+int sol2_sigtramp_p (struct frame_info *this_frame);
-std::string sol2_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid);
+void sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch);
#endif /* sol2-tdep.h */
};
\f
-/* The Solaris signal trampolines reside in libc. For normal signals,
- the function `sigacthandler' is used. This signal trampoline will
- call the signal handler using the System V calling convention,
- where the third argument is a pointer to an instance of
- `ucontext_t', which has a member `uc_mcontext' that contains the
- saved registers. Incidentally, the kernel passes the `ucontext_t'
- pointer as the third argument of the signal trampoline too, and
- `sigacthandler' simply passes it on. However, if you link your
- program with "-L/usr/ucblib -R/usr/ucblib -lucb", the function
- `ucbsigvechandler' will be used, which invokes the using the BSD
- convention, where the third argument is a pointer to an instance of
- `struct sigcontext'. It is the `ucbsigvechandler' function that
- converts the `ucontext_t' to a `sigcontext', and back. Unless the
- signal handler modifies the `struct sigcontext' we can safely
- ignore this. */
-
-int
-sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name)
-{
- return (name && (strcmp (name, "sigacthandler") == 0
- || strcmp (name, "ucbsigvechandler") == 0
- || strcmp (name, "__sighndlr") == 0));
-}
-
static struct sparc_frame_cache *
sparc32_sol2_sigtramp_frame_cache (struct frame_info *this_frame,
void **this_cache)
struct frame_info *this_frame,
void **this_cache)
{
- CORE_ADDR pc = get_frame_pc (this_frame);
- const char *name;
-
- find_pc_partial_function (pc, &name, NULL, NULL);
- if (sparc_sol2_pc_in_sigtramp (pc, name))
- return 1;
-
- return 0;
+ return sol2_sigtramp_p (this_frame);
}
static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind =
sparc32_sol2_sigtramp_frame_sniffer
};
-/* Unglobalize NAME. */
-
-const char *
-sparc_sol2_static_transform_name (const char *name)
-{
- /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop,
- SunPRO) convert file static variables into global values, a
- process known as globalization. In order to do this, the
- compiler will create a unique prefix and prepend it to each file
- static variable. For static variables within a function, this
- globalization prefix is followed by the function name (nested
- static variables within a function are supposed to generate a
- warning message, and are left alone). The procedure is
- documented in the Stabs Interface Manual, which is distributed
- with the compilers, although version 4.0 of the manual seems to
- be incorrect in some places, at least for SPARC. The
- globalization prefix is encoded into an N_OPT stab, with the form
- "G=<prefix>". The globalization prefix always seems to start
- with a dollar sign '$'; a dot '.' is used as a separator. So we
- simply strip everything up until the last dot. */
-
- if (name[0] == '$')
- {
- const char *p = strrchr (name, '.');
- if (p)
- return p + 1;
- }
-
- return name;
-}
\f
void
tdep->fpregset = &sparc32_sol2_fpregset;
tdep->sizeof_fpregset = 400;
- /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO)
- compiler puts out 0 instead of the address in N_SO stabs. Starting with
- SunPRO 3.0, the compiler does this for N_FUN stabs too. */
- set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
-
- /* The Sun compilers also do "globalization"; see the comment in
- sparc_sol2_static_transform_name for more information. */
- set_gdbarch_static_transform_name
- (gdbarch, sparc_sol2_static_transform_name);
+ sol2_init_abi (info, gdbarch);
/* Solaris has SVR4-style shared libraries... */
set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
- set_gdbarch_skip_solib_resolver (gdbarch, sol2_skip_solib_resolver);
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
set_gdbarch_software_single_step (gdbarch, NULL);
frame_unwind_append_unwinder (gdbarch, &sparc32_sol2_sigtramp_frame_unwind);
-
- /* How to print LWP PTIDs from core files. */
- set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str);
}
void _initialize_sparc_sol2_tdep ();
extern const struct sparc_gregmap sparc32_sol2_gregmap;
extern const struct sparc_fpregmap sparc32_sol2_fpregmap;
-extern int sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name);
-
-extern const char *sparc_sol2_static_transform_name (const char *name);
-
extern void sparc32_sol2_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch);
struct frame_info *this_frame,
void **this_cache)
{
- CORE_ADDR pc = get_frame_pc (this_frame);
- const char *name;
-
- find_pc_partial_function (pc, &name, NULL, NULL);
- if (sparc_sol2_pc_in_sigtramp (pc, name))
- return 1;
-
- return 0;
+ return sol2_sigtramp_p (this_frame);
}
+
static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind =
{
SIGTRAMP_FRAME,
sparc64_init_abi (info, gdbarch);
- /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO)
- compiler puts out 0 instead of the address in N_SO stabs. Starting with
- SunPRO 3.0, the compiler does this for N_FUN stabs too. */
- set_gdbarch_sofun_address_maybe_missing (gdbarch, 1);
-
- /* The Sun compilers also do "globalization"; see the comment in
- sparc_sol2_static_transform_name for more information. */
- set_gdbarch_static_transform_name
- (gdbarch, sparc_sol2_static_transform_name);
+ sol2_init_abi (info, gdbarch);
/* Solaris has SVR4-style shared libraries... */
set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
- set_gdbarch_skip_solib_resolver (gdbarch, sol2_skip_solib_resolver);
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_lp64_fetch_link_map_offsets);
/* Solaris has kernel-assisted single-stepping support. */
set_gdbarch_software_single_step (gdbarch, NULL);
-
- /* How to print LWP PTIDs from core files. */
- set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str);
}
void _initialize_sparc64_sol2_tdep ();
projects / deliverable / binutils-gdb.git / commitdiff
