From 04ad8754cc4783323fbc99575fb198a661e02226 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 3 Jan 2004 10:08:45 +0000 Subject: * Makefile.in (ALLDEPFILES): Remove sparc-linux-nat.c and sparcl-tdep.c. Add sparc-linux-tdep.c, sparc-sol2-nat.c, sparc-sol2-tdep.c, sparc-sol2-nat.c, sparc-sol2-tdep.c, sparc64-linux-nat.c, sparc64-linux-tdep.c, sparc64-nat.c, sparc64-sol2-tdep.c, sparc64-tdep.c, sparc64fbsd-nat.c, sparc64fbsd-tdep.c, sparcnbsd-nat.c, sparcnbsd-tdep.c. (sparc_nat_h): New variable. (sparcbsd_nat_h, sparcnbsd_tdep_h): Remove variables. (tm-sun4os4.h): Remove dependency. (sparcbsd-nat.o, sparc-linux-nat.o): Remove dependencies. (sparc64fbsd-nat.o, sparc64fbsd-tdep.o, sparc64nbsd-nat.o, sparc64-tdep.o, sparc-nat.o, sparcnbsd-nat.o, sparcnbsd-tdep.o, sparc-tdep.o): Update dependencies. (sparc-linux-tdep.o, sparc-sol2-nat.o, sparc-sol2-tdep.o, sparc64-linux-nat.o, sparc64-linux-tdep.o, sparc64-nat.o, sparc64-sol2-tdep.o, sparc64-tdep.o, sparc64nbsd-tdep.o): New dependencies. * configure.host: Remove existing sparc-*-lynxos*, sparc-*-solaris*, sparc-*-sunos4*, sparc-*-sunos5*, sparc-*-*, ultrasparc-*-freebsd, sparcv9-*-freebsd, sparc64-*-linux*, sparcv9-*-* and sparc64-*-* triplets. Add new sparc64-*-linux*, sparc-*-solaris2*, sparcv9-*-solaris2* and sparc64-*-solaris2* triplets. * configure.tgt: Remove exitsing sparc-*-aout*, sparc-*-coff*, sparc-*-elf*, sparc*-lynxos*, sparc-*-solars2*, sparc-*-sunos4*, sparc-*-sunos5*, sparc-*-vxworks*, sparc64-*linux*, sparc64-*-*, sparcv9-*-* and commented out sparc64-*-solars2* triplets. Add new sparc-*-solaris2.[0-6], sparc-*-solaris2.[0-6].*, sparc64-*-linux, sparc-*-solaris2*, sparcv9-*-solaris*, sparc64-*-solaris2* and sparc64-*-* triplets. * sparc64-tdep.c: Update copyright year. Include "inferior.h", "symtab.h" and "objfiles.h". (BIAS): Remove define. (X_OP, X_RD, X_A, X_COND, X_OP2, X_IMM22, X_OP3, X_I, X_DISP22) (X_DISP19): Remove macros. (sparc_fetch_instruction): Remove function. (struct gdbarch_tdep): Remove definition. (SPARC64_NUM_REGS, SPARC64_NUM_PSEUDO_REGS): Use ARRAY_SIZE. (sparc_breakpoint_from_pc): Remove function. (struct sparc64_frame_cache): Remove definition. (sparc64_alloc_frame_cache, sparc64_analyze_prologue, sparc64_unwind_pc): Remove functions. (sparc64_skip_prologue): Use `struct sparc_frame_cache' instead of `struct sparc64_frame_cache. Call sparc_analyze_prologue instead of sparc64_analyze_prologue. Mark constant as ULL instead of UL. (sparc64_frame_cache): Change return type to `struct sparc_frame_cache *'. Simply call sparc_frame_cache. (sparc64_frame_this_id, sparc64_frame_prev_register, sparc64_frame_base_address): Use `struct sparc_frame_cache' instead of `struct sparc64_frame_cache. (sparc_unwind_dummy_id, sparc_extract_struct_value_address, sparc_analyze_control_transfer, sparc_software_single_step, sparc64_gdbarch_init, sparc_supply_rwindow, sparc_fill_rwindow, _initialize_sparc64_tdep): Remove functions. (TSTATE_CWP, TSTATE_ICC, TSTATE_XCC): New macros. (PSR_S, PSR_ICC, PSR_VERS, PSR_IMPL, PSR_V8PLUS, PSR_XCC): New macros. (sparc64_supply_gregset, sparc64_collect_gregset, sparc64_supply_fpregset, sparc64_collect_fpregset): New functions. (sparc64_init_abi): New function. * sparc64-tdep.h: Update copyright year. Fix typo in multiple inclusion guard. Include "sparc-tdep.h". (BIAS): Define. (r_tstate_offset, r_fprs_offset): New defines. (enum sparc_regnum): Remove defenition. (enum sparc64_regnum): Reformat. (sparc_supply_rwindow, sparc_fill_rwindow): Remove prototypes. (sparc64_init_abi, sparc64_supply_gregset, sparc64_collect_gregset, sparc64_supply_fpregset, sparc64_collect_fpregset): New prototypes. (sparc64_sol2_gregset, sparc64nbsd_gregset, sparc64fbsd_gregset): Add extern declarations. (sparc64_sol2_init_abi): New prototype. (sparc64fbsd_supply_reg, sparc64fbsd_fill_reg) (sparc64fbsd_supply_fpreg, sparc64fbsd_fill_fpreg): Remove prototypes. * sparc64fbsd-nat.c: Include "sparc-nat.h", don't include "sparnbsd-nat.h". (sparc64fbsd_reg_supplies_p, sparc64fbsd_fpreg_supplies_p): Remove functions. (_initialize_sparc64fbsd_nat): Remove initialization of sparcbsd_supply_reg, sparcbsd_fill_reg, sparcbsd_supply_fpreg, sparcbsd_fill_fpreg, sparcbsd_reg_supplies_p, sparcbsd_fpreg_supplies_p. Initialize sparc_gregset. * sparc64fbsd-tdep.c: Update copyright year. Include "frame.h", "frame-unwind.h", "trad-frame.h" and "gdb_assert.h". (sparc64fbsd_r_global_offset, sparc64fbsd_r_out_offset) (sparc64fbsd_r_fprs_offset, sparc64fbsd_r_tnpc_offset) (sparc64fbsd_r_tpc_offset, sparc64fbsd_r_tstate_offset) (sparc64fbsd_r_y_offset): Remove variables. (sparc64fbsd_sizeof_struct_reg, sparc64fbsd_sizeof_struct_fpreg): Make static and const. (sparc64fbsd_supply_reg, sparc64fbsd_fill_reg) (sparc64fbsd_supply_fpreg, sparc64fbsd_fill_fpreg): Remove functions. (sparc64fbsd_gregset): New variable. (fetch_core_registers): Replace calls to sparc64fbsd_supply_reg and sparc64fbsd_supply_fpreg with calls to sparc64_supply_gregset and sparc64_supply_fpregset. (sparc64fbsd_pc_in_sigtramp, sparc64fbsd_sigtramp_frame_cache) (sparc64fbsd_sigtramp_frame_this_id) (sparc64fbsd_sigtramp_frame_prev_register): New functions. (sparc64fbsd_sigtramp_frame_unwind): New variable. (sparc64fbsd_sigtramp_frame_sniffer): New function. (sparc64fbsd_init_abi): Set pc_in_sigtramp, append sparc64fbsd_sigtramp_frame_sniffer. Call sparc64_init_abi. * sparcnbsd-tdep.c: Update copyright year. Include "floatformat.h", "frame.h", "frame-unwind.h", "symtab.h", "trad-frame.h" and "gdb_assert.h", don't include "target.h", "value.h" and "sparcnbsd-tdep.h". (REG32_OFFSET_PSR, REG32_OFFSET_PC, REG32_OFFSET_NPC) (REG32_OFFSET_Y, REG32_OFFSET_GLOBAL, REG32_OFFSET_OUT) (REG64_OFFSET_TSTATE, REG64_OFFSET_PC, REG64_OFFSET_NPC) (REG64_OFFSET_Y, REG64_OFFSET_GLOBAL, REG64_OFFSET_OUT): Remove defines. (sparcnbsd_gregset): New variable. (sparcnbsd_supply_reg32, sparcnbsd_supply_reg64) (sparcnbsd_fill_reg32, sparcnbsd_fill_reg64) (sparcnbsd_supply_fpreg32, sparcnbsd_supply_fpreg64) (sparcnbsd_fill_reg32, sparcnbsd_fill_reg64): Remove functions. (sparc32nbsd_sigtramp_start, sparc32nbsd_sigtramp_end): New variables. (sparc32nbsd_pc_in_sigtramp, sparc32nbsd_sigcontext_frame_cache) (sparc32nbsd_sigcontext_frame_this_id) (sparc32nbsd_sigcontext_frame_prev_register): New functions. (sparc32nbsd_sigcontext_frame_unwind): New variable. (sparc32nbsd_sigtramp_frame_sniffer): New function. (sparcnbsd_get_longjmp_target_32, sparcnbsd_get_longjmp_target_64): Remove functions. (sparcnbsd_aout_in_solib_call_trampoline): Rewrite. (sparcnbsd_init_abi_common, sparcnbsd_init_aout, sparcnbsd_init_elf): Remove. (sparcnbsd_init_abi, sparcnbsd_aout_init_abi) (sparcnbsd_elf_init_abi): New functions. (_initialize_sparcnbsd_tdep): New prototype. (_initialize_sparnbsd_tdep): Update. * config/sparc/fbsd.mh (NATDEPFILES): Remove sparcbsd-nat.o and corelow.o. Add sparc64-nat.o and sparc-nat.o. * config/sparc/fbsd.mt (TDEPFILES): Add sparc-tdep.o and corelow.o. * config/sparc/linux.mh: Update comment. (XM_FILE, HOST_IPC): Remove variables. (NATDEPFILES): Add sparc-sol2-nat.o and core-regset.o. Remove sparc-linux-nat.o. * config/sparc/linux.mt: Update comment. (TDEPFILES): Add sparc-sol2-tdep.o and sparc-linux-tdep.o. * config/sparc/nbsd.mt: Reformat. * config/sparc/nbsd64.mh: Update comment. (NATDEPFILES): Add sparc-nat.o. * config/sparc/nbsd64.mt: Update comment. (TDEPFILES): Add sparc64-tdep.o and sparc64nbsd-tdep.o. (TM_FILE): Set to tm-nbsd.h. * config/sparc/nbsdelf.mh: Update comment. (NATDEPFILES): Add sparc-nat.o. (XM_FILE): Delete. * config/sparc/nbsdaout.mh: Update comment. (NATDEPFILES): Add sparc-nat.o (XM_FILE): Delete. * config/sparc/nm-linux.h: Update copyright year. Don't include "config/nm-svr4.h" and "solib.h". Add protection against multiple inclusion. (KERNEL_U_SIZE): Remove define. (kernel_u_size): Remove prototype. (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Define. * config/sparc/nm-nbsd.h: Update copyright. Don't include "regcache.h". (CHILD_PREPARE_TO_STORE): Remove define. * config/sparc/nm-nbsdaout.h: Tweak some comments. * sparc-nat.c, sparc-tdep.c, sparc-tdep.h, sparc64nbsd-nat.c, sparcnbsd-nat.c: Rewrite files. * config/sparc/tm-linux.h, config/sparc/tm-nbsd.h: Rewrite files. * sparc-linux-nat.c, sparcbsd-nat.c, sparcbsd-nat.h, sparcnbsd-tdep.h: Remove files. * config/sparc/nm-sparclynx.h, config/sparc/nm-sun4os4.h, config/sparc/nm-sun4sol2.h, config/sparc/sp64.mt, config/sparc/sp64linux.mt, config/sparc/sp64sol2.mt, config/sparc/sparc-em.mt, config/sparc/sparclynx.mh, config/sparc/sparclynx.mt, config/sparc/sun4os4.mh, config/sparc/sun4os4.mt, config/sparc/sun4sol2.mh, config/sparc/sun4sol2.mt, config/sparc/tm-sp64.h, config/sparc/tm-sp64linux.h, config/sparc/tm-sparc.h, config/sparc/tm-sparclynx.h, config/sparc/tm-spc-em.h, config/sparc/tm-sun4os4.h, config/sparc/tm-sun4sol2.h, config/sparc/tm-vxsparc.h, config/sparc/vxsparc.mt, config/sparc/xm-linux.h, config/sparc/xm-sun4sol2.h: Remove files. * sparc-linux-tdep.c, sparc-nat.h, sparc-sol2-nat.c, sparc-sol2-tdep.c, sparc64-linux-nat.c, sparc64-linux-t dep.c, sparc64-nat.c, sparc64-sol2-tdep.c, sparc64nbsd-tdep.c: New files. * config/sparc/linux64.mh, config/sparc/linux64.mt, config/sparc/nm-sol2.h, config/sparc/sol2-64.mt, config/sparc/sol2.mh, config/sparc/sol2.mt, config/sparc/sparc.mt, config/sparc/sparc64.mt, config/sparc/tm-sol2.h: New files. --- gdb/sparcnbsd-tdep.c | 607 +++++++++++++++++---------------------------------- 1 file changed, 197 insertions(+), 410 deletions(-) (limited to 'gdb/sparcnbsd-tdep.c') diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c index f2595074048..cbee85bd6b1 100644 --- a/gdb/sparcnbsd-tdep.c +++ b/gdb/sparcnbsd-tdep.c @@ -1,5 +1,6 @@ -/* Target-dependent code for SPARC systems running NetBSD. - Copyright 2002, 2003 Free Software Foundation, Inc. +/* Target-dependent code for NetBSD/sparc. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by Wasabi Systems, Inc. This file is part of GDB. @@ -20,394 +21,58 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include "floatformat.h" +#include "frame.h" +#include "frame-unwind.h" #include "gdbcore.h" -#include "regcache.h" -#include "target.h" -#include "value.h" #include "osabi.h" +#include "regcache.h" +#include "solib-svr4.h" +#include "symtab.h" +#include "trad-frame.h" +#include "gdb_assert.h" #include "gdb_string.h" #include "sparc-tdep.h" -#include "sparcnbsd-tdep.h" #include "nbsd-tdep.h" -#include "solib-svr4.h" - -#define REG32_OFFSET_PSR (0 * 4) -#define REG32_OFFSET_PC (1 * 4) -#define REG32_OFFSET_NPC (2 * 4) -#define REG32_OFFSET_Y (3 * 4) -#define REG32_OFFSET_GLOBAL (4 * 4) -#define REG32_OFFSET_OUT (12 * 4) - -#define REG64_OFFSET_TSTATE (0 * 8) -#define REG64_OFFSET_PC (1 * 8) -#define REG64_OFFSET_NPC (2 * 8) -#define REG64_OFFSET_Y (3 * 8) -#define REG64_OFFSET_GLOBAL (4 * 8) -#define REG64_OFFSET_OUT (12 * 8) - -void -sparcnbsd_supply_reg32 (char *regs, int regno) -{ - int i; - - if (regno == PS_REGNUM || regno == -1) - supply_register (PS_REGNUM, regs + REG32_OFFSET_PSR); - - if (regno == PC_REGNUM || regno == -1) - supply_register (PC_REGNUM, regs + REG32_OFFSET_PC); - - if (regno == DEPRECATED_NPC_REGNUM || regno == -1) - supply_register (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC); - - if (regno == Y_REGNUM || regno == -1) - supply_register (Y_REGNUM, regs + REG32_OFFSET_Y); - - if ((regno >= G0_REGNUM && regno <= G7_REGNUM) || regno == -1) - { - if (regno == G0_REGNUM || regno == -1) - supply_register (G0_REGNUM, NULL); /* %g0 is always zero */ - for (i = G1_REGNUM; i <= G7_REGNUM; i++) - { - if (regno == i || regno == -1) - supply_register (i, regs + REG32_OFFSET_GLOBAL + - ((i - G0_REGNUM) * 4)); - } - } - - if ((regno >= O0_REGNUM && regno <= O7_REGNUM) || regno == -1) - { - for (i = O0_REGNUM; i <= O7_REGNUM; i++) - { - if (regno == i || regno == -1) - supply_register (i, regs + REG32_OFFSET_OUT + - ((i - O0_REGNUM) * 4)); - } - } - - /* Inputs and Locals are stored onto the stack by by the kernel. */ - if ((regno >= L0_REGNUM && regno <= I7_REGNUM) || regno == -1) - { - CORE_ADDR sp = read_register (SP_REGNUM); - char buf[4]; - - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == i || regno == -1) - { - target_read_memory (sp + ((i - L0_REGNUM) * 4), - buf, sizeof (buf)); - supply_register (i, buf); - } - } - } - - /* FIXME: If we don't set these valid, read_register_bytes() rereads - all the regs every time it is called! */ - if (regno == WIM_REGNUM || regno == -1) - supply_register (WIM_REGNUM, NULL); - if (regno == TBR_REGNUM || regno == -1) - supply_register (TBR_REGNUM, NULL); - if (regno == CPS_REGNUM || regno == -1) - supply_register (CPS_REGNUM, NULL); -} - -void -sparcnbsd_supply_reg64 (char *regs, int regno) -{ - int i; - char buf[8]; - - if (regno == TSTATE_REGNUM || regno == -1) - supply_register (PS_REGNUM, regs + REG64_OFFSET_TSTATE); - - if (regno == PC_REGNUM || regno == -1) - supply_register (PC_REGNUM, regs + REG64_OFFSET_PC); - - if (regno == DEPRECATED_NPC_REGNUM || regno == -1) - supply_register (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC); - - if (regno == Y_REGNUM || regno == -1) - { - memset (buf, 0, sizeof (buf)); - memcpy (&buf[4], regs + REG64_OFFSET_Y, 4); - supply_register (Y_REGNUM, buf); - } - - if ((regno >= G0_REGNUM && regno <= G7_REGNUM) || regno == -1) - { - if (regno == G0_REGNUM || regno == -1) - supply_register (G0_REGNUM, NULL); /* %g0 is always zero */ - for (i = G1_REGNUM; i <= G7_REGNUM; i++) - { - if (regno == i || regno == -1) - supply_register (i, regs + REG64_OFFSET_GLOBAL + - ((i - G0_REGNUM) * 8)); - } - } - - if ((regno >= O0_REGNUM && regno <= O7_REGNUM) || regno == -1) - { - for (i = O0_REGNUM; i <= O7_REGNUM; i++) - { - if (regno == i || regno == -1) - supply_register (i, regs + REG64_OFFSET_OUT + - ((i - O0_REGNUM) * 8)); - } - } - - /* Inputs and Locals are stored onto the stack by by the kernel. */ - if ((regno >= L0_REGNUM && regno <= I7_REGNUM) || regno == -1) - { - CORE_ADDR sp = read_register (SP_REGNUM); - char buf[8]; - - if (sp & 1) - { - /* Registers are 64-bit. */ - sp += 2047; - - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == i || regno == -1) - { - target_read_memory (sp + ((i - L0_REGNUM) * 8), - buf, sizeof (buf)); - supply_register (i, buf); - } - } - } - else - { - /* Registers are 32-bit. Toss any sign-extension of the stack - pointer, clear out the top half of the temporary buffer, and - put the register value in the bottom half. */ - - sp &= 0xffffffffUL; - memset (buf, 0, sizeof (buf)); - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == i || regno == -1) - { - target_read_memory (sp + ((i - L0_REGNUM) * 4), - &buf[4], sizeof (buf)); - supply_register (i, buf); - } - } - } - } - - /* FIXME: If we don't set these valid, read_register_bytes() rereads - all the regs every time it is called! */ - if (regno == WIM_REGNUM || regno == -1) - supply_register (WIM_REGNUM, NULL); - if (regno == TBR_REGNUM || regno == -1) - supply_register (TBR_REGNUM, NULL); - if (regno == CPS_REGNUM || regno == -1) - supply_register (CPS_REGNUM, NULL); -} - -void -sparcnbsd_fill_reg32 (char *regs, int regno) -{ - int i; - - if (regno == PS_REGNUM || regno == -1) - regcache_collect (PS_REGNUM, regs + REG32_OFFSET_PSR); - - if (regno == PC_REGNUM || regno == -1) - regcache_collect (PC_REGNUM, regs + REG32_OFFSET_PC); - - if (regno == DEPRECATED_NPC_REGNUM || regno == -1) - regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC); - - if (regno == Y_REGNUM || regno == -1) - regcache_collect (Y_REGNUM, regs + REG32_OFFSET_Y); - - if ((regno >= G0_REGNUM && regno <= G7_REGNUM) || regno == -1) - { - /* %g0 is always zero */ - for (i = G1_REGNUM; i <= G7_REGNUM; i++) - { - if (regno == i || regno == -1) - regcache_collect (i, regs + REG32_OFFSET_GLOBAL + - ((i - G0_REGNUM) * 4)); - } - } - - if ((regno >= O0_REGNUM && regno <= O7_REGNUM) || regno == -1) - { - for (i = O0_REGNUM; i <= O7_REGNUM; i++) - { - if (regno == i || regno == -1) - regcache_collect (i, regs + REG32_OFFSET_OUT + - ((i - O0_REGNUM) * 4)); - } - } - - /* Responsibility for the stack regs is pushed off onto the caller. */ -} - -void -sparcnbsd_fill_reg64 (char *regs, int regno) -{ - int i; - - if (regno == TSTATE_REGNUM || regno == -1) - regcache_collect (TSTATE_REGNUM, regs + REG64_OFFSET_TSTATE); - - if (regno == PC_REGNUM || regno == -1) - regcache_collect (PC_REGNUM, regs + REG64_OFFSET_PC); - - if (regno == DEPRECATED_NPC_REGNUM || regno == -1) - regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC); - - if (regno == Y_REGNUM || regno == -1) - regcache_collect (Y_REGNUM, regs + REG64_OFFSET_Y); - - if ((regno >= G0_REGNUM && regno <= G7_REGNUM) || regno == -1) - { - /* %g0 is always zero */ - for (i = G1_REGNUM; i <= G7_REGNUM; i++) - { - if (regno == i || regno == -1) - regcache_collect (i, regs + REG64_OFFSET_GLOBAL + - ((i - G0_REGNUM) * 4)); - } - } - - if ((regno >= O0_REGNUM && regno <= O7_REGNUM) || regno == -1) - { - for (i = O0_REGNUM; i <= O7_REGNUM; i++) - { - if (regno == i || regno == -1) - regcache_collect (i, regs + REG64_OFFSET_OUT + - ((i - O0_REGNUM) * 4)); - } - } - - /* Responsibility for the stack regs is pushed off onto the caller. */ -} - -void -sparcnbsd_supply_fpreg32 (char *fpregs, int regno) +const struct sparc_gregset sparc32nbsd_gregset = { - int i; - - for (i = 0; i <= 31; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - supply_register (FP0_REGNUM + i, fpregs + (i * 4)); - } - - if (regno == FPS_REGNUM || regno == -1) - supply_register (FPS_REGNUM, fpregs + (32 * 4)); -} - -void -sparcnbsd_supply_fpreg64 (char *fpregs, int regno) -{ - int i; - - for (i = 0; i <= 31; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - supply_register (FP0_REGNUM + i, fpregs + (i * 4)); - } - - for (; i <= 47; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - supply_register (FP0_REGNUM + i, fpregs + (32 * 4) + (i * 8)); - } - - if (regno == FPS_REGNUM || regno == -1) - supply_register (FPS_REGNUM, fpregs + (32 * 4) + (16 * 8)); - - /* XXX %gsr */ -} - -void -sparcnbsd_fill_fpreg32 (char *fpregs, int regno) -{ - int i; - - for (i = 0; i <= 31; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - regcache_collect (FP0_REGNUM + i, fpregs + (i * 4)); - } - - if (regno == FPS_REGNUM || regno == -1) - regcache_collect (FPS_REGNUM, fpregs + (32 * 4)); -} - -void -sparcnbsd_fill_fpreg64 (char *fpregs, int regno) -{ - int i; - - for (i = 0; i <= 31; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - regcache_collect (FP0_REGNUM + i, fpregs + (i * 4)); - } - - for (; i <= 47; i++) - { - if (regno == (FP0_REGNUM + i) || regno == -1) - regcache_collect (FP0_REGNUM + i, fpregs + (32 * 4) + (i * 8)); - } - - if (regno == FPS_REGNUM || regno == -1) - regcache_collect (FPS_REGNUM, fpregs + (32 * 4) + (16 * 8)); + 0 * 4, /* %psr */ + 1 * 4, /* %pc */ + 2 * 4, /* %npc */ + 3 * 4, /* %y */ + -1, /* %wim */ + -1, /* %tbr */ + 5 * 4, /* %g1 */ + -1 /* %l0 */ +}; - /* XXX %gsr */ -} +/* Unlike other NetBSD implementations, the SPARC port historically + used .reg and .reg2 (see bfd/netbsd-core.c), and as such, we can + share one routine for a.out and ELF core files. */ -/* Unlike other NetBSD implementations, the SPARC port historically used - .reg and .reg2 (see bfd/netbsd-core.c), and as such, we can share one - routine for a.out and ELF core files. */ static void fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, CORE_ADDR ignore) { - int reg_size, fpreg_size; - - if (gdbarch_ptr_bit (current_gdbarch) == 32) - { - reg_size = (20 * 4); - fpreg_size = (33 * 4); - } - else - { - reg_size = (20 * 8); - fpreg_size = (64 * 4) - + 8 /* fsr */ - + 4 /* gsr */ - + 4; /* pad */ - } + int reg_size = 20 * 4; + int fpreg_size = 33 * 4; switch (which) { - case 0: /* Integer registers */ + case 0: /* Integer registers. */ if (core_reg_size != reg_size) warning ("Wrong size register set in core file."); - else if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_supply_reg32 (core_reg_sect, -1); - else - sparcnbsd_supply_reg64 (core_reg_sect, -1); + sparc32_supply_gregset (&sparc32nbsd_gregset, current_regcache, + -1, core_reg_sect); break; - case 2: /* Floating pointer registers */ + case 2: /* Floating pointer registers. */ if (core_reg_size != fpreg_size) warning ("Wrong size FP register set in core file."); - else if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_supply_fpreg32 (core_reg_sect, -1); - else - sparcnbsd_supply_fpreg64 (core_reg_sect, -1); + sparc32_supply_fpregset (current_regcache, -1, core_reg_sect); break; default: @@ -433,82 +98,200 @@ static struct core_fns sparcnbsd_elfcore_fns = fetch_core_registers, /* core_read_registers */ NULL }; + +/* Signal trampolines. */ + +/* The following variables describe the location of an on-stack signal + trampoline. The current values correspond to the memory layout for + NetBSD 1.3 and up. These shouldn't be necessary for NetBSD 2.0 and + up, since NetBSD uses signal trampolines provided by libc now. */ -/* FIXME: Need PC_IN_SIGTRAMP() support, but NetBSD/sparc signal trampolines - aren't easily identified. */ +static const CORE_ADDR sparc32nbsd_sigtramp_start = 0xeffffef0; +static const CORE_ADDR sparc32nbsd_sigtramp_end = 0xeffffff0; static int -sparcnbsd_get_longjmp_target_32 (CORE_ADDR *pc) +sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name) +{ + if (pc >= sparc32nbsd_sigtramp_start && pc < sparc32nbsd_sigtramp_end) + return 1; + + return nbsd_pc_in_sigtramp (pc, name); +} + +static struct sparc_frame_cache * +sparc32nbsd_sigcontext_frame_cache (struct frame_info *next_frame, + void **this_cache) { - CORE_ADDR jb_addr; - char buf[4]; + struct sparc_frame_cache *cache; + CORE_ADDR addr, sigcontext_addr; + LONGEST psr; + int regnum, delta; - jb_addr = read_register (O0_REGNUM); + if (*this_cache) + return *this_cache; - if (target_read_memory (jb_addr + 12, buf, sizeof (buf))) - return 0; + cache = sparc_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); - *pc = extract_unsigned_integer (buf, sizeof (buf)); + /* The registers are saved in bits and pieces scattered all over the + place. The code below records their location on the assumption + that the part of the signal trampoline that saves the state has + been executed. */ - return 1; + /* If we couldn't find the frame's function, we're probably dealing + with an on-stack signal trampoline. */ + if (cache->pc == 0) + { + cache->pc = sparc32nbsd_sigtramp_start; + + /* Since we couldn't find the frame's function, the cache was + initialized under the assumption that we're frameless. */ + cache->frameless_p = 0; + addr = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM); + cache->base = addr; + } + + cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); + + /* We find the appropriate instance of `struct sigcontext' at a + fixed offset in the signal frame. */ + sigcontext_addr = cache->base + 64 + 16; + + cache->saved_regs[SPARC_SP_REGNUM].addr = sigcontext_addr + 8; + cache->saved_regs[SPARC32_PC_REGNUM].addr = sigcontext_addr + 12; + cache->saved_regs[SPARC32_NPC_REGNUM].addr = sigcontext_addr + 16; + cache->saved_regs[SPARC32_PSR_REGNUM].addr = sigcontext_addr + 20; + cache->saved_regs[SPARC_G1_REGNUM].addr = sigcontext_addr + 24; + cache->saved_regs[SPARC_O0_REGNUM].addr = sigcontext_addr + 28; + + /* The remaining `global' registers and %y are saved in the `local' + registers. */ + delta = SPARC_L0_REGNUM - SPARC_G0_REGNUM; + for (regnum = SPARC_G2_REGNUM; regnum <= SPARC_G7_REGNUM; regnum++) + cache->saved_regs[regnum].realreg = regnum + delta; + cache->saved_regs[SPARC32_Y_REGNUM].realreg = SPARC_L1_REGNUM; + + /* The remaining `out' registers can be found in the current frame's + `in' registers. */ + delta = SPARC_I0_REGNUM - SPARC_O0_REGNUM; + for (regnum = SPARC_O1_REGNUM; regnum <= SPARC_O5_REGNUM; regnum++) + cache->saved_regs[regnum].realreg = regnum + delta; + cache->saved_regs[SPARC_O7_REGNUM].realreg = SPARC_I7_REGNUM; + + /* The `local' and `in' registers have been saved in the register + save area. */ + addr = cache->saved_regs[SPARC_SP_REGNUM].addr; + addr = get_frame_memory_unsigned (next_frame, addr, 4); + for (regnum = SPARC_L0_REGNUM; + regnum <= SPARC_I7_REGNUM; regnum++, addr += 4) + cache->saved_regs[regnum].addr = addr; + + /* The floating-point registers are only saved if the EF bit in %prs + has been set. */ + +#define PSR_EF 0x00001000 + + addr = cache->saved_regs[SPARC32_PSR_REGNUM].addr; + psr = get_frame_memory_unsigned (next_frame, addr, 4); + if (psr & PSR_EF) + { + CORE_ADDR sp; + + sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM); + cache->saved_regs[SPARC32_FSR_REGNUM].addr = sp + 96; + for (regnum = SPARC_F0_REGNUM, addr = sp + 96 + 8; + regnum <= SPARC_F31_REGNUM; regnum++, addr += 4) + cache->saved_regs[regnum].addr = addr; + } + + return cache; } -static int -sparcnbsd_get_longjmp_target_64 (CORE_ADDR *pc) +static void +sparc32nbsd_sigcontext_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc32nbsd_sigcontext_frame_cache (next_frame, this_cache); + + (*this_id) = frame_id_build (cache->base, cache->pc); +} + +static void +sparc32nbsd_sigcontext_frame_prev_register (struct frame_info *next_frame, + void **this_cache, + int regnum, int *optimizedp, + enum lval_type *lvalp, + CORE_ADDR *addrp, + int *realnump, void *valuep) { - CORE_ADDR jb_addr; - char buf[8]; + struct sparc_frame_cache *cache = + sparc32nbsd_sigcontext_frame_cache (next_frame, this_cache); - jb_addr = read_register (O0_REGNUM); + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} - if (target_read_memory (jb_addr + 16, buf, sizeof (buf))) - return 0; +static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc32nbsd_sigcontext_frame_this_id, + sparc32nbsd_sigcontext_frame_prev_register +}; - *pc = extract_unsigned_integer (buf, sizeof (buf)); +static const struct frame_unwind * +sparc32nbsd_sigtramp_frame_sniffer (struct frame_info *next_frame) +{ + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; - return 1; + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc32nbsd_pc_in_sigtramp (pc, name)) + { + if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21)) + return &sparc32nbsd_sigcontext_frame_unwind; + } + + return NULL; } + + +/* Return non-zero if we are in a shared library trampoline code stub. */ static int sparcnbsd_aout_in_solib_call_trampoline (CORE_ADDR pc, char *name) { - if (strcmp (name, "_DYNAMIC") == 0) - return 1; - - return 0; + return (name && !strcmp (name, "_DYNAMIC")); } static void -sparcnbsd_init_abi_common (struct gdbarch_info info, - struct gdbarch *gdbarch) +sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - set_gdbarch_get_longjmp_target (gdbarch, gdbarch_ptr_bit (gdbarch) == 32 ? - sparcnbsd_get_longjmp_target_32 : - sparcnbsd_get_longjmp_target_64); + /* NetBSD doesn't support the 128-bit `long double' from the psABI. */ + set_gdbarch_long_double_bit (gdbarch, 64); + set_gdbarch_long_double_format (gdbarch, &floatformat_ieee_double_big); + + set_gdbarch_pc_in_sigtramp (gdbarch, sparc32nbsd_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc32nbsd_sigtramp_frame_sniffer); } static void -sparcnbsd_init_abi_aout (struct gdbarch_info info, - struct gdbarch *gdbarch) +sparc32nbsd_aout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - sparcnbsd_init_abi_common (info, gdbarch); + sparc32nbsd_init_abi (info, gdbarch); - set_gdbarch_in_solib_call_trampoline (gdbarch, - sparcnbsd_aout_in_solib_call_trampoline); + set_gdbarch_in_solib_call_trampoline + (gdbarch, sparcnbsd_aout_in_solib_call_trampoline); } static void -sparcnbsd_init_abi_elf (struct gdbarch_info info, - struct gdbarch *gdbarch) +sparc32nbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - sparcnbsd_init_abi_common (info, gdbarch); + sparc32nbsd_init_abi (info, gdbarch); - set_gdbarch_pc_in_sigtramp (gdbarch, nbsd_pc_in_sigtramp); - - set_solib_svr4_fetch_link_map_offsets (gdbarch, - gdbarch_ptr_bit (gdbarch) == 32 ? - nbsd_ilp32_solib_svr4_fetch_link_map_offsets : - nbsd_lp64_solib_svr4_fetch_link_map_offsets); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets); } static enum gdb_osabi @@ -520,6 +303,10 @@ sparcnbsd_aout_osabi_sniffer (bfd *abfd) return GDB_OSABI_UNKNOWN; } + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparcnbsd_tdep (void); + void _initialize_sparnbsd_tdep (void) { @@ -527,9 +314,9 @@ _initialize_sparnbsd_tdep (void) sparcnbsd_aout_osabi_sniffer); gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD_AOUT, - sparcnbsd_init_abi_aout); + sparc32nbsd_aout_init_abi); gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD_ELF, - sparcnbsd_init_abi_elf); + sparc32nbsd_elf_init_abi); add_core_fns (&sparcnbsd_core_fns); add_core_fns (&sparcnbsd_elfcore_fns); -- cgit v1.2.1