* sparc64obsd-tdep.c: Include "gdbcore.h", "regcache.h" amd
"bsd-uthread.h". (SPARC64OBSD_UTHREAD_FP_OFFSET, SPARC64OBSD_UTHREAD_PC_OFFSET): New defines. (sparc64obsd_supply_uthread, sparc64obsd_collect_uthread): New functions. (sparc64obsd_init_abi): Set supply_uthread and collect_uthread. * Makefile.in (sparc64obsd-tdep.o): Update dependencies.
This commit is contained in:
parent
79ffea3ba3
commit
585e38edb9
3 changed files with 104 additions and 4 deletions
|
@ -1,5 +1,14 @@
|
|||
2005-12-27 Mark Kettenis <kettenis@gnu.org>
|
||||
|
||||
* sparc64obsd-tdep.c: Include "gdbcore.h", "regcache.h" amd
|
||||
"bsd-uthread.h".
|
||||
(SPARC64OBSD_UTHREAD_FP_OFFSET, SPARC64OBSD_UTHREAD_PC_OFFSET):
|
||||
New defines.
|
||||
(sparc64obsd_supply_uthread, sparc64obsd_collect_uthread): New
|
||||
functions.
|
||||
(sparc64obsd_init_abi): Set supply_uthread and collect_uthread.
|
||||
* Makefile.in (sparc64obsd-tdep.o): Update dependencies.
|
||||
|
||||
* sparcobsd-tdep.c: Include "gdbcore.h", "regcache.h" and
|
||||
"bsd-uthread.h".
|
||||
(SPARC32OBSD_UTHREAD_FP_OFFSET, SPARC32OBSD_UTHREAD_PC_OFFSET):
|
||||
|
|
|
@ -2604,9 +2604,9 @@ sparc64nbsd-tdep.o: sparc64nbsd-tdep.c $(defs_h) $(frame_h) \
|
|||
$(symtab_h) $(objfiles_h) $(solib_svr4_h) $(trad_frame_h) \
|
||||
$(gdb_assert_h) $(gdb_string_h) $(sparc64_tdep_h) $(nbsd_tdep_h)
|
||||
sparc64obsd-tdep.o: sparc64obsd-tdep.c $(defs_h) $(frame_h) \
|
||||
$(frame_unwind_h) $(osabi_h) $(regset_h) $(symtab_h) $(objfiles_h) \
|
||||
$(solib_svr4_h) $(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) \
|
||||
$(sparc64_tdep_h)
|
||||
$(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) $(regset_h) \
|
||||
$(symtab_h) $(objfiles_h) $(trad_frame_h) $(gdb_assert_h) \
|
||||
$(obsd_tdep_h) $(sparc64_tdep_h) $(solib_svr4_h) $(bsd_uthread_h)
|
||||
sparc64-sol2-tdep.o: sparc64-sol2-tdep.c $(defs_h) $(frame_h) \
|
||||
$(frame_unwind_h) $(gdbarch_h) $(symtab_h) $(objfiles_h) $(osabi_h) \
|
||||
$(trad_frame_h) $(gdb_assert_h) $(sparc64_tdep_h) $(solib_svr4_h)
|
||||
|
|
|
@ -22,17 +22,20 @@
|
|||
#include "defs.h"
|
||||
#include "frame.h"
|
||||
#include "frame-unwind.h"
|
||||
#include "gdbcore.h"
|
||||
#include "osabi.h"
|
||||
#include "regcache.h"
|
||||
#include "regset.h"
|
||||
#include "symtab.h"
|
||||
#include "objfiles.h"
|
||||
#include "solib-svr4.h"
|
||||
#include "trad-frame.h"
|
||||
|
||||
#include "gdb_assert.h"
|
||||
|
||||
#include "obsd-tdep.h"
|
||||
#include "sparc64-tdep.h"
|
||||
#include "solib-svr4.h"
|
||||
#include "bsd-uthread.h"
|
||||
|
||||
/* OpenBSD uses the traditional NetBSD core file format, even for
|
||||
ports that use ELF. The core files don't use multiple register
|
||||
|
@ -200,6 +203,90 @@ sparc64obsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
|
|||
}
|
||||
|
||||
|
||||
/* Threads support. */
|
||||
|
||||
/* Offset wthin the thread structure where we can find %fp and %i7. */
|
||||
#define SPARC64OBSD_UTHREAD_FP_OFFSET 232
|
||||
#define SPARC64OBSD_UTHREAD_PC_OFFSET 240
|
||||
|
||||
static void
|
||||
sparc64obsd_supply_uthread (struct regcache *regcache,
|
||||
int regnum, CORE_ADDR addr)
|
||||
{
|
||||
CORE_ADDR fp, fp_addr = addr + SPARC64OBSD_UTHREAD_FP_OFFSET;
|
||||
gdb_byte buf[8];
|
||||
|
||||
gdb_assert (regnum >= -1);
|
||||
|
||||
fp = read_memory_unsigned_integer (fp_addr, 8);
|
||||
if (regnum == SPARC_SP_REGNUM || regnum == -1)
|
||||
{
|
||||
store_unsigned_integer (buf, 8, fp);
|
||||
regcache_raw_supply (regcache, SPARC_SP_REGNUM, buf);
|
||||
|
||||
if (regnum == SPARC_SP_REGNUM)
|
||||
return;
|
||||
}
|
||||
|
||||
if (regnum == SPARC64_PC_REGNUM || regnum == SPARC64_NPC_REGNUM
|
||||
|| regnum == -1)
|
||||
{
|
||||
CORE_ADDR i7, i7_addr = addr + SPARC64OBSD_UTHREAD_PC_OFFSET;
|
||||
|
||||
i7 = read_memory_unsigned_integer (i7_addr, 8);
|
||||
if (regnum == SPARC64_PC_REGNUM || regnum == -1)
|
||||
{
|
||||
store_unsigned_integer (buf, 8, i7 + 8);
|
||||
regcache_raw_supply (regcache, SPARC64_PC_REGNUM, buf);
|
||||
}
|
||||
if (regnum == SPARC64_NPC_REGNUM || regnum == -1)
|
||||
{
|
||||
store_unsigned_integer (buf, 8, i7 + 12);
|
||||
regcache_raw_supply (regcache, SPARC64_NPC_REGNUM, buf);
|
||||
}
|
||||
|
||||
if (regnum == SPARC64_PC_REGNUM || regnum == SPARC64_NPC_REGNUM)
|
||||
return;
|
||||
}
|
||||
|
||||
sparc_supply_rwindow (regcache, fp, regnum);
|
||||
}
|
||||
|
||||
static void
|
||||
sparc64obsd_collect_uthread(const struct regcache *regcache,
|
||||
int regnum, CORE_ADDR addr)
|
||||
{
|
||||
CORE_ADDR sp;
|
||||
gdb_byte buf[8];
|
||||
|
||||
gdb_assert (regnum >= -1);
|
||||
|
||||
if (regnum == SPARC_SP_REGNUM || regnum == -1)
|
||||
{
|
||||
CORE_ADDR fp_addr = addr + SPARC64OBSD_UTHREAD_FP_OFFSET;
|
||||
|
||||
regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
|
||||
write_memory (fp_addr,buf, 8);
|
||||
}
|
||||
|
||||
if (regnum == SPARC64_PC_REGNUM || regnum == -1)
|
||||
{
|
||||
CORE_ADDR i7, i7_addr = addr + SPARC64OBSD_UTHREAD_PC_OFFSET;
|
||||
|
||||
regcache_raw_collect (regcache, SPARC64_PC_REGNUM, buf);
|
||||
i7 = extract_unsigned_integer (buf, 8) - 8;
|
||||
write_memory_unsigned_integer (i7_addr, 8, i7);
|
||||
|
||||
if (regnum == SPARC64_PC_REGNUM)
|
||||
return;
|
||||
}
|
||||
|
||||
regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
|
||||
sp = extract_unsigned_integer (buf, 8);
|
||||
sparc_collect_rwindow (regcache, sp, regnum);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
{
|
||||
|
@ -216,6 +303,10 @@ sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|||
set_solib_svr4_fetch_link_map_offsets
|
||||
(gdbarch, svr4_lp64_fetch_link_map_offsets);
|
||||
set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
|
||||
|
||||
/* OpenBSD provides a user-level threads implementation. */
|
||||
bsd_uthread_set_supply_uthread (gdbarch, sparc64obsd_supply_uthread);
|
||||
bsd_uthread_set_collect_uthread (gdbarch, sparc64obsd_collect_uthread);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue