X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparc-sol2-tdep.c;h=1f9eb584e3e003ff550331b406d0e009f7c60665;hb=5436304513349c5447b61f8b5ed6c38d77c5f0d9;hp=10143bb67f90b979bfe08ee2dbd35d3a4d3ae8bb;hpb=a57e5a958357b2aaa76253b106eedf486734c876;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index 10143bb67f..1f9eb584e3 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -1,12 +1,13 @@
/* Target-dependent code for Solaris SPARC.
- Copyright 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009
+ 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,9 +16,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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "frame.h"
@@ -33,6 +32,7 @@
#include "gdb_assert.h"
#include "gdb_string.h"
+#include "sol2-tdep.h"
#include "sparc-tdep.h"
#include "solib-svr4.h"
@@ -70,11 +70,12 @@ int
sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name)
{
return (name && (strcmp (name, "sigacthandler") == 0
- || strcmp (name, "ucbsigvechandler") == 0));
+ || strcmp (name, "ucbsigvechandler") == 0
+ || strcmp (name, "__sighndlr") == 0));
}
static struct sparc_frame_cache *
-sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame,
+sparc32_sol2_sigtramp_frame_cache (struct frame_info *this_frame,
void **this_cache)
{
struct sparc_frame_cache *cache;
@@ -84,16 +85,16 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame,
if (*this_cache)
return *this_cache;
- cache = sparc_frame_cache (next_frame, this_cache);
+ cache = sparc_frame_cache (this_frame, this_cache);
gdb_assert (cache == *this_cache);
- cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+ cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
/* The third argument is a pointer to an instance of `ucontext_t',
which has a member `uc_mcontext' that contains the saved
registers. */
regnum = (cache->frameless_p ? SPARC_O2_REGNUM : SPARC_I2_REGNUM);
- mcontext_addr = frame_unwind_register_unsigned (next_frame, regnum) + 40;
+ mcontext_addr = get_frame_register_unsigned (this_frame, regnum) + 40;
cache->saved_regs[SPARC32_PSR_REGNUM].addr = mcontext_addr + 0 * 4;
cache->saved_regs[SPARC32_PC_REGNUM].addr = mcontext_addr + 1 * 4;
@@ -105,7 +106,7 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame,
regnum <= SPARC_O7_REGNUM; regnum++, addr += 4)
cache->saved_regs[regnum].addr = addr;
- if (get_frame_memory_unsigned (next_frame, mcontext_addr + 19 * 4, 4))
+ if (get_frame_memory_unsigned (this_frame, mcontext_addr + 19 * 4, 4))
{
/* The register windows haven't been flushed. */
for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++)
@@ -114,7 +115,7 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame,
else
{
addr = cache->saved_regs[SPARC_SP_REGNUM].addr;
- addr = get_frame_memory_unsigned (next_frame, addr, 4);
+ addr = get_frame_memory_unsigned (this_frame, addr, 4);
for (regnum = SPARC_L0_REGNUM;
regnum <= SPARC_I7_REGNUM; regnum++, addr += 4)
cache->saved_regs[regnum].addr = addr;
@@ -124,49 +125,80 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame,
}
static void
-sparc32_sol2_sigtramp_frame_this_id (struct frame_info *next_frame,
+sparc32_sol2_sigtramp_frame_this_id (struct frame_info *this_frame,
void **this_cache,
struct frame_id *this_id)
{
struct sparc_frame_cache *cache =
- sparc32_sol2_sigtramp_frame_cache (next_frame, this_cache);
+ sparc32_sol2_sigtramp_frame_cache (this_frame, this_cache);
(*this_id) = frame_id_build (cache->base, cache->pc);
}
-static void
-sparc32_sol2_sigtramp_frame_prev_register (struct frame_info *next_frame,
+static struct value *
+sparc32_sol2_sigtramp_frame_prev_register (struct frame_info *this_frame,
void **this_cache,
- int regnum, int *optimizedp,
- enum lval_type *lvalp,
- CORE_ADDR *addrp,
- int *realnump, void *valuep)
+ int regnum)
{
struct sparc_frame_cache *cache =
- sparc32_sol2_sigtramp_frame_cache (next_frame, this_cache);
+ sparc32_sol2_sigtramp_frame_cache (this_frame, this_cache);
+
+ return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum);
+}
+
+static int
+sparc32_sol2_sigtramp_frame_sniffer (const struct frame_unwind *self,
+ struct frame_info *this_frame,
+ void **this_cache)
+{
+ CORE_ADDR pc = get_frame_pc (this_frame);
+ char *name;
+
+ find_pc_partial_function (pc, &name, NULL, NULL);
+ if (sparc_sol2_pc_in_sigtramp (pc, name))
+ return 1;
- trad_frame_prev_register (next_frame, cache->saved_regs, regnum,
- optimizedp, lvalp, addrp, realnump, valuep);
+ return 0;
}
static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind =
{
SIGTRAMP_FRAME,
sparc32_sol2_sigtramp_frame_this_id,
- sparc32_sol2_sigtramp_frame_prev_register
+ sparc32_sol2_sigtramp_frame_prev_register,
+ NULL,
+ sparc32_sol2_sigtramp_frame_sniffer
};
-static const struct frame_unwind *
-sparc32_sol2_sigtramp_frame_sniffer (struct frame_info *next_frame)
-{
- CORE_ADDR pc = frame_pc_unwind (next_frame);
- char *name;
+/* Unglobalize NAME. */
- find_pc_partial_function (pc, &name, NULL, NULL);
- if (sparc_sol2_pc_in_sigtramp (pc, name))
- return &sparc32_sol2_sigtramp_frame_unwind;
+char *
+sparc_sol2_static_transform_name (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 distrubuted
+ 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=". The globalization prefix always seems to start
+ with a dollar sign '$'; a dot '.' is used as a seperator. So we
+ simply strip everything up until the last dot. */
+
+ if (name[0] == '$')
+ {
+ char *p = strrchr (name, '.');
+ if (p)
+ return p + 1;
+ }
- return NULL;
+ return name;
}
@@ -175,9 +207,19 @@ sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (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);
+
/* Solaris has SVR4-style shared libraries... */
- set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
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);
@@ -188,7 +230,7 @@ sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* Solaris has kernel-assisted single-stepping support. */
set_gdbarch_software_single_step (gdbarch, NULL);
- frame_unwind_append_sniffer (gdbarch, sparc32_sol2_sigtramp_frame_sniffer);
+ frame_unwind_append_unwinder (gdbarch, &sparc32_sol2_sigtramp_frame_unwind);
}