diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2004-01-03 10:08:45 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@gnu.org> | 2004-01-03 10:08:45 +0000 |
| commit | 04ad8754cc4783323fbc99575fb198a661e02226 (patch) | |
| tree | aca71db7402c8e26a38869bee491a04e4c020276 | |
| parent | d18092c89d88905612e0180f4bfc09ce990b4375 (diff) | |
| download | gdb-04ad8754cc4783323fbc99575fb198a661e02226.tar.gz | |
* 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.
72 files changed, 3841 insertions, 6002 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 49e19ac2b24..b5762c86de9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,197 @@ +2004-01-02 Mark Kettenis <kettenis@gnu.org> + + * 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. + 2004-01-02 Andrew Cagney <cagney@redhat.com> From 2003-12-18 Kazuhiro Inaoka: diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 4f8fa045aa8..dbea94c40f3 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -755,10 +755,9 @@ solib_svr4_h = solib-svr4.h solist_h = solist.h somsolib_h = somsolib.h source_h = source.h -sparc64_tdep_h = sparc64-tdep.h -sparcbsd_nat_h = sparcbsd-nat.h -sparcnbsd_tdep_h = sparcnbsd-tdep.h +sparc_nat_h = sparc-nat.h sparc_tdep_h = sparc-tdep.h +sparc64_tdep_h = sparc64-tdep.h srec_h = srec.h stabsread_h = stabsread.h stack_h = stack.h @@ -1114,7 +1113,6 @@ gdb1$(EXEEXT): gdb$(EXEEXT) # dependency to do the right thing. tm-sun3.h tm-altos.h: tm-m68k.h tm-sun2.h tm-3b1.h: tm-m68k.h -tm-sun4os4.h: tm-sparc.h xm-vaxult.h: xm-vax.h xm-vaxbsd.h: xm-vax.h @@ -1307,10 +1305,14 @@ ALLDEPFILES = \ s390-tdep.c s390-nat.c \ ser-go32.c ser-pipe.c ser-tcp.c \ sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \ - solib.c solib-irix.c solib-svr4.c solib-sunos.c sparc-linux-nat.c \ - sparc-nat.c \ - sparc64nbsd-nat.c sparcnbsd-nat.c sparcnbsd-tdep.c \ - sparc-tdep.c sparcl-tdep.c sun3-nat.c \ + solib.c solib-irix.c solib-svr4.c solib-sunos.c \ + sparc-linux-tdep.c sparc-nat.c sparc-sol2-nat.c sparc-sol2-tdep.c \ + sparc-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 \ + sparc64nbsd-nat.c sparc64nbsd-tdep.c sparcnbsd-nat.c \ + sparcnbsd-tdep.c \ + sun3-nat.c \ symm-tdep.c symm-nat.c \ vax-tdep.c \ vx-share/xdr_ld.c vx-share/xdr_ptrace.c vx-share/xdr_rdb.c \ @@ -2325,32 +2327,55 @@ source.o: source.c $(defs_h) $(symtab_h) $(expression_h) $(language_h) \ $(gdb_string_h) $(gdb_stat_h) $(gdbcore_h) $(gdb_regex_h) \ $(symfile_h) $(objfiles_h) $(annotate_h) $(gdbtypes_h) $(linespec_h) \ $(filenames_h) $(completer_h) $(ui_out_h) -sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(sparc64_tdep_h) \ - $(sparcbsd_nat_h) -sparc64fbsd-tdep.o: sparc64fbsd-tdep.c $(defs_h) $(gdbcore_h) $(osabi_h) \ - $(regcache_h) $(target_h) $(gdb_string_h) $(sparc64_tdep_h) -sparc64nbsd-nat.o: sparc64nbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ - $(sparc_tdep_h) $(sparcnbsd_tdep_h) +sparc-linux-tdep.o: sparc-linux-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \ + $(frame_unwind_h) $(gdbarch_h) $(gdbcore_h) $(osabi_h) $(regcache_h) \ + $(solib_svr4_h) $(symtab_h) $(trad_frame_h) $(gdb_assert_h) \ + $(gdb_string_h) $(sparc_tdep_h) +sparc-nat.o: sparc-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ + $(gdb_string_h) $(gdb_wait_h) $(sparc_tdep_h) $(sparc_nat_h) +sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \ + $(sparc_tdep_h) $(sparc64_tdep_h) +sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \ + $(gdbcore_h) $(symtab_h) $(objfiles_h) $(osabi_h) $(regcache_h) \ + $(target_h) $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) \ + $(sparc_tdep_h) +sparc-tdep.o: sparc-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) \ + $(float_format_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ + $(gdbcore_h) $(gdbtypes_h) $(inferior_h) $(symtab_h) $(objfiles_h) \ + $(osabi_h) $(regcache_h) $(target_h) $(value_h) $(gdb_assert_h) \ + $(gdb_string_h) $(sparc_tdep_h) +sparc64-linux-nat.o: sparc64-linux-nat.c $(defs_h) \ + $(sparc64_tdep_h) $(sparc_nat_h) +sparc64-linux-tdep.o: sparc64-linux-tdep.c $(defs_h) $(gdbarch_h) \ + $(osabi_h) $(solib_svr4_h) $(sparc64_tdep_h) +sparc64-nat.o: sparc-nat.c $(defs_h) $(gdbarch_h) \ + $(sparc64_tdep_h) $(sparc_nat_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) sparc64-tdep.o: sparc64-tdep.c $(defs_h) $(arch_utils_h) $(floatformat_h) \ $(frame_h) $(frame_base_h) $(frame_unwind_h) $(gdbcore_h) \ - $(gdbtypes_h) $(osabi_h) $(regcache_h) $(target_h) $(value_h) \ - $(gdb_assert_h) $(gdb_string_h) $(sparc64_tdep_h) -sparcbsd-nat.o: sparcbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ - $(sparc64_tdep_h) $(sparcbsd_nat_h) -sparc-linux-nat.o: sparc-linux-nat.c $(defs_h) $(regcache_h) $(sparc_tdep_h) \ - $(gregset_h) -sparc-nat.o: sparc-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \ - $(regcache_h) $(sparc_tdep_h) $(gdb_wait_h) -sparcnbsd-nat.o: sparcnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ - $(sparc_tdep_h) $(sparcnbsd_tdep_h) -sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ - $(target_h) $(value_h) $(osabi_h) $(gdb_string_h) $(sparc_tdep_h) \ - $(sparcnbsd_tdep_h) $(nbsd_tdep_h) $(solib_svr4_h) + $(gdbtypes_h) $(inferior_h) $(symtab_h) $(objfiles_h) $(osabi_h) \ + $(regcache_h) $(target_h) $(value_h) $(gdb_assert_h) $(gdb_string_h) \ + $(sparc64_tdep_h) +sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(sparc64_tdep_h) \ + $(sparc_nat_h) +sparc64fbsd-tdep.o: sparc64fbsd-tdep.c $(defs_h) $(frame_h) \ + $(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) $(target_h) \ + $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) $(sparc64_tdep_h) +sparc64nbsd-nat.o: sparc64nbsd-nat.c $(defs_h) $(sparc64_tdep_h) \ + $(sparc_nat_h) +sparc64nbsd-tdep.o: sparc64nbsd-tdep.c $(defs_h) $(frame_h) \ + $(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) \ + $(solib_svr4_h) $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) \ + $(sparc64_tdep_h) $(nbsd_tdep_h) +sparcnbsd-nat.o: sparcnbsd-nat.c $(defs_h) $(sparc_tdep_h) $(sparc_nat_h) +sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \ + $(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) \ + $(solib_svr4_h) $(symtab_h) $(trad_frame_h) $(gdb_assert_h) \ + $(gdb_string_h) $(sparc_tdep_h) $(nbsd_tdep_h) sparc-stub.o: sparc-stub.c -sparc-tdep.o: sparc-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ - $(inferior_h) $(target_h) $(value_h) $(bfd_h) $(gdb_string_h) \ - $(regcache_h) $(osabi_h) $(dis_asm_h) $(sparc_tdep_h) $(gregset_h) \ - $(gdbcore_h) $(gdb_assert_h) $(symfile_h) + stabsread.o: stabsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(gdb_obstack_h) \ $(symtab_h) $(gdbtypes_h) $(expression_h) $(symfile_h) $(objfiles_h) \ $(aout_stab_gnu_h) $(libaout_h) $(aout_aout64_h) $(gdb_stabs_h) \ diff --git a/gdb/config/sparc/fbsd.mh b/gdb/config/sparc/fbsd.mh index 27942f86e6a..fb491a55c47 100644 --- a/gdb/config/sparc/fbsd.mh +++ b/gdb/config/sparc/fbsd.mh @@ -1,5 +1,5 @@ # Host: FreeBSD/sparc64 -NATDEPFILES= sparc64fbsd-nat.o sparcbsd-nat.o \ - corelow.o fork-child.o infptrace.o inftarg.o \ +NATDEPFILES= sparc64fbsd-nat.o sparc64-nat.o sparc-nat.o \ + fork-child.o infptrace.o inftarg.o \ solib.o solib-svr4.o solib-legacy.o NAT_FILE= nm-fbsd.h diff --git a/gdb/config/sparc/fbsd.mt b/gdb/config/sparc/fbsd.mt index 20c7f1ce27a..8e4dead7add 100644 --- a/gdb/config/sparc/fbsd.mt +++ b/gdb/config/sparc/fbsd.mt @@ -1,3 +1,3 @@ # Target: FreeBSD/sparc64 -TDEPFILES= sparc64-tdep.o sparc64fbsd-tdep.o +TDEPFILES= sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o corelow.o TM_FILE= tm-fbsd.h diff --git a/gdb/config/sparc/linux.mh b/gdb/config/sparc/linux.mh index f36dbb1ae34..ed68cc78aea 100644 --- a/gdb/config/sparc/linux.mh +++ b/gdb/config/sparc/linux.mh @@ -1,14 +1,11 @@ -# Host: Sparcstation, running GNU/Linux. - -XM_FILE= xm-linux.h - +# Host: GNU/Linux SPARC NAT_FILE= nm-linux.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o \ - proc-service.o thread-db.o lin-lwp.o sparc-linux-nat.o \ +NATDEPFILES= sparc-nat.o sparc-sol2-nat.o \ + corelow.o core-regset.o fork-child.o \ + infptrace.o inftarg.o \ + proc-service.o thread-db.o lin-lwp.o \ linux-proc.o gcore.o linux-nat.o # The dynamically loaded libthread_db needs access to symbols in the # gdb executable. LOADLIBES = -ldl -rdynamic - -HOST_IPC=-DBSD_IPC diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt index d6cf773a8ee..e053f302c4f 100644 --- a/gdb/config/sparc/linux.mt +++ b/gdb/config/sparc/linux.mt @@ -1,3 +1,4 @@ -# Target: Sparcstation, running Linux -TDEPFILES= sparc-tdep.o solib.o solib-svr4.o solib-legacy.o +# Target: GNU/Linux SPARC +TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \ + solib.o solib-svr4.o solib-legacy.o TM_FILE= tm-linux.h diff --git a/gdb/config/sparc/linux64.mh b/gdb/config/sparc/linux64.mh new file mode 100644 index 00000000000..c1472de8de8 --- /dev/null +++ b/gdb/config/sparc/linux64.mh @@ -0,0 +1,11 @@ +# Host: GNU/Linux UltraSPARC +NAT_FILE= nm-linux.h +NATDEPFILES= sparc-nat.o sparc64-nat.o sparc-sol2-nat.o sparc64-linux-nat.o \ + corelow.o core-regset.o \ + fork-child.o infptrace.o inftarg.o \ + proc-service.o thread-db.o lin-lwp.o \ + linux-proc.o gcore.o linux-nat.o + +# The dynamically loaded libthread_db needs access to symbols in the +# gdb executable. +LOADLIBES = -ldl -rdynamic diff --git a/gdb/config/sparc/linux64.mt b/gdb/config/sparc/linux64.mt new file mode 100644 index 00000000000..4121314318b --- /dev/null +++ b/gdb/config/sparc/linux64.mt @@ -0,0 +1,5 @@ +# Target: GNU/Linux UltraSPARC +TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc64-linux-tdep.o \ + sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \ + solib.o solib-svr4.o solib-legacy.o +TM_FILE= tm-linux.h diff --git a/gdb/config/sparc/nbsd.mt b/gdb/config/sparc/nbsd.mt index b04dd42fabb..25dbefff703 100644 --- a/gdb/config/sparc/nbsd.mt +++ b/gdb/config/sparc/nbsd.mt @@ -1,4 +1,4 @@ -# Target: SPARC running NetBSD -TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o corelow.o solib.o \ - solib-svr4.o +# Target: NetBSD/sparc +TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \ + corelow.o solib.o solib-svr4.o TM_FILE= tm-nbsd.h diff --git a/gdb/config/sparc/nbsd64.mh b/gdb/config/sparc/nbsd64.mh index eb54e489eb8..e8ac58bda2b 100644 --- a/gdb/config/sparc/nbsd64.mh +++ b/gdb/config/sparc/nbsd64.mh @@ -1,3 +1,4 @@ -# Host: UltraSPARC running NetBSD -NATDEPFILES= fork-child.o infptrace.o inftarg.o sparc64nbsd-nat.o +# Host: NetBSD/sparc64 +NATDEPFILES= sparc64nbsd-nat.o sparc-nat.o \ + fork-child.o infptrace.o inftarg.o NAT_FILE= nm-nbsd.h diff --git a/gdb/config/sparc/nbsd64.mt b/gdb/config/sparc/nbsd64.mt index 93b8f7841d4..4a1b13b9bb6 100644 --- a/gdb/config/sparc/nbsd64.mt +++ b/gdb/config/sparc/nbsd64.mt @@ -1,4 +1,5 @@ -# Target: UltraSPARC running NetBSD -TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o corelow.o solib.o \ - solib-svr4.o -TM_FILE= tm-nbsd64.h +# Target: NetBSD/sparc64 +TDEPFILES= sparc64-tdep.o sparc64nbsd-tdep.o \ + sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \ + corelow.o solib.o solib-svr4.o +TM_FILE= tm-nbsd.h diff --git a/gdb/config/sparc/nbsdaout.mh b/gdb/config/sparc/nbsdaout.mh index 45208998124..8944e60e483 100644 --- a/gdb/config/sparc/nbsdaout.mh +++ b/gdb/config/sparc/nbsdaout.mh @@ -1,4 +1,4 @@ -# Host: Sun 4 or Sparcstation, running NetBSD -NATDEPFILES= fork-child.o infptrace.o inftarg.o sparcnbsd-nat.o solib-sunos.o -XM_FILE= xm-nbsd.h +# Host: NetBSD/sparc a.out +NATDEPFILES= sparc-nat.o sparcnbsd-nat.o \ + fork-child.o infptrace.o inftarg.o solib-sunos.o NAT_FILE= nm-nbsdaout.h diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh index 1042d91b9dd..45309ecaec0 100644 --- a/gdb/config/sparc/nbsdelf.mh +++ b/gdb/config/sparc/nbsdelf.mh @@ -1,4 +1,4 @@ -# Host: Sun 4 or Sparcstation, running NetBSD -NATDEPFILES= fork-child.o infptrace.o inftarg.o sparcnbsd-nat.o -XM_FILE= xm-nbsd.h +# Host: NetBSD/sparc ELF +NATDEPFILES= sparc-nat.o sparcnbsd-nat.o \ + fork-child.o infptrace.o inftarg.o NAT_FILE= nm-nbsd.h diff --git a/gdb/config/sparc/nm-linux.h b/gdb/config/sparc/nm-linux.h index a156eba0707..cfab3893ca5 100644 --- a/gdb/config/sparc/nm-linux.h +++ b/gdb/config/sparc/nm-linux.h @@ -1,7 +1,7 @@ -/* Macro definitions for running gdb on a Sparc running GNU/Linux. +/* Native-dependent definitions for GNU/Linux SPARC. - Copyright 1989, 1992, 1996, 1998, 1999, 2000, 2002 Free Software - Foundation, Inc. + Copyright 1989, 1992, 1996, 1998, 1999, 2000, 2002, 2003 + Free Software Foundation, Inc. This file is part of GDB. @@ -20,13 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "config/nm-sysv4.h" +#ifndef NM_LINUX_H +#define NM_LINUX_H + #include "config/nm-linux.h" -#include "solib.h" -#define FETCH_INFERIOR_REGISTERS +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE long -/* Return sizeof user struct to callers in less machine dependent routines */ +/* Type of the fourth argument to the `ptrace' system call. */ +#define PTRACE_XFER_TYPE long + +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS -#define KERNEL_U_SIZE kernel_u_size() -extern int kernel_u_size (void); +#endif /* nm-linux.h */ diff --git a/gdb/config/sparc/nm-nbsd.h b/gdb/config/sparc/nm-nbsd.h index 7ffd72e9101..089a5acf1dc 100644 --- a/gdb/config/sparc/nm-nbsd.h +++ b/gdb/config/sparc/nm-nbsd.h @@ -1,5 +1,6 @@ -/* Native-dependent definitions for Sparc running NetBSD, for GDB. - Copyright 1986, 1987, 1989, 1992, 1994, 1996, 1999, 2000, 2002 +/* Native-dependent definitions for NetBSD/sparc. + + Copyright 1986, 1987, 1989, 1992, 1994, 1996, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -22,14 +23,7 @@ #ifndef NM_NBSD_H #define NM_NBSD_H -#include "regcache.h" - -/* Get generic NetBSD native definitions. */ - +/* Get generic NetBSD native definitions. */ #include "config/nm-nbsd.h" -/* Before storing, we need to read all the registers. */ - -#define CHILD_PREPARE_TO_STORE() deprecated_read_register_bytes (0, NULL, DEPRECATED_REGISTER_BYTES) - -#endif /* NM_NBSD_H */ +#endif /* nm-nbsd.h */ diff --git a/gdb/config/sparc/nm-nbsdaout.h b/gdb/config/sparc/nm-nbsdaout.h index 730759153e0..9e463f9b503 100644 --- a/gdb/config/sparc/nm-nbsdaout.h +++ b/gdb/config/sparc/nm-nbsdaout.h @@ -1,5 +1,6 @@ -/* Native-dependent definitions for Sparc running NetBSD a.out, for GDB. - Copyright 1999 Free Software Foundation, Inc. +/* Native-dependent definitions for NetBSD/sparc a.out. + + Copyright 1999, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -23,8 +24,7 @@ #include "sparc/nm-nbsd.h" -/* Get generic NetBSD a.out native definitions. */ - +/* Get generic NetBSD a.out native definitions. */ #include "config/nm-nbsdaout.h" -#endif /* NM_NBSDAOUT_H */ +#endif /* nm-nbsdaout.h */ diff --git a/gdb/config/sparc/nm-sun4sol2.h b/gdb/config/sparc/nm-sol2.h index 6f37162d7a8..bc9de3fdf80 100644 --- a/gdb/config/sparc/nm-sun4sol2.h +++ b/gdb/config/sparc/nm-sol2.h @@ -1,5 +1,6 @@ -/* Native-dependent definitions for Sparc running SVR4. - Copyright 1994, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +/* Native-dependent definitions for Solaris SPARC. + + Copyright 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -15,50 +16,43 @@ 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. */ - -#include "regcache.h" - -/* Include the generic SVR4 definitions. */ - -#include "config/nm-sysv4.h" - -/* Before storing, we need to read all the registers. */ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define CHILD_PREPARE_TO_STORE() deprecated_read_register_bytes (0, NULL, DEPRECATED_REGISTER_BYTES) +#ifndef NM_SOL2_H +#define NM_SOL2_H -/* Solaris PSRVADDR support does not seem to include a place for nPC. */ +#define GDB_GREGSET_T prgregset_t +#define GDB_FPREGSET_T prfpregset_t -#define PRSVADDR_BROKEN +/* Shared library support. */ -/* gdb wants to use the prgregset_t interface rather than - the gregset_t interface, partly because that's what's - used in core-sol2.c */ +#include "solib.h" -#define GDB_GREGSET_T prgregset_t -#define GDB_FPREGSET_T prfpregset_t +/* Hardware wactchpoints. */ -#ifdef NEW_PROC_API /* Solaris 6 and above can do HW watchpoints */ +/* Solaris 2.6 and above can do HW watchpoints. */ +#ifdef NEW_PROC_API #define TARGET_HAS_HARDWARE_WATCHPOINTS -/* The man page for proc4 on solaris 6 and 7 says that the system +/* The man page for proc(4) on Solaris 2.6 and up says that the system can support "thousands" of hardware watchpoints, but gives no - method for finding out how many. So just tell GDB 'yes'. */ -#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(TYPE, CNT, OT) 1 + method for finding out how many; It doesn't say anything about the + allowed size for the watched area either. So we just tell GDB + 'yes'. */ +#define TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(SIZE) 1 /* When a hardware watchpoint fires off the PC will be left at the - instruction following the one which caused the watchpoint. - It will *NOT* be necessary for GDB to step over the watchpoint. */ + instruction following the one which caused the watchpoint. It will + *NOT* be necessary for GDB to step over the watchpoint. */ #define HAVE_CONTINUABLE_WATCHPOINT 1 extern int procfs_stopped_by_watchpoint (ptid_t); #define STOPPED_BY_WATCHPOINT(W) \ procfs_stopped_by_watchpoint(inferior_ptid) -/* Use these macros for watchpoint insertion/deletion. */ -/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */ +/* Use these macros for watchpoint insertion/deletion. TYPE can be 0 + (write watch), 1 (read watch), 2 (access watch (read/write). */ extern int procfs_set_watchpoint (ptid_t, CORE_ADDR, int, int, int); #define target_insert_watchpoint(ADDR, LEN, TYPE) \ @@ -67,3 +61,5 @@ extern int procfs_set_watchpoint (ptid_t, CORE_ADDR, int, int, int); procfs_set_watchpoint (inferior_ptid, ADDR, 0, 0, 0) #endif /* NEW_PROC_API */ + +#endif /* nm-sol2.h */ diff --git a/gdb/config/sparc/nm-sparclynx.h b/gdb/config/sparc/nm-sparclynx.h deleted file mode 100644 index a231ba4cce1..00000000000 --- a/gdb/config/sparc/nm-sparclynx.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Native-dependent definitions for Sparc running LynxOS. - Copyright 1993, 1994 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#ifndef NM_SPARCLYNX_H -#define NM_SPARCLYNX_H - -#include "config/nm-lynx.h" - -#endif /* NM_SPARCLYNX_H */ diff --git a/gdb/config/sparc/nm-sun4os4.h b/gdb/config/sparc/nm-sun4os4.h deleted file mode 100644 index e77330c51d4..00000000000 --- a/gdb/config/sparc/nm-sun4os4.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Macro definitions for running gdb on a Sun 4 running sunos 4. - Copyright 1989, 1992, 1996, 2000 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "regcache.h" - -/* Do implement the attach and detach commands. */ - -#define ATTACH_DETACH - -/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ - -#define FETCH_INFERIOR_REGISTERS - -/* Before storing, we need to read all the registers. */ - -#define CHILD_PREPARE_TO_STORE() deprecated_read_register_bytes (0, NULL, DEPRECATED_REGISTER_BYTES) - -/* Return sizeof user struct to callers in less machine dependent routines */ - -#define KERNEL_U_SIZE kernel_u_size() -extern int kernel_u_size (void); - -/* SunOS 4.x uses nonstandard "char *" as type of third argument to ptrace() */ - -#define PTRACE_ARG3_TYPE char* diff --git a/gdb/config/sparc/sol2-64.mt b/gdb/config/sparc/sol2-64.mt new file mode 100644 index 00000000000..92f848929fe --- /dev/null +++ b/gdb/config/sparc/sol2-64.mt @@ -0,0 +1,3 @@ +# Target: Solaris UltraSPARC +TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o sparc-sol2-tdep.o +TM_FILE= tm-sol2.h diff --git a/gdb/config/sparc/sol2.mh b/gdb/config/sparc/sol2.mh new file mode 100644 index 00000000000..735b9ee8096 --- /dev/null +++ b/gdb/config/sparc/sol2.mh @@ -0,0 +1,6 @@ +# Host: Solaris SPARC & UltraSPARC +NAT_FILE= nm-sol2.h +NATDEPFILES= sparc-sol2-nat.o \ + corelow.o core-regset.o fork-child.o gcore.o \ + procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o \ + solib.o solib-svr4.o solib-legacy.o diff --git a/gdb/config/sparc/sol2.mt b/gdb/config/sparc/sol2.mt new file mode 100644 index 00000000000..4037956317c --- /dev/null +++ b/gdb/config/sparc/sol2.mt @@ -0,0 +1,3 @@ +# Target: Solaris SPARC +TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o +TM_FILE= tm-sol2.h diff --git a/gdb/config/sparc/sp64.mt b/gdb/config/sparc/sp64.mt deleted file mode 100644 index 943abfc240e..00000000000 --- a/gdb/config/sparc/sp64.mt +++ /dev/null @@ -1,6 +0,0 @@ -# Target: SPARC64 -# solib.o and procfs.o taken out for now. We don't have shared libraries yet, -# and the elf version requires procfs.o but the a.out version doesn't. -# Then again, having procfs.o in a target makefile fragment seems wrong. -TDEPFILES = sparc-tdep.o -TM_FILE= tm-sp64.h diff --git a/gdb/config/sparc/sp64linux.mt b/gdb/config/sparc/sp64linux.mt deleted file mode 100644 index d7d642ead71..00000000000 --- a/gdb/config/sparc/sp64linux.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: UltraSPARC, running Linux 64bit programs -TDEPFILES= sparc-tdep.o solib.o solib-svr4.o solib-legacy.o -TM_FILE= tm-sp64linux.h diff --git a/gdb/config/sparc/sp64sol2.mt b/gdb/config/sparc/sp64sol2.mt deleted file mode 100644 index ce2f0d82df0..00000000000 --- a/gdb/config/sparc/sp64sol2.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Ultrasparc, running Solaris 2 -TDEPFILES= sparc-tdep.o -TM_FILE= tm-sun4sol2.h diff --git a/gdb/config/sparc/sparc-em.mt b/gdb/config/sparc/sparc-em.mt deleted file mode 100644 index 13b0c6a29e2..00000000000 --- a/gdb/config/sparc/sparc-em.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: SPARC embedded -TDEPFILES= sparc-tdep.o -TM_FILE= tm-spc-em.h diff --git a/gdb/config/sparc/sparc.mt b/gdb/config/sparc/sparc.mt new file mode 100644 index 00000000000..ea78c97af55 --- /dev/null +++ b/gdb/config/sparc/sparc.mt @@ -0,0 +1,2 @@ +# Target: SPARC +TDEPFILES= sparc-tdep.o diff --git a/gdb/config/sparc/sparc64.mt b/gdb/config/sparc/sparc64.mt new file mode 100644 index 00000000000..b1082be4956 --- /dev/null +++ b/gdb/config/sparc/sparc64.mt @@ -0,0 +1,2 @@ +# Target: UltraSPARC +TDEPFILES= sparc-tdep.o sparc64-tdep.o diff --git a/gdb/config/sparc/sparclynx.mh b/gdb/config/sparc/sparclynx.mh deleted file mode 100644 index c573604b66a..00000000000 --- a/gdb/config/sparc/sparclynx.mh +++ /dev/null @@ -1,6 +0,0 @@ -# Host: Sparc running LynxOS - -XM_CLIBS= -lbsd - -NAT_FILE= nm-sparclynx.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o diff --git a/gdb/config/sparc/sparclynx.mt b/gdb/config/sparc/sparclynx.mt deleted file mode 100644 index 5e61645caaa..00000000000 --- a/gdb/config/sparc/sparclynx.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Sparc running LynxOS -TDEPFILES= coff-solib.o sparc-tdep.o -TM_FILE= tm-sparclynx.h diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh deleted file mode 100644 index 4e664d71ccb..00000000000 --- a/gdb/config/sparc/sun4os4.mh +++ /dev/null @@ -1,9 +0,0 @@ -# Host: Sun 4 or Sparcstation, running SunOS 4 -NAT_FILE= nm-sun4os4.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o -HOST_IPC=-DBSD_IPC - -# Setting XM_CLIBS=-lresolv would let us use the DNS, but that would screw -# anyone who wants to use NIS, which includes at least one Cygnus customer -# (PR 3593). So leave it this way until/unless we find a resolver which can -# get names from either DNS or NIS from the same GDB binary. diff --git a/gdb/config/sparc/sun4os4.mt b/gdb/config/sparc/sun4os4.mt deleted file mode 100644 index 342d6f73537..00000000000 --- a/gdb/config/sparc/sun4os4.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Sun 4 or Sparcstation, running SunOS 4 -TDEPFILES= sparc-tdep.o solib.o solib-sunos.o -TM_FILE= tm-sun4os4.h diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh deleted file mode 100644 index 4e77b9234cd..00000000000 --- a/gdb/config/sparc/sun4sol2.mh +++ /dev/null @@ -1,22 +0,0 @@ -# Host: Sun 4 or Sparcstation, running Solaris 2 - -XM_FILE= xm-sun4sol2.h -XM_CLIBS= -lsocket -lnsl - -NAT_FILE= nm-sun4sol2.h -NATDEPFILES= corelow.o core-sol2.o solib.o solib-svr4.o solib-legacy.o \ - fork-child.o procfs.o gcore.o \ - proc-api.o proc-events.o proc-flags.o proc-why.o - -# /usr/include/v9 is needed only by core-sol2.c when including -# v9/sys/privregs.h, or rather the headers it in turn includes. -MH_CFLAGS=-I/usr/include/v9 -# If you are compiling with Sun's compiler, add the -xs option to CC -# (e.g. `make CC="cc -xs"'). -# Sun's compilers require the -xs option to produce debug information -# in the final linked executable. Otherwise they leave it in the .o -# files only, with undocumented pointers to it in the linked executable. -# This is commented out because we don't assume that the Sun compiler -# is in use. -#MH_CFLAGS=-xs -I/usr/include/v9 -HOST_IPC=-DBSD_IPC diff --git a/gdb/config/sparc/sun4sol2.mt b/gdb/config/sparc/sun4sol2.mt deleted file mode 100644 index af70e9f9f9f..00000000000 --- a/gdb/config/sparc/sun4sol2.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: Sun 4 or Sparcstation, running Solaris 2 -TDEPFILES= sparc-tdep.o -TM_FILE= tm-sun4sol2.h diff --git a/gdb/config/sparc/tm-linux.h b/gdb/config/sparc/tm-linux.h index 63be2b885a5..ae853ba0acb 100644 --- a/gdb/config/sparc/tm-linux.h +++ b/gdb/config/sparc/tm-linux.h @@ -1,7 +1,6 @@ -/* Macro definitions for GDB for a Sparc running GNU/Linux. +/* Target-dependent definitions for GNU/Linux SPARC. - Copyright 1989, 1992, 1994, 1995, 1998, 1999, 2002 Free Software - Foundation, Inc. + Copyright 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -17,16 +16,14 @@ 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. */ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef TM_SPARCLINUX_H -#define TM_SPARCLINUX_H +#ifndef TM_LINUX_H +#define TM_LINUX_H -#include "sparc/tm-sparc.h" +#define GDB_MULTI_ARCH GDB_MULTI_ARCH_TM -#define SIGCONTEXT_PC_OFFSET 12 +/* Shared library support. */ +#include "solib.h" -#include "config/tm-linux.h" - -#endif /* TM_SPARCLINUX_H */ +#endif /* tm-linux.h */ diff --git a/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h index c82c3154088..301136bbead 100644 --- a/gdb/config/sparc/tm-nbsd.h +++ b/gdb/config/sparc/tm-nbsd.h @@ -1,5 +1,6 @@ -/* Macro definitions for Sparc running under NetBSD. - Copyright 1994, 2002 Free Software Foundation, Inc. +/* Target-dependent definitions for NetBSD/sparc. + + Copyright 1994, 2002, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +22,9 @@ #ifndef TM_NBSD_H #define TM_NBSD_H -#include "sparc/tm-sparc.h" +#define GDB_MULTI_ARCH GDB_MULTI_ARCH_TM + +/* Shared library support. */ #include "solib.h" -#endif /* TM_NBSD_H */ +#endif /* tm-nbsd.h */ diff --git a/gdb/config/sparc/tm-sol2.h b/gdb/config/sparc/tm-sol2.h new file mode 100644 index 00000000000..d111c1a7768 --- /dev/null +++ b/gdb/config/sparc/tm-sol2.h @@ -0,0 +1,40 @@ +/* Target-dependent definitions for Solaris SPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef TM_SOL2_H +#define TM_SOL2_H + +#define GDB_MULTI_ARCH GDB_MULTI_ARCH_TM + +/* 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. */ +#define SOFUN_ADDRESS_MAYBE_MISSING + +/* The Sun compilers also do "globalization"; see the comment in + sparc-tdep.c for more information. */ +extern char *sparc_stabs_unglobalize_name (char *name); +#define STATIC_TRANSFORM_NAME(name) \ + sparc_stabs_unglobalize_name (name) +#define IS_STATIC_TRANSFORM_NAME(name) \ + ((name) != sparc_stabs_unglobalize_name (name)) + +#endif /* tm-sol2.h */ diff --git a/gdb/config/sparc/tm-sp64.h b/gdb/config/sparc/tm-sp64.h deleted file mode 100644 index 960cc0b9d97..00000000000 --- a/gdb/config/sparc/tm-sp64.h +++ /dev/null @@ -1,107 +0,0 @@ -/* Target machine sub-parameters for SPARC64, for GDB, the GNU debugger. - This is included by other tm-*.h files to define SPARC64 cpu-related info. - Copyright 1994, 1995, 1996, 1998, 1999, 2000 - Free Software Foundation, Inc. - This is (obviously) based on the SPARC Vn (n<9) port. - Contributed by Doug Evans (dje@cygnus.com). - Further modified by Bob Manson (manson@cygnus.com). - - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -struct type; - -#ifndef GDB_TARGET_IS_SPARC64 -#define GDB_TARGET_IS_SPARC64 1 -#endif - -#include "sparc/tm-sparc.h" - -/* Eeeew. Ok, we have to assume (for now) that the processor really is - in sparc64 mode. While this is the same instruction sequence as - on the Sparc, the stack frames are offset by +2047 (and the arguments - are 8 bytes instead of 4). */ -/* Instructions are: - std %f10, [ %fp + 0x7a7 ] - std %f8, [ %fp + 0x79f ] - std %f6, [ %fp + 0x797 ] - std %f4, [ %fp + 0x78f ] - std %f2, [ %fp + 0x787 ] - std %f0, [ %fp + 0x77f ] - std %g6, [ %fp + 0x777 ] - std %g4, [ %fp + 0x76f ] - std %g2, [ %fp + 0x767 ] - std %g0, [ %fp + 0x75f ] - std %fp, [ %fp + 0x757 ] - std %i4, [ %fp + 0x74f ] - std %i2, [ %fp + 0x747 ] - std %i0, [ %fp + 0x73f ] - nop - nop - nop - nop - rd %tbr, %o0 - st %o0, [ %fp + 0x72b ] - rd %tpc, %o0 - st %o0, [ %fp + 0x727 ] - rd %psr, %o0 - st %o0, [ %fp + 0x723 ] - rd %y, %o0 - st %o0, [ %fp + 0x71f ] - ldx [ %sp + 0x8a7 ], %o5 - ldx [ %sp + 0x89f ], %o4 - ldx [ %sp + 0x897 ], %o3 - ldx [ %sp + 0x88f ], %o2 - ldx [ %sp + 0x887 ], %o1 - call %g0 - ldx [ %sp + 0x87f ], %o0 - nop - ta 1 - nop - nop - */ - -/* Offsets into jmp_buf. - FIXME: This was borrowed from the v8 stuff and will probably have to change - for v9. */ - -#define JB_ELEMENT_SIZE 8 /* Size of each element in jmp_buf */ - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_NPC 4 -#define JB_PSR 5 -#define JB_G1 6 -#define JB_O0 7 -#define JB_WBCNT 8 - -/* Figure out where the longjmp will land. We expect that we have - just entered longjmp and haven't yet setup the stack frame, so the - args are still in the output regs. %o0 (O0_REGNUM) points at the - jmp_buf structure from which we extract the pc (JB_PC) that we will - land at. The pc is copied into ADDR. This routine returns true on - success */ - -extern int get_longjmp_target (CORE_ADDR *); - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) - -#undef TM_PRINT_INSN_MACH -#define TM_PRINT_INSN_MACH bfd_mach_sparc_v9a - diff --git a/gdb/config/sparc/tm-sp64linux.h b/gdb/config/sparc/tm-sp64linux.h deleted file mode 100644 index 81d9db0036d..00000000000 --- a/gdb/config/sparc/tm-sp64linux.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Macro definitions for GDB for a UltraSparc running GNU/Linux. - - Copyright 2001, 2002 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 -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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. */ - -#ifndef TM_SPARC_LIN64_H -#define TM_SPARC_LIN64_H - -#include "sparc/tm-sp64.h" - -#define SIGCONTEXT_PC_OFFSET 16 /* See asm-sparc64/sigcontext.h */ - -/* We always want full V9 + Ultra VIS stuff... */ -#undef TM_PRINT_INSN_MACH -#define TM_PRINT_INSN_MACH bfd_mach_sparc_v9a - -#include "config/tm-sysv4.h" - -#endif /* TM_SPARC_LIN64_H */ diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h deleted file mode 100644 index af8feccdc2f..00000000000 --- a/gdb/config/sparc/tm-sparc.h +++ /dev/null @@ -1,354 +0,0 @@ -/* Target machine sub-parameters for SPARC, for GDB, the GNU debugger. - This is included by other tm-*.h files to define SPARC cpu-related info. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. - Contributed by Michael Tiemann (tiemann@mcc.com) - - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "regcache.h" - -struct type; -struct value; -struct frame_info; - -/* - * The following enums are purely for the convenience of the GDB - * developer, when debugging GDB. - */ - -enum { /* Sparc general registers, for all sparc versions. */ - G0_REGNUM, G1_REGNUM, G2_REGNUM, G3_REGNUM, - G4_REGNUM, G5_REGNUM, G6_REGNUM, G7_REGNUM, - O0_REGNUM, O1_REGNUM, O2_REGNUM, O3_REGNUM, - O4_REGNUM, O5_REGNUM, O6_REGNUM, O7_REGNUM, - L0_REGNUM, L1_REGNUM, L2_REGNUM, L3_REGNUM, - L4_REGNUM, L5_REGNUM, L6_REGNUM, L7_REGNUM, - I0_REGNUM, I1_REGNUM, I2_REGNUM, I3_REGNUM, - I4_REGNUM, I5_REGNUM, I6_REGNUM, I7_REGNUM, - FP0_REGNUM /* Floating point register 0 */ -}; - -enum { /* Sparc general registers, alternate names. */ - R0_REGNUM, R1_REGNUM, R2_REGNUM, R3_REGNUM, - R4_REGNUM, R5_REGNUM, R6_REGNUM, R7_REGNUM, - R8_REGNUM, R9_REGNUM, R10_REGNUM, R11_REGNUM, - R12_REGNUM, R13_REGNUM, R14_REGNUM, R15_REGNUM, - R16_REGNUM, R17_REGNUM, R18_REGNUM, R19_REGNUM, - R20_REGNUM, R21_REGNUM, R22_REGNUM, R23_REGNUM, - R24_REGNUM, R25_REGNUM, R26_REGNUM, R27_REGNUM, - R28_REGNUM, R29_REGNUM, R30_REGNUM, R31_REGNUM -}; - -enum { /* Sparc32 control registers. */ - PS_REGNUM = 65, /* PC, NPC, and Y are omitted because */ - WIM_REGNUM = 66, /* they have different values depending on */ - TBR_REGNUM = 67, /* 32-bit / 64-bit mode. */ - FPS_REGNUM = 70, - CPS_REGNUM = 71 -}; - -/* v9 misc. and priv. regs */ - -/* Note: specifying values explicitly for documentation purposes. */ -enum { /* Sparc64 control registers, excluding Y, PC, and NPC. */ - CCR_REGNUM = 82, /* Condition Code Register (%xcc,%icc) */ - FSR_REGNUM = 83, /* Floating Point State */ - FPRS_REGNUM = 84, /* Floating Point Registers State */ - ASI_REGNUM = 86, /* Alternate Space Identifier */ - VER_REGNUM = 87, /* Version register */ - TICK_REGNUM = 88, /* Tick register */ - PIL_REGNUM = 89, /* Processor Interrupt Level */ - PSTATE_REGNUM = 90, /* Processor State */ - TSTATE_REGNUM = 91, /* Trap State */ - TBA_REGNUM = 92, /* Trap Base Address */ - TL_REGNUM = 93, /* Trap Level */ - TT_REGNUM = 94, /* Trap Type */ - TPC_REGNUM = 95, /* Trap pc */ - TNPC_REGNUM = 96, /* Trap npc */ - WSTATE_REGNUM = 97, /* Window State */ - CWP_REGNUM = 98, /* Current Window Pointer */ - CANSAVE_REGNUM = 99, /* Savable Windows */ - CANRESTORE_REGNUM = 100, /* Restorable Windows */ - CLEANWIN_REGNUM = 101, /* Clean Windows */ - OTHERWIN_REGNUM = 102, /* Other Windows */ - ASR16_REGNUM = 103, /* Ancillary State Registers */ - ASR17_REGNUM = 104, - ASR18_REGNUM = 105, - ASR19_REGNUM = 106, - ASR20_REGNUM = 107, - ASR21_REGNUM = 108, - ASR22_REGNUM = 109, - ASR23_REGNUM = 110, - ASR24_REGNUM = 111, - ASR25_REGNUM = 112, - ASR26_REGNUM = 113, - ASR27_REGNUM = 114, - ASR28_REGNUM = 115, - ASR29_REGNUM = 116, - ASR30_REGNUM = 117, - ASR31_REGNUM = 118, - ICC_REGNUM = 119, /* 32 bit condition codes */ - XCC_REGNUM = 120, /* 64 bit condition codes */ - FCC0_REGNUM = 121, /* fp cc reg 0 */ - FCC1_REGNUM = 122, /* fp cc reg 1 */ - FCC2_REGNUM = 123, /* fp cc reg 2 */ - FCC3_REGNUM = 124 /* fp cc reg 3 */ -}; - -/* - * Make sparc target multi-archable: April 2000 - */ - -/* Multi-arch definition of TARGET_IS_SPARC64, TARGET_ELF64 */ -#undef GDB_TARGET_IS_SPARC64 -#define GDB_TARGET_IS_SPARC64 \ - (sparc_intreg_size () == 8) -#undef TARGET_ELF64 -#define TARGET_ELF64 \ - (sparc_intreg_size () == 8) -extern int sparc_intreg_size (void); - -/* - * The following defines should ONLY appear for MULTI_ARCH. - */ - -/* Multi-arch the nPC and Y registers. */ -#define Y_REGNUM (sparc_y_regnum ()) - -/* On the Sun 4 under SunOS, the compile will leave a fake insn which - encodes the structure size being returned. If we detect such - a fake insn, step past it. */ - -#define PC_ADJUST(PC) sparc_pc_adjust (PC) -extern CORE_ADDR sparc_pc_adjust (CORE_ADDR); - -/* If an argument is declared "register", Sun cc will keep it in a register, - never saving it onto the stack. So we better not believe the "p" symbol - descriptor stab. */ - -#define DEPRECATE_USE_REGISTER_NOT_ARG - -/* For acc, there's no need to correct LBRAC entries by guessing how - they should work. In fact, this is harmful because the LBRAC - entries now all appear at the end of the function, not intermixed - with the SLINE entries. n_opt_found detects acc for Solaris binaries; - function_stab_type detects acc for SunOS4 binaries. - - For binary from SunOS4 /bin/cc, need to correct LBRAC's. - - For gcc, like acc, don't correct. */ - -#define SUN_FIXED_LBRAC_BUG \ - (n_opt_found \ - || function_stab_type == N_STSYM \ - || function_stab_type == N_GSYM \ - || processing_gcc_compilation) - -/* Do variables in the debug stabs occur after the N_LBRAC or before it? - acc: after, gcc: before, SunOS4 /bin/cc: before. */ - -#define VARIABLES_INSIDE_BLOCK(desc, gcc_p) \ - (!(gcc_p) \ - && (n_opt_found \ - || function_stab_type == N_STSYM \ - || function_stab_type == N_GSYM)) - -/* Sequence of bytes for breakpoint instruction (ta 1). */ - -extern const unsigned char *sparc_breakpoint_from_pc (CORE_ADDR *pc, int *len); -#define BREAKPOINT_FROM_PC(PC,LEN) sparc_breakpoint_from_pc ((PC), (LEN)) - -/* Register numbers of various important registers. - Note that some of these values are "real" register numbers, - and correspond to the general registers of the machine, - and some are "phony" register numbers which are too large - to be actual register numbers as far as the user is concerned - but do serve to get the desired values when passed to read_register. */ - -#define G0_REGNUM 0 /* %g0 */ -#define G1_REGNUM 1 /* %g1 */ -#define O0_REGNUM 8 /* %o0 */ -#define RP_REGNUM 15 /* Contains return address value, *before* \ - any windows get switched. */ -#define O7_REGNUM 15 /* Last local reg not saved on stack frame */ -#define L0_REGNUM 16 /* First local reg that's saved on stack frame - rather than in machine registers */ -#define I0_REGNUM 24 /* %i0 */ -#define I7_REGNUM 31 /* Last local reg saved on stack frame */ -#define PS_REGNUM 65 /* Contains processor status */ -#define PS_FLAG_CARRY 0x100000 /* Carry bit in PS */ -#define WIM_REGNUM 66 /* Window Invalid Mask (not really supported) */ -#define TBR_REGNUM 67 /* Trap Base Register (not really supported) */ -#define FPS_REGNUM 70 /* Floating point status register */ -#define CPS_REGNUM 71 /* Coprocessor status register */ - -/* Writing to %g0 is a noop (not an error or exception or anything like - that, however). */ - -#define CANNOT_STORE_REGISTER(regno) ((regno) == G0_REGNUM) - -#define DEPRECATED_PRINT_EXTRA_FRAME_INFO(FI) \ - sparc_print_extra_frame_info (FI) -extern void sparc_print_extra_frame_info (struct frame_info *); - -/* DEPRECATED_INIT_EXTRA_FRAME_INFO needs the PC to detect flat - frames. */ - -#define DEPRECATED_INIT_FRAME_PC_FIRST(FROMLEAF, PREV) \ - ((FROMLEAF) ? DEPRECATED_SAVED_PC_AFTER_CALL ((PREV)->next) : \ - (PREV)->next ? DEPRECATED_FRAME_SAVED_PC ((PREV)->next) : read_pc ()) - -/* Define other aspects of the stack frame. */ - -/* The location of I0 w.r.t SP. This is actually dependent on how the - system's window overflow/underflow routines are written. Most - vendors save the L regs followed by the I regs (at the higher - address). Some vendors get it wrong. */ - -#define FRAME_SAVED_L0 0 -#define FRAME_SAVED_I0 (8 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)) - -/* Things needed for making the inferior call functions. */ -/* - * First of all, let me give my opinion of what the DUMMY_FRAME - * actually looks like. - * - * | | - * | | - * + - - - - - - - - - - - - - - - - +<-- fp (level 0) - * | | - * | | - * | | - * | | - * | Frame of innermost program | - * | function | - * | | - * | | - * | | - * | | - * | | - * |---------------------------------|<-- sp (level 0), fp (c) - * | | - * DUMMY | fp0-31 | - * | | - * | ------ |<-- fp - 0x80 - * FRAME | g0-7 |<-- fp - 0xa0 - * | i0-7 |<-- fp - 0xc0 - * | other |<-- fp - 0xe0 - * | ? | - * | ? | - * |---------------------------------|<-- sp' = fp - 0x140 - * | | - * xcution start | | - * sp' + 0x94 -->| CALL_DUMMY (x code) | - * | | - * | | - * |---------------------------------|<-- sp'' = fp - 0x200 - * | align sp to 8 byte boundary | - * | ==> args to fn <== | - * Room for | | - * i & l's + agg | CALL_DUMMY_STACK_ADJUST = 0x0x44| - * |---------------------------------|<-- final sp (variable) - * | | - * | Where function called will | - * | build frame. | - * | | - * | | - * - * I understand everything in this picture except what the space - * between fp - 0xe0 and fp - 0x140 is used for. Oh, and I don't - * understand why there's a large chunk of CALL_DUMMY that never gets - * executed (its function is superceeded by - * DEPRECATED_PUSH_DUMMY_FRAME; they are designed to do the same - * thing). - * - * DEPRECATED_PUSH_DUMMY_FRAME saves the registers above sp' and - * pushes the * register file stack down one. - * - * call_function then writes CALL_DUMMY, pushes the args onto the - * stack, and adjusts the stack pointer. - - call_function_by_hand then starts execution (in the middle of - CALL_DUMMY, as directed by call_function). */ - -#ifndef CALL_DUMMY -/* This sequence of words is the instructions - - 00: bc 10 00 01 mov %g1, %fp - 04: 9d e3 80 00 save %sp, %g0, %sp - 08: bc 10 00 02 mov %g2, %fp - 0c: be 10 00 03 mov %g3, %i7 - 10: da 03 a0 58 ld [ %sp + 0x58 ], %o5 - 14: d8 03 a0 54 ld [ %sp + 0x54 ], %o4 - 18: d6 03 a0 50 ld [ %sp + 0x50 ], %o3 - 1c: d4 03 a0 4c ld [ %sp + 0x4c ], %o2 - 20: d2 03 a0 48 ld [ %sp + 0x48 ], %o1 - 24: 40 00 00 00 call <fun> - 28: d0 03 a0 44 ld [ %sp + 0x44 ], %o0 - 2c: 01 00 00 00 nop - 30: 91 d0 20 01 ta 1 - 34: 01 00 00 00 nop - - NOTES: - * the first four instructions are necessary only on the simulator. - * this is a multiple of 8 (not only 4) bytes. - * the `call' insn is a relative, not an absolute call. - * the `nop' at the end is needed to keep the trap from - clobbering things (if NPC pointed to garbage instead). - */ - -#endif /* CALL_DUMMY */ - -/* Sparc has no reliable single step ptrace call */ - -#define SOFTWARE_SINGLE_STEP_P() 1 -extern void sparc_software_single_step (enum target_signal, int); -#define SOFTWARE_SINGLE_STEP(sig,bp_p) sparc_software_single_step (sig,bp_p) - -/* We need more arguments in a frame specification for the - "frame" or "info frame" command. */ - -#define SETUP_ARBITRARY_FRAME(argc, argv) setup_arbitrary_frame (argc, argv) -extern struct frame_info *setup_arbitrary_frame (int, CORE_ADDR *); - -extern void sparc_do_registers_info (int regnum, int all); -#undef DEPRECATED_DO_REGISTERS_INFO -#define DEPRECATED_DO_REGISTERS_INFO(REGNUM,ALL) sparc_do_registers_info (REGNUM, ALL) - -/* Optimization for storing registers to the inferior. The hook - DO_DEFERRED_STORES - actually executes any deferred stores. It is called any time - we are going to proceed the child, or read its registers. - The hook CLEAR_DEFERRED_STORES is called when we want to throw - away the inferior process, e.g. when it dies or we kill it. - FIXME, this does not handle remote debugging cleanly. */ - -extern int deferred_stores; -#define DO_DEFERRED_STORES \ - if (deferred_stores) \ - target_store_registers (-2); -#define CLEAR_DEFERRED_STORES \ - deferred_stores = 0; - -/* Select the sparc disassembler */ - -#define TM_PRINT_INSN_MACH bfd_mach_sparc - -#define DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED 1 diff --git a/gdb/config/sparc/tm-sparclynx.h b/gdb/config/sparc/tm-sparclynx.h deleted file mode 100644 index e4ea4d5223d..00000000000 --- a/gdb/config/sparc/tm-sparclynx.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Macro definitions for Sparc running under LynxOS. - Copyright 1993, 1994 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#ifndef TM_SPARCLYNX_H -#define TM_SPARCLYNX_H - -#include "config/tm-lynx.h" - -/* Use generic Sparc definitions. */ -#include "sparc/tm-sparc.h" - -/* Lynx does this backwards from everybody else */ - -#undef FRAME_SAVED_I0 -#undef FRAME_SAVED_L0 - -#define FRAME_SAVED_I0 0 -#define FRAME_SAVED_L0 (8 * DEPRECATED_REGISTER_RAW_SIZE (I0_REGNUM)) - -#endif /* TM_SPARCLYNX_H */ diff --git a/gdb/config/sparc/tm-spc-em.h b/gdb/config/sparc/tm-spc-em.h deleted file mode 100644 index 760e7a4258a..00000000000 --- a/gdb/config/sparc/tm-spc-em.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Target machine definitions for GDB for an embedded SPARC. - Copyright 1989, 1992, 1993, 2000 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "sparc/tm-sparc.h" - -/* Offsets into jmp_buf. Not defined by Sun, but at least documented in a - comment in <machine/setjmp.h>! */ - -#define JB_ELEMENT_SIZE 4 /* Size of each element in jmp_buf */ - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_NPC 4 -#define JB_PSR 5 -#define JB_G1 6 -#define JB_O0 7 -#define JB_WBCNT 8 - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -extern int get_longjmp_target (CORE_ADDR *); - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) diff --git a/gdb/config/sparc/tm-sun4os4.h b/gdb/config/sparc/tm-sun4os4.h deleted file mode 100644 index e080904d927..00000000000 --- a/gdb/config/sparc/tm-sun4os4.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Macro definitions for GDB for a Sun 4 running sunos 4. - Copyright 1989, 1992, 1994, 1995, 1998, 2000 - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "sparc/tm-sparc.h" -#include "config/tm-sunos.h" - -/* Redefine SKIP_TRAMPOLINE_CODE to handle PIC compiled modules - in main executables. */ - -#undef SKIP_TRAMPOLINE_CODE -#define SKIP_TRAMPOLINE_CODE(pc) sunos4_skip_trampoline_code (pc) -extern CORE_ADDR sunos4_skip_trampoline_code (CORE_ADDR); - -/* Offsets into jmp_buf. Not defined by Sun, but at least documented in a - comment in <machine/setjmp.h>! */ - -#define JB_ELEMENT_SIZE 4 /* Size of each element in jmp_buf */ - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_NPC 4 -#define JB_PSR 5 -#define JB_G1 6 -#define JB_O0 7 -#define JB_WBCNT 8 - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -extern int get_longjmp_target (CORE_ADDR *); - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) - -extern char *sunpro_static_transform_name (char *); -#define STATIC_TRANSFORM_NAME(x) sunpro_static_transform_name (x) -#define IS_STATIC_TRANSFORM_NAME(name) ((name)[0] == '$') diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h deleted file mode 100644 index 2247914c50d..00000000000 --- a/gdb/config/sparc/tm-sun4sol2.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Macro definitions for GDB for a Sun 4 running Solaris 2 - Copyright 1989, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000 - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "sparc/tm-sparc.h" -#include "config/tm-sysv4.h" - -/* With Sol2 it is no longer necessary to enable software single-step, - since the /proc interface can take care of it for us in hardware. */ -#undef SOFTWARE_SINGLE_STEP -#undef SOFTWARE_SINGLE_STEP_P - -/* There are two different signal handler trampolines in Solaris2. */ -#define IN_SIGTRAMP(pc, name) \ - ((name) \ - && (DEPRECATED_STREQ ("sigacthandler", name) || DEPRECATED_STREQ ("ucbsigvechandler", name))) - -/* The signal handler gets a pointer to an ucontext as third argument - if it is called from sigacthandler. This is the offset to the saved - PC within it. sparc_frame_saved_pc knows how to deal with - ucbsigvechandler. */ -#define SIGCONTEXT_PC_OFFSET 44 - -#if 0 /* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */ - -/* Offsets into jmp_buf. Not defined by Sun, but at least documented in a - comment in <machine/setjmp.h>! */ - -#define JB_ELEMENT_SIZE 4 /* Size of each element in jmp_buf */ - -#define JB_ONSSTACK 0 -#define JB_SIGMASK 1 -#define JB_SP 2 -#define JB_PC 3 -#define JB_NPC 4 -#define JB_PSR 5 -#define JB_G1 6 -#define JB_O0 7 -#define JB_WBCNT 8 - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -extern int get_longjmp_target (CORE_ADDR *); - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -#endif /* 0 */ - -/* The SunPRO compiler puts out 0 instead of the address in N_SO symbols, - and for SunPRO 3.0, N_FUN symbols too. */ -#define SOFUN_ADDRESS_MAYBE_MISSING - -extern char *sunpro_static_transform_name (char *); -#define STATIC_TRANSFORM_NAME(x) sunpro_static_transform_name (x) -#define IS_STATIC_TRANSFORM_NAME(name) ((name)[0] == '$') - -/* Enable handling of shared libraries for a.out executables. */ -#define HANDLE_SVR4_EXEC_EMULATORS diff --git a/gdb/config/sparc/tm-vxsparc.h b/gdb/config/sparc/tm-vxsparc.h deleted file mode 100644 index 95861ecf9fb..00000000000 --- a/gdb/config/sparc/tm-vxsparc.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Target machine description for VxWorks sparc's, for GDB, the GNU debugger. - Copyright 1993, 1999 Free Software Foundation, Inc. - Contributed by Cygnus Support. - - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "sparc/tm-spc-em.h" -#include "config/tm-vxworks.h" - -/* Number of registers in a ptrace_getfpregs call. */ - -/* #define VX_SIZE_FPREGS (don't know how many) */ diff --git a/gdb/config/sparc/vxsparc.mt b/gdb/config/sparc/vxsparc.mt deleted file mode 100644 index 9eadd17451d..00000000000 --- a/gdb/config/sparc/vxsparc.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Target: SPARC running VxWorks -TDEPFILES= sparc-tdep.o remote-vx.o remote-vxsparc.o xdr_ld.o xdr_ptrace.o xdr_rdb.o -TM_FILE= tm-vxsparc.h diff --git a/gdb/config/sparc/xm-linux.h b/gdb/config/sparc/xm-linux.h deleted file mode 100644 index b0518e650e9..00000000000 --- a/gdb/config/sparc/xm-linux.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Macro definitions for running gdb on a Sparc running GNU/Linux. - - Copyright 1989, 1993, 1994, 1995, 1996, 1998, 2001, 2002 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#ifndef XM_SPARCLINUX_H -#define XM_SPARCLINUX_H - -/* This is the amount to subtract from u.u_ar0 - to get the offset in the core file of the register values. */ -#define KERNEL_U_ADDR 0x0 - -#define U_REGS_OFFSET 0 - -/* If you expect to use the mmalloc package to obtain mapped symbol files, - for now you have to specify some parameters that determine how gdb places - the mappings in it's address space. See the comments in map_to_address() - for details. This is expected to only be a short term solution. Yes it - is a kludge. - FIXME: Make this more automatic. */ - -#define MMAP_BASE_ADDRESS 0xE0000000 /* First mapping here */ -#define MMAP_INCREMENT 0x01000000 /* Increment to next mapping */ - -#endif /* _XM_SPARCLINUX_H */ diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h deleted file mode 100644 index 490962d4495..00000000000 --- a/gdb/config/sparc/xm-sun4sol2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Macro definitions for running gdb on a Sun 4 running Solaris 2. - Copyright 1989, 1992, 1993, 1994, 1995, 1996, 1998, 2000 - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -/* Pick up more stuff from the generic SVR4 host include file. */ - -#include "config/xm-sysv4.h" - -/* These are not currently used in SVR4 (but should be, FIXME!). */ -#undef DO_DEFERRED_STORES -#undef CLEAR_DEFERRED_STORES - -/* solaris doesn't have siginterrupt, though it has sigaction; however, - in this case siginterrupt would just be setting the default. */ -#define NO_SIGINTERRUPT - -/* On sol2.7, <curses.h> emits a bunch of 'macro redefined' - warnings, which makes autoconf think curses.h doesn't - exist. Compensate for that here. */ -#define HAVE_CURSES_H 1 diff --git a/gdb/configure.host b/gdb/configure.host index 025e577ccac..6f284821015 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -125,20 +125,16 @@ s390*-*-*) gdb_host=s390 ;; sh*-*-netbsdelf*) gdb_host=nbsd ;; +sparc64-*-freebsd*) gdb_host=fbsd ;; sparc-*-linux*) gdb_host=linux ;; -sparc-*-lynxos*) gdb_host=sparclynx ;; +sparc64-*-linux*) gdb_host=linux64 ;; sparc-*-netbsdelf*) gdb_host=nbsdelf ;; sparc-*-netbsdaout*) gdb_host=nbsdaout ;; sparc-*-netbsd*) gdb_host=nbsdaout ;; -sparc-*-solaris2*) gdb_host=sun4sol2 ;; -sparc-*-sunos4*) gdb_host=sun4os4 ;; -sparc-*-sunos5*) gdb_host=sun4sol2 ;; -sparc-*-*) gdb_host=sun4os4 ;; -sparc64-*-freebsd*|ultrasparc-*-freebsd*|sparcv9-*-freebsd*) - gdb_host=fbsd ;; -sparc64-*-linux*) gdb_host=linux ;; sparc64-*-netbsd*) gdb_host=nbsd64 ;; -sparcv9-*-* | sparc64-*-*) gdb_host=sun4sol2 ;; +sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*) + gdb_host=sol2 + ;; vax-*-bsd*) gdb_host=vaxbsd ;; vax-*-ultrix2*) gdb_host=vaxult2 ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 678f7763c06..d49049fa3af 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -186,26 +186,18 @@ sh*-*-netbsdelf*) gdb_target=nbsd ;; sh-*-nto*) gdb_target=nto ;; sh*) gdb_target=embed ;; -sparc-*-aout*) gdb_target=sparc-em ;; -sparc-*-coff*) gdb_target=sparc-em ;; -sparc-*-elf*) gdb_target=sparc-em ;; sparc-*-linux*) gdb_target=linux ;; -sparc-*-lynxos*) gdb_target=sparclynx ;; +sparc64-*-linux*) gdb_target=linux64 ;; sparc-*-netbsd*) gdb_target=nbsd ;; -sparc-*-solaris2*) gdb_target=sun4sol2 ;; -sparc-*-sunos4*) gdb_target=sun4os4 ;; -sparc-*-sunos5*) gdb_target=sun4sol2 ;; -sparc-*-vxworks*) gdb_target=vxsparc ;; -sparc-*-*) gdb_target=sun4os4 ;; -# It's not clear what the right solution for "v8plus" systems is yet. -# For now, stick with sparc-sun-solaris2 since that's what config.guess -# should return. Work is still needed to get gdb to print the 64 bit -# regs (some of which are usable in v8plus) so sp64sol.mt hasn't been -# deleted though presumably it should be eventually. -#sparc64-*-solaris2*) gdb_target=sp64sol2 ;; -sparc64-*-linux*) gdb_target=sp64linux ;; sparc64-*-netbsd*) gdb_target=nbsd64 ;; -sparcv9-*-* | sparc64-*-*) gdb_target=sp64 ;; +sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*) + gdb_target=sol2 + ;; +sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*) + gdb_target=sol2-64 + ;; +sparc-*-*) gdb_target=sparc ;; +sparc64-*-*) gdb_target=sparc64 ;; xstormy16-*-*) gdb_target=xstormy16 ;; diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c deleted file mode 100644 index f43cb593b20..00000000000 --- a/gdb/sparc-linux-nat.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Native-dependent code for GNU/Linux SPARC. - - Copyright 2001, 2002, 2003 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "defs.h" -#include "regcache.h" -#include "sparc-tdep.h" - -#include <sys/procfs.h> - -/* Prototypes for supply_gregset etc. */ -#include "gregset.h" - -void -supply_gregset (elf_gregset_t *gregsetp) -{ - elf_greg_t *regp = (elf_greg_t *) gregsetp; - int i; - - for (i = G0_REGNUM; i <= I7_REGNUM; i++) - supply_register (i, (char *) (regp + (i - G0_REGNUM))); - - supply_register (PS_REGNUM, (char *) (regp + 32)); - - supply_register (PC_REGNUM, (char *) (regp + 33)); - supply_register (DEPRECATED_NPC_REGNUM, (char *) (regp + 34)); - supply_register (Y_REGNUM, (char *) (regp + 35)); - - supply_register (WIM_REGNUM, (char *) (regp + 36)); - supply_register (TBR_REGNUM, (char *) (regp + 37)); - - /* Fill inaccessible registers with zero. */ - supply_register (CPS_REGNUM, NULL); -} - -void -fill_gregset (elf_gregset_t *gregsetp, int regno) -{ - elf_greg_t *regp = (elf_greg_t *) gregsetp; - int i; - - for (i = G0_REGNUM; i <= I7_REGNUM; i++) - if (regno == -1 || regno == i) - regcache_collect (i, regp + (i - G0_REGNUM)); - - if (regno == -1 || regno == PS_REGNUM) - regcache_collect (PS_REGNUM, regp + 32); - - if (regno == -1 || regno == PC_REGNUM) - regcache_collect (PC_REGNUM, regp + 33); - if (regno == -1 || regno == DEPRECATED_NPC_REGNUM) - regcache_collect (DEPRECATED_NPC_REGNUM, regp + 34); - if (regno == -1 || regno == Y_REGNUM) - regcache_collect (Y_REGNUM, regp + 35); - - if (regno == -1 || regno == WIM_REGNUM) - regcache_collect (WIM_REGNUM, regp + 36); - if (regno == -1 || regno == TBR_REGNUM) - regcache_collect (TBR_REGNUM, regp + 37); -} - -void -supply_fpregset (elf_fpregset_t *fpregsetp) -{ - int i; - - for (i = FP0_REGNUM; i < FP0_REGNUM + 32; i++) - supply_register (i, (char *) &fpregsetp->pr_fr.pr_regs[i - FP0_REGNUM]); - - supply_register (FPS_REGNUM, (char *) &fpregsetp->pr_fsr); -} - -void -fill_fpregset (elf_fpregset_t *fpregsetp, int regno) -{ - int i; - - for (i = FP0_REGNUM; i < FP0_REGNUM + 32; i++) - if (regno == -1 || regno == i) - regcache_collect (i, &fpregsetp->pr_fr.pr_regs[i - FP0_REGNUM]); - - if (regno == -1 || regno == FPS_REGNUM) - regcache_collect (FPS_REGNUM, &fpregsetp->pr_fsr); -} diff --git a/gdb/sparc-linux-tdep.c b/gdb/sparc-linux-tdep.c new file mode 100644 index 00000000000..13875af438e --- /dev/null +++ b/gdb/sparc-linux-tdep.c @@ -0,0 +1,311 @@ +/* Target-dependent code for GNU/Linux SPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "floatformat.h" +#include "frame.h" +#include "frame-unwind.h" +#include "gdbarch.h" +#include "gdbcore.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" + +/* Recognizing signal handler frames. */ + +/* GNU/Linux has two flavors of signals. Normal signal handlers, and + "realtime" (RT) signals. The RT signals can provide additional + information to the signal handler if the SA_SIGINFO flag is set + when establishing a signal handler using `sigaction'. It is not + unlikely that future versions of GNU/Linux will support SA_SIGINFO + for normal signals too. */ + +/* When the sparc Linux kernel calls a signal handler and the + SA_RESTORER flag isn't set, the return address points to a bit of + code on the stack. This function returns whether the PC appears to + be within this bit of code. + + The instruction sequence for normal signals is + mov __NR_sigreturn, %g1 ! hex: 0x821020d8 + ta 0x10 ! hex: 0x91d02010 + + Checking for the code sequence should be somewhat reliable, because + the effect is to call the system call sigreturn. This is unlikely + to occur anywhere other than a signal trampoline. + + It kind of sucks that we have to read memory from the process in + order to identify a signal trampoline, but there doesn't seem to be + any other way. However, sparc32_linux_pc_in_sigtramp arranges to + only call us if no function name could be identified, which should + be the case since the code is on the stack. */ + +#define LINUX32_SIGTRAMP_INSN0 0x821020d8 /* mov __NR_sigreturn, %g1 */ +#define LINUX32_SIGTRAMP_INSN1 0x91d02010 /* ta 0x10 */ + +/* The instruction sequence for RT signals is + mov __NR_rt_sigreturn, %g1 ! hex: 0x82102065 + ta {0x10,0x6d} ! hex: 0x91d02010 or 0x91d0206d + + The effect is to call the system call rt_sigreturn. The trap number + is variable based upon whether this is a 32-bit or 64-bit sparc binary. + Note that 64-bit binaries only use this RT signal return method. */ + +#define LINUX32_RT_SIGTRAMP_INSN0 0x82102065 +#define LINUX32_RT_SIGTRAMP_INSN1 0x91d02010 + +/* If PC is in a sigtramp routine consisting of the instructions INSN0 + and INSN1, return the address of the start of the routine. + Otherwise, return 0. */ + +CORE_ADDR +sparc_linux_sigtramp_start (CORE_ADDR pc, ULONGEST insn0, ULONGEST insn1) +{ + ULONGEST word0, word1; + char buf[8]; /* Two instructions. */ + + /* We only recognize a signal trampoline if PC is at the start of + one of the instructions. We optimize for finding the PC at the + start of the instruction sequence, as will be the case when the + trampoline is not the first frame on the stack. We assume that + in the case where the PC is not at the start of the instruction + sequence, there will be a few trailing readable bytes on the + stack. */ + + if (read_memory_nobpt (pc, buf, sizeof buf) != 0) + return 0; + + word0 = extract_unsigned_integer (buf, 4); + if (word0 != insn0) + { + if (word0 != insn1) + return 0; + + pc -= 4; + if (read_memory_nobpt (pc, buf, sizeof buf) != 0) + return 0; + + word0 = extract_unsigned_integer (buf, 4); + } + + word1 = extract_unsigned_integer (buf + 4, 4); + if (word0 != insn0 || word1 != insn1) + return 0; + + return pc; +} + +static CORE_ADDR +sparc32_linux_sigtramp_start (CORE_ADDR pc) +{ + return sparc_linux_sigtramp_start (pc, LINUX32_SIGTRAMP_INSN0, + LINUX32_SIGTRAMP_INSN1); +} + +static CORE_ADDR +sparc32_linux_rt_sigtramp_start (CORE_ADDR pc) +{ + return sparc_linux_sigtramp_start (pc, LINUX32_RT_SIGTRAMP_INSN0, + LINUX32_RT_SIGTRAMP_INSN1); +} + +static int +sparc32_linux_pc_in_sigtramp (CORE_ADDR pc, char *name) +{ + /* If we have NAME, we can optimize the search. The trampolines are + named __restore and __restore_rt. However, they aren't dynamically + exported from the shared C library, so the trampoline may appear to + be part of the preceding function. This should always be sigaction, + __sigaction, or __libc_sigaction (all aliases to the same function). */ + if (name == NULL || strstr (name, "sigaction") != NULL) + return (sparc32_linux_sigtramp_start (pc) != 0 + || sparc32_linux_rt_sigtramp_start (pc) != 0); + + return (strcmp ("__restore", name) == 0 + || strcmp ("__restore_rt", name) == 0); +} + +static struct sparc_frame_cache * +sparc32_linux_sigtramp_frame_cache (struct frame_info *next_frame, + void **this_cache) +{ + struct sparc_frame_cache *cache; + CORE_ADDR sigcontext_addr, addr; + int regnum; + + if (*this_cache) + return *this_cache; + + cache = sparc32_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); + + /* ??? What about signal trampolines that aren't frameless? */ + regnum = SPARC_SP_REGNUM; + cache->base = frame_unwind_register_unsigned (next_frame, regnum); + + regnum = SPARC_O1_REGNUM; + sigcontext_addr = frame_unwind_register_unsigned (next_frame, regnum); + + cache->pc = frame_pc_unwind (next_frame); + addr = sparc32_linux_sigtramp_start (cache->pc); + if (addr == 0) + { + /* If this is a RT signal trampoline, adjust SIGCONTEXT_ADDR + accordingly. */ + addr = sparc32_linux_rt_sigtramp_start (cache->pc); + if (addr) + sigcontext_addr += 128; + else + addr = frame_func_unwind (next_frame); + } + cache->pc = addr; + + cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); + + cache->saved_regs[SPARC32_PSR_REGNUM].addr = sigcontext_addr + 0; + cache->saved_regs[SPARC32_PC_REGNUM].addr = sigcontext_addr + 4; + cache->saved_regs[SPARC32_NPC_REGNUM].addr = sigcontext_addr + 8; + cache->saved_regs[SPARC32_Y_REGNUM].addr = sigcontext_addr + 12; + + /* Since %g0 is always zero, keep the identity encoding. */ + for (regnum = SPARC_G1_REGNUM, addr = sigcontext_addr + 20; + regnum <= SPARC_O7_REGNUM; regnum++, addr += 4) + cache->saved_regs[regnum].addr = addr; + + for (regnum = SPARC_L0_REGNUM, addr = cache->base; + regnum <= SPARC_I7_REGNUM; regnum++, addr += 4) + cache->saved_regs[regnum].addr = addr; + + return cache; +} + +static void +sparc32_linux_sigtramp_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc32_linux_sigtramp_frame_cache (next_frame, this_cache); + + (*this_id) = frame_id_build (cache->base, cache->pc); +} + +static void +sparc32_linux_sigtramp_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) +{ + struct sparc_frame_cache *cache = + sparc32_linux_sigtramp_frame_cache (next_frame, this_cache); + + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} + +static const struct frame_unwind sparc32_linux_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc32_linux_sigtramp_frame_this_id, + sparc32_linux_sigtramp_frame_prev_register +}; + +static const struct frame_unwind * +sparc32_linux_sigtramp_frame_sniffer (struct frame_info *next_frame) +{ + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; + + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc32_linux_pc_in_sigtramp (pc, name)) + return &sparc32_linux_sigtramp_frame_unwind; + + return NULL; +} + + +static struct link_map_offsets * +sparc32_linux_svr4_fetch_link_map_offsets (void) +{ + static struct link_map_offsets lmo; + static struct link_map_offsets *lmp = NULL; + + if (lmp == NULL) + { + lmp = &lmo; + + /* Everything we need is in the first 8 bytes. */ + lmo.r_debug_size = 8; + lmo.r_map_offset = 4; + lmo.r_map_size = 4; + + /* Everything we need is in the first 20 bytes. */ + lmo.link_map_size = 20; + lmo.l_addr_offset = 0; + lmo.l_addr_size = 4; + lmo.l_name_offset = 4; + lmo.l_name_size = 4; + lmo.l_next_offset = 12; + lmo.l_next_size = 4; + lmo.l_prev_offset = 16; + lmo.l_prev_size = 4; + } + + return lmp; +} + +static void +sparc32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + /* GNU/Linux is very similar to Solaris ... */ + sparc32_sol2_init_abi (info, gdbarch); + + /* ... but doesn't have kernel-assisted single-stepping support. */ + set_gdbarch_software_single_step (gdbarch, sparc_software_single_step); + + /* GNU/Linux 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, sparc32_linux_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc32_linux_sigtramp_frame_sniffer); + + set_solib_svr4_fetch_link_map_offsets + (gdbarch, sparc32_linux_svr4_fetch_link_map_offsets); +} + +/* Provide a prototype to silence -Wmissing-prototypes. */ +extern void _initialize_sparc_linux_tdep (void); + +void +_initialize_sparc_linux_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_LINUX, + sparc32_linux_init_abi); +} diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c index a76d0e546ee..09ee7c6471b 100644 --- a/gdb/sparc-nat.c +++ b/gdb/sparc-nat.c @@ -1,7 +1,6 @@ -/* Functions specific to running gdb native on a SPARC running SunOS4. +/* Native-dependent code for SPARC. - Copyright 1989, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -22,46 +21,121 @@ #include "defs.h" #include "inferior.h" -#include "target.h" -#include "gdbcore.h" #include "regcache.h" -#include "sparc-tdep.h" - -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif #include <signal.h> +#include "gdb_string.h" #include <sys/ptrace.h> #include "gdb_wait.h" -#ifdef __linux__ -#include <asm/reg.h> -#else +#ifdef HAVE_MACHINE_REG_H #include <machine/reg.h> #endif -#include <sys/user.h> -/* We don't store all registers immediately when requested, since they - get sent over in large chunks anyway. Instead, we accumulate most - of the changes and send them over once. "deferred_stores" keeps - track of which sets of registers we have locally-changed copies of, - so we only need send the groups that have changed. */ +#include "sparc-tdep.h" +#include "sparc-nat.h" + +/* With some trickery we can use the code in this file for most (if + not all) ptrace(2) based SPARC systems, which includes SunOS 4, + Linux and the various SPARC BSD's. + + First, we need a data structure for use with ptrace(2). SunOS has + `struct regs' and `struct fp_status' in <machine/reg.h>. BSD's + have `struct reg' and `struct fpreg' in <machine/reg.h>. GNU/Linux + has the same structures as SunOS 4, but they're in <asm/reg.h>, + which is a kernel header. As a general rule we avoid including + GNU/Linux kernel headers. Fortunately GNU/Linux has a `gregset_t' + and a `fpregset_t' that are equivalent to `struct regs' and `struct + fp_status' in <sys/ucontext.h>, which is automatically included by + <signal.h>. Settling on using the `gregset_t' and `fpregset_t' + typedefs, providing them for the other systems, therefore solves + the puzzle. */ + +#ifdef HAVE_MACHINE_REG_H +#ifdef HAVE_STRUCT_REG +typedef struct reg gregset_t; +typedef struct fpreg fpregset_t; +#else +typedef struct regs gregset_t; +typedef struct fp_status fpregset_t; +#endif +#endif + +/* Second, we need to remap the BSD ptrace(2) requests to their SunOS + equivalents. GNU/Linux already follows SunOS here. */ -#define INT_REGS 1 -#define STACK_REGS 2 -#define FP_REGS 4 +#ifndef PTRACE_GETREGS +#define PTRACE_GETREGS PT_GETREGS +#endif + +#ifndef PTRACE_SETREGS +#define PTRACE_SETREGS PT_SETREGS +#endif -/* Fetch one or more registers from the inferior. REGNO == -1 to get - them all. We actually fetch more than requested, when convenient, - marking them as valid so we won't fetch them again. */ +#ifndef PTRACE_GETFPREGS +#define PTRACE_GETFPREGS PT_GETFPREGS +#endif + +#ifndef PTRACE_SETFPREGS +#define PTRACE_SETFPREGS PT_SETFPREGS +#endif + +/* Register set description. */ +const struct sparc_gregset *sparc_gregset; +void (*sparc_supply_gregset) (const struct sparc_gregset *, + struct regcache *, int , const void *); +void (*sparc_collect_gregset) (const struct sparc_gregset *, + const struct regcache *, int, void *); +void (*sparc_supply_fpregset) (struct regcache *, int , const void *); +void (*sparc_collect_fpregset) (const struct regcache *, int , void *); +int (*sparc_gregset_supplies_p) (int); +int (*sparc_fpregset_supplies_p) (int); + +/* Determine whether `gregset_t' contains register REGNUM. */ + +int +sparc32_gregset_supplies_p (int regnum) +{ + /* Integer registers. */ + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM) + || (regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_L7_REGNUM) + || (regnum >= SPARC_I0_REGNUM && regnum <= SPARC_I7_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC32_PC_REGNUM + || regnum == SPARC32_NPC_REGNUM + || regnum == SPARC32_PSR_REGNUM + || regnum == SPARC32_Y_REGNUM) + return 1; + + return 0; +} + +/* Determine whether `fpregset_t' contains register REGNUM. */ + +int +sparc32_fpregset_supplies_p (int regnum) +{ + /* Floating-point registers. */ + if (regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) + return 1; + + /* Control registers. */ + if (regnum == SPARC32_FSR_REGNUM) + return 1; + + return 0; +} + +/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this + for all registers (including the floating-point registers). */ void -fetch_inferior_registers (int regno) +fetch_inferior_registers (int regnum) { - struct regs inferior_registers; - struct fp_status inferior_fp_registers; - int i; - int fetch_pid; + struct regcache *regcache = current_regcache; + int pid; /* NOTE: cagney/2002-12-03: This code assumes that the currently selected light weight processes' registers can be written @@ -76,309 +150,123 @@ fetch_inferior_registers (int regno) These functions should instead be paramaterized with an explicit object (struct regcache, struct thread_info?) into which the LWPs registers can be written. */ + pid = TIDGET (inferior_ptid); + if (pid == 0) + pid = PIDGET (inferior_ptid); - fetch_pid = TIDGET (inferior_ptid); - if (fetch_pid == 0) - fetch_pid = PIDGET (inferior_ptid); - - /* We should never be called with deferred stores, because a prerequisite - for writing regs is to have fetched them all (PREPARE_TO_STORE), sigh. */ - if (deferred_stores) - internal_error (__FILE__, __LINE__, "failed internal consistency check"); - - DO_DEFERRED_STORES; - - /* Global and Out regs are fetched directly, as well as the control - registers. If we're getting one of the in or local regs, - and the stack pointer has not yet been fetched, - we have to do that first, since they're found in memory relative - to the stack pointer. */ - if (regno < O7_REGNUM /* including -1 */ - || regno >= Y_REGNUM - || (!deprecated_register_valid[SP_REGNUM] && regno < I7_REGNUM)) + if (regnum == SPARC_G0_REGNUM) { - if (0 != ptrace (PTRACE_GETREGS, fetch_pid, - (PTRACE_ARG3_TYPE) & inferior_registers, 0)) - perror ("ptrace_getregs"); - - deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (1)], - &inferior_registers.r_g1, 15 * DEPRECATED_REGISTER_RAW_SIZE (G0_REGNUM)); - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] - = inferior_registers.r_ps; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] - = inferior_registers.r_pc; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] - = inferior_registers.r_npc; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; - - for (i = G0_REGNUM; i <= O7_REGNUM; i++) - deprecated_register_valid[i] = 1; - deprecated_register_valid[Y_REGNUM] = 1; - deprecated_register_valid[PS_REGNUM] = 1; - deprecated_register_valid[PC_REGNUM] = 1; - deprecated_register_valid[DEPRECATED_NPC_REGNUM] = 1; - /* If we don't set these valid, read_register_bytes() rereads - all the regs every time it is called! FIXME. */ - deprecated_register_valid[WIM_REGNUM] = 1; /* Not true yet, FIXME */ - deprecated_register_valid[TBR_REGNUM] = 1; /* Not true yet, FIXME */ - deprecated_register_valid[CPS_REGNUM] = 1; /* Not true yet, FIXME */ + regcache_raw_supply (regcache, SPARC_G0_REGNUM, NULL); + return; } - /* Floating point registers */ - if (regno == -1 || - regno == FPS_REGNUM || - (regno >= FP0_REGNUM && regno <= FP0_REGNUM + 31)) + if (regnum == -1 || sparc_gregset_supplies_p (regnum)) { - if (0 != ptrace (PTRACE_GETFPREGS, fetch_pid, - (PTRACE_ARG3_TYPE) & inferior_fp_registers, - 0)) - perror ("ptrace_getfpregs"); - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - &inferior_fp_registers, sizeof inferior_fp_registers.fpu_fr); - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - &inferior_fp_registers.Fpu_fsr, sizeof (FPU_FSR_TYPE)); - for (i = FP0_REGNUM; i <= FP0_REGNUM + 31; i++) - deprecated_register_valid[i] = 1; - deprecated_register_valid[FPS_REGNUM] = 1; - } + gregset_t regs; - /* These regs are saved on the stack by the kernel. Only read them - all (16 ptrace calls!) if we really need them. */ - if (regno == -1) - { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; - target_read_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], - 16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)); - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - deprecated_register_valid[i] = 1; + if (ptrace (PTRACE_GETREGS, pid, (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + sparc_supply_gregset (sparc_gregset, regcache, -1, ®s); + if (regnum != -1) + return; } - else if (regno >= L0_REGNUM && regno <= I7_REGNUM) + + if (regnum == -1 || sparc_fpregset_supplies_p (regnum)) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; - i = DEPRECATED_REGISTER_BYTE (regno); - if (deprecated_register_valid[regno]) - printf_unfiltered ("register %d valid and read\n", regno); - target_read_memory (sp + i - DEPRECATED_REGISTER_BYTE (L0_REGNUM), - &deprecated_registers[i], DEPRECATED_REGISTER_RAW_SIZE (regno)); - deprecated_register_valid[regno] = 1; + fpregset_t fpregs; + + if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + sparc_supply_fpregset (regcache, -1, &fpregs); } } -/* Store our register values back into the inferior. - If REGNO is -1, do this for all registers. - Otherwise, REGNO specifies which register (so we can save time). */ - void -store_inferior_registers (int regno) +store_inferior_registers (int regnum) { - struct regs inferior_registers; - struct fp_status inferior_fp_registers; - int wanna_store = INT_REGS + STACK_REGS + FP_REGS; - int store_pid; + struct regcache *regcache = current_regcache; + int pid; /* NOTE: cagney/2002-12-02: See comment in fetch_inferior_registers about threaded assumptions. */ - store_pid = TIDGET (inferior_ptid); - if (store_pid == 0) - store_pid = PIDGET (inferior_ptid); + pid = TIDGET (inferior_ptid); + if (pid == 0) + pid = PIDGET (inferior_ptid); - /* First decide which pieces of machine-state we need to modify. - Default for regno == -1 case is all pieces. */ - if (regno >= 0) + if (regnum == -1 || sparc_gregset_supplies_p (regnum)) { - if (FP0_REGNUM <= regno && regno < FP0_REGNUM + 32) - { - wanna_store = FP_REGS; - } - else - { - if (regno == SP_REGNUM) - wanna_store = INT_REGS + STACK_REGS; - else if (regno < L0_REGNUM || regno > I7_REGNUM) - wanna_store = INT_REGS; - else if (regno == FPS_REGNUM) - wanna_store = FP_REGS; - else - wanna_store = STACK_REGS; - } - } + gregset_t regs; - /* See if we're forcing the stores to happen now, or deferring. */ - if (regno == -2) - { - wanna_store = deferred_stores; - deferred_stores = 0; - } - else - { - if (wanna_store == STACK_REGS) - { - /* Fall through and just store one stack reg. If we deferred - it, we'd have to store them all, or remember more info. */ - } - else - { - deferred_stores |= wanna_store; - return; - } - } + if (ptrace (PTRACE_GETREGS, pid, (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); - if (wanna_store & STACK_REGS) - { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; + sparc_collect_gregset (sparc_gregset, regcache, regnum, ®s); - if (regno < 0 || regno == SP_REGNUM) - { - if (!deprecated_register_valid[L0_REGNUM + 5]) - internal_error (__FILE__, __LINE__, "failed internal consistency check"); - target_write_memory (sp, - &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], - 16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)); - } - else - { - if (!deprecated_register_valid[regno]) - internal_error (__FILE__, __LINE__, "failed internal consistency check"); - target_write_memory (sp + DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (L0_REGNUM), - &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], - DEPRECATED_REGISTER_RAW_SIZE (regno)); - } + if (ptrace (PTRACE_SETREGS, pid, (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't write registers"); - } + /* Deal with the stack regs. */ + if (regnum == -1 || regnum == SPARC_SP_REGNUM + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM)) + { + ULONGEST sp; - if (wanna_store & INT_REGS) - { - if (!deprecated_register_valid[G1_REGNUM]) - internal_error (__FILE__, __LINE__, "failed internal consistency check"); - - memcpy (&inferior_registers.r_g1, - &deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], - 15 * DEPRECATED_REGISTER_RAW_SIZE (G1_REGNUM)); - - inferior_registers.r_ps = - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)]; - inferior_registers.r_pc = - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; - inferior_registers.r_npc = - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]; - inferior_registers.r_y = - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]; - - if (0 != ptrace (PTRACE_SETREGS, store_pid, - (PTRACE_ARG3_TYPE) & inferior_registers, 0)) - perror ("ptrace_setregs"); - } + regcache_cooked_read_unsigned (regcache, SPARC_SP_REGNUM, &sp); + sparc_collect_rwindow (regcache, sp, regnum); + } - if (wanna_store & FP_REGS) - { - if (!deprecated_register_valid[FP0_REGNUM + 9]) - internal_error (__FILE__, __LINE__, "failed internal consistency check"); - memcpy (&inferior_fp_registers, - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - sizeof inferior_fp_registers.fpu_fr); - memcpy (&inferior_fp_registers.Fpu_fsr, - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - sizeof (FPU_FSR_TYPE)); - if (0 != - ptrace (PTRACE_SETFPREGS, store_pid, - (PTRACE_ARG3_TYPE) & inferior_fp_registers, 0)) - perror ("ptrace_setfpregs"); + if (regnum != -1) + return; } -} - -/* Provide registers to GDB from a core file. - - CORE_REG_SECT points to an array of bytes, which are the contents - of a `note' from a core file which BFD thinks might contain - register contents. CORE_REG_SIZE is its size. - - WHICH says which register set corelow suspects this is: - 0 --- the general-purpose register set - 2 --- the floating-point register set - - IGNORE is unused. */ - -static void -fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, - int which, CORE_ADDR ignore) -{ - if (which == 0) + if (regnum == -1 || sparc_fpregset_supplies_p (regnum)) { + fpregset_t fpregs, saved_fpregs; - /* Integer registers */ - -#define gregs ((struct regs *)core_reg_sect) - /* G0 *always* holds 0. */ - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; - - /* The globals and output registers. */ - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, - 15 * DEPRECATED_REGISTER_RAW_SIZE (G1_REGNUM)); - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = gregs->r_npc; - *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; - - /* My best guess at where to get the locals and input - registers is exactly where they usually are, right above - the stack pointer. If the core dump was caused by a bus error - from blowing away the stack pointer (as is possible) then this - won't work, but it's worth the try. */ - { - int sp; - - sp = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; - if (0 != target_read_memory (sp, - &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], - 16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM))) - { - /* fprintf_unfiltered so user can still use gdb */ - fprintf_unfiltered (gdb_stderr, - "Couldn't read input and local registers from core file\n"); - } - } - } - else if (which == 2) - { + if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating-point registers"); - /* Floating point registers */ + memcpy (&saved_fpregs, &fpregs, sizeof (fpregs)); + sparc_collect_fpregset (regcache, regnum, &fpregs); -#define fpuregs ((struct fpu *) core_reg_sect) - if (core_reg_size >= sizeof (struct fpu)) + /* Writing the floating-point registers will fail on NetBSD with + EINVAL if the inferior process doesn't have an FPU state + (i.e. if it didn't use the FPU yet). Therefore we don't try + to write the registers if nothing changed. */ + if (memcmp (&saved_fpregs, &fpregs, sizeof (fpregs)) != 0) { - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - fpuregs->fpu_regs, sizeof (fpuregs->fpu_regs)); - memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - &fpuregs->fpu_fsr, sizeof (FPU_FSR_TYPE)); + if (ptrace (PTRACE_SETFPREGS, pid, + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating-point registers"); } - else - fprintf_unfiltered (gdb_stderr, "Couldn't read float regs from core file\n"); - } -} -int -kernel_u_size (void) -{ - return (sizeof (struct user)); + if (regnum != -1) + return; + } } -/* Register that we are able to handle sparc core file formats. - FIXME: is this really bfd_target_unknown_flavour? */ - -static struct core_fns sparc_core_fns = -{ - bfd_target_unknown_flavour, /* core_flavour */ - default_check_format, /* check_format */ - default_core_sniffer, /* core_sniffer */ - fetch_core_registers, /* core_read_registers */ - NULL /* next */ -}; +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc_nat (void); void -_initialize_core_sparc (void) +_initialize_sparc_nat (void) { - add_core_fns (&sparc_core_fns); + /* Deafult to using SunOS 4 register sets. */ + if (sparc_gregset == NULL) + sparc_gregset = &sparc32_sunos4_gregset; + if (sparc_supply_gregset == NULL) + sparc_supply_gregset = sparc32_supply_gregset; + if (sparc_collect_gregset == NULL) + sparc_collect_gregset = sparc32_collect_gregset; + if (sparc_supply_fpregset == NULL) + sparc_supply_fpregset = sparc32_supply_fpregset; + if (sparc_collect_fpregset == NULL) + sparc_collect_fpregset = sparc32_collect_fpregset; + if (sparc_gregset_supplies_p == NULL) + sparc_gregset_supplies_p = sparc32_gregset_supplies_p; + if (sparc_fpregset_supplies_p == NULL) + sparc_fpregset_supplies_p = sparc32_fpregset_supplies_p; } diff --git a/gdb/sparc-nat.h b/gdb/sparc-nat.h new file mode 100644 index 00000000000..8f99b1eea11 --- /dev/null +++ b/gdb/sparc-nat.h @@ -0,0 +1,40 @@ +/* Native-dependent code for SPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#ifndef SPARC_NAT_H +#define SPARC_NAT_H 1 + +struct sparc_gregset; + +extern const struct sparc_gregset *sparc_gregset; +extern void (*sparc_supply_gregset) (const struct sparc_gregset *, + struct regcache *, int , const void *); +extern void (*sparc_collect_gregset) (const struct sparc_gregset *, + const struct regcache *, int, void *); +extern void (*sparc_supply_fpregset) (struct regcache *, int , const void *); +extern void (*sparc_collect_fpregset) (const struct regcache *, int , void *); +extern int (*sparc_gregset_supplies_p) (int); +extern int (*sparc_fpregset_supplies_p) (int); + +extern int sparc32_gregset_supplies_p (int regnum); +extern int sparc32_fpregset_supplies_p (int regnum); + +#endif /* sparc-nat.h */ diff --git a/gdb/sparc-sol2-nat.c b/gdb/sparc-sol2-nat.c new file mode 100644 index 00000000000..19435e7101a --- /dev/null +++ b/gdb/sparc-sol2-nat.c @@ -0,0 +1,98 @@ +/* Native-dependent code for Solaris SPARC. + + Copyright 2003, 2004 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "regcache.h" + +#include <sys/procfs.h> +#include "gregset.h" + +#include "sparc-tdep.h" + +/* This file provids the (temporary) glue between the Solaris SPARC + target dependent code and the machine independent SVR4 /proc + support. */ + +/* Solaris 7 (Solaris 2.7, SunOS 5.7) and up support two process data + models, the traditional 32-bit data model (ILP32) and the 64-bit + data model (LP64). The format of /proc depends on the data model + of the observer (the controlling process, GDB in our case). The + Solaris header files conveniently define PR_MODEL_NATIVE to the + data model of the controlling process. If its value is + PR_MODEL_LP64, we know that GDB is being compiled as a 64-bit + program. + + GNU/Linux uses the same formats as Solaris for its core files (but + not for ptrace(2)). The GNU/Linux headers don't define + PR_MODEL_NATIVE though. Therefore we rely on the __arch64__ define + provided by GCC to determine the appropriate data model. + + Note that a 32-bit GDB won't be able to debug a 64-bit target + process using /proc on Solaris. */ + +#if (defined (__arch64__) || + (defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)) + +#include "sparc64-tdep.h" + +#define sparc_supply_gregset sparc64_supply_gregset +#define sparc_supply_fpregset sparc64_supply_fpregset +#define sparc_collect_gregset sparc64_collect_gregset +#define sparc_collect_fpregset sparc64_collect_fpregset + +#define sparc_sol2_gregset sparc64_sol2_gregset +#define sparc_sol2_fpregset sparc64_sol2_fpregset + +#else + +#define sparc_supply_gregset sparc32_supply_gregset +#define sparc_supply_fpregset sparc32_supply_fpregset +#define sparc_collect_gregset sparc32_collect_gregset +#define sparc_collect_fpregset sparc32_collect_fpregset + +#define sparc_sol2_gregset sparc32_sol2_gregset +#define sparc_sol2_fpregset sparc32_sol2_fpregset + +#endif + +void +supply_gregset (prgregset_t *gregs) +{ + sparc_supply_gregset (&sparc_sol2_gregset, current_regcache, -1, gregs); +} + +void +supply_fpregset (prfpregset_t *fpregs) +{ + sparc_supply_fpregset (current_regcache, -1, fpregs); +} + +void +fill_gregset (prgregset_t *gregs, int regnum) +{ + sparc_collect_gregset (&sparc_sol2_gregset, current_regcache, regnum, gregs); +} + +void +fill_fpregset (prfpregset_t *fpregs, int regnum) +{ + sparc_collect_fpregset (current_regcache, regnum, fpregs); +} diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c new file mode 100644 index 00000000000..5f65b7826d1 --- /dev/null +++ b/gdb/sparc-sol2-tdep.c @@ -0,0 +1,201 @@ +/* Target-dependent code for Solaris SPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "frame.h" +#include "frame-unwind.h" +#include "gdbcore.h" +#include "symtab.h" +#include "objfiles.h" +#include "osabi.h" +#include "regcache.h" +#include "target.h" +#include "trad-frame.h" + +#include "gdb_assert.h" +#include "gdb_string.h" + +#include "sparc-tdep.h" + +/* From <sys/regset.h>. */ +const struct sparc_gregset sparc32_sol2_gregset = +{ + 32 * 4, /* %psr */ + 33 * 4, /* %pc */ + 34 * 4, /* %npc */ + 35 * 4, /* %y */ + 36 * 4, /* %wim */ + 37 * 4, /* %tbr */ + 1 * 4, /* %g1 */ + 16 * 4, /* %l0 */ +}; + + +/* 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, char *name) +{ + return (name && (strcmp (name, "sigacthandler") == 0 + || strcmp (name, "ucbsigvechandler") == 0)); +} + +static struct sparc_frame_cache * +sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, + void **this_cache) +{ + struct sparc_frame_cache *cache; + CORE_ADDR mcontext_addr, addr; + int regnum; + + if (*this_cache) + return *this_cache; + + cache = sparc_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); + + cache->saved_regs = trad_frame_alloc_saved_regs (next_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; + + cache->saved_regs[SPARC32_PSR_REGNUM].addr = mcontext_addr + 0 * 4; + cache->saved_regs[SPARC32_PC_REGNUM].addr = mcontext_addr + 1 * 4; + cache->saved_regs[SPARC32_NPC_REGNUM].addr = mcontext_addr + 2 * 4; + cache->saved_regs[SPARC32_Y_REGNUM].addr = mcontext_addr + 3 * 4; + + /* Since %g0 is always zero, keep the identity encoding. */ + for (regnum = SPARC_G1_REGNUM, addr = mcontext_addr + 4 * 4; + 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)) + { + /* The register windows haven't been flushed. */ + for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++) + trad_frame_set_unknown (cache->saved_regs, regnum); + } + else + { + 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; + } + + return cache; +} + +static void +sparc32_sol2_sigtramp_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc32_sol2_sigtramp_frame_cache (next_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, + void **this_cache, + int regnum, int *optimizedp, + enum lval_type *lvalp, + CORE_ADDR *addrp, + int *realnump, void *valuep) +{ + struct sparc_frame_cache *cache = + sparc32_sol2_sigtramp_frame_cache (next_frame, this_cache); + + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} + +static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc32_sol2_sigtramp_frame_this_id, + sparc32_sol2_sigtramp_frame_prev_register +}; + +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; + + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc_sol2_pc_in_sigtramp (pc, name)) + return &sparc32_sol2_sigtramp_frame_unwind; + + return NULL; +} + + +void +sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* 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); + + /* ...which means that we need some special handling when doing + prologue analysis. */ + tdep->plt_entry_size = 12; + + /* Solaris has kernel-assisted single-stepping support. */ + set_gdbarch_software_single_step (gdbarch, NULL); + + set_gdbarch_pc_in_sigtramp (gdbarch, sparc_sol2_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc32_sol2_sigtramp_frame_sniffer); +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc_sol2_tdep (void); + +void +_initialize_sparc_sol2_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_sparc, 0, + GDB_OSABI_SOLARIS, sparc32_sol2_init_abi); +} diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index d3b24186769..ca249228b6f 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -1,8 +1,6 @@ -/* Target-dependent code for the SPARC for GDB, the GNU debugger. +/* Target-dependent code for SPARC. - Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, - Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -21,108 +19,59 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* ??? Support for calling functions from gdb in sparc64 is unfinished. */ - #include "defs.h" #include "arch-utils.h" +#include "dis-asm.h" +#include "floatformat.h" #include "frame.h" +#include "frame-base.h" +#include "frame-unwind.h" +#include "gdbcore.h" +#include "gdbtypes.h" #include "inferior.h" +#include "symtab.h" +#include "objfiles.h" +#include "osabi.h" +#include "regcache.h" #include "target.h" #include "value.h" -#include "bfd.h" -#include "gdb_string.h" -#include "regcache.h" -#include "osabi.h" -#include "dis-asm.h" - -#include "sparc-tdep.h" -#ifdef USE_PROC_FS -#include <sys/procfs.h> -/* Prototypes for supply_gregset etc. */ -#include "gregset.h" -#endif - -#include "gdbcore.h" #include "gdb_assert.h" +#include "gdb_string.h" -#include "symfile.h" /* for 'entry_point_address' */ - -/* - * Some local macros that have multi-arch and non-multi-arch versions: - */ - -#define SPARC_HAS_FPU 1 -/* Number of bytes devoted to Floating Point registers: */ -#define FP_REGISTER_BYTES (gdbarch_tdep (current_gdbarch)->fp_register_bytes) -/* Highest numbered Floating Point register. */ -#define FP_MAX_REGNUM (gdbarch_tdep (current_gdbarch)->fp_max_regnum) -/* Size of a general (integer) register: */ -#define SPARC_INTREG_SIZE (gdbarch_tdep (current_gdbarch)->intreg_size) -/* Offset within the call dummy stack of the saved registers. */ -#define DUMMY_REG_SAVE_OFFSET (gdbarch_tdep (current_gdbarch)->reg_save_offset) - -struct gdbarch_tdep - { - int fp_register_bytes; - int y_regnum; - int fp_max_regnum; - int intreg_size; - int reg_save_offset; - int call_dummy_call_offset; - int print_insn_mach; - }; - -/* Now make GDB_TARGET_IS_SPARC64 a runtime test. */ -/* FIXME MVS: or try testing bfd_arch_info.arch and bfd_arch_info.mach ... - * define GDB_TARGET_IS_SPARC64 \ - * (TARGET_ARCHITECTURE->arch == bfd_arch_sparc && \ - * (TARGET_ARCHITECTURE->mach == bfd_mach_sparc_v9 || \ - * TARGET_ARCHITECTURE->mach == bfd_mach_sparc_v9a)) - */ - -/* We don't store all registers immediately when requested, since they - get sent over in large chunks anyway. Instead, we accumulate most - of the changes and send them over once. "deferred_stores" keeps - track of which sets of registers we have locally-changed copies of, - so we only need send the groups that have changed. */ - -int deferred_stores = 0; /* Accumulated stores we want to do eventually. */ - - -const unsigned char * -sparc_breakpoint_from_pc (CORE_ADDR *pc, int *len) -{ - static const char breakpoint[] = {0x91, 0xd0, 0x20, 0x01}; - (*len) = sizeof (breakpoint); - return breakpoint; -} - -/* Fetch a single instruction. Even on bi-endian machines - such as sparc86x, instructions are always big-endian. */ - -static unsigned long -fetch_instruction (CORE_ADDR pc) -{ - unsigned long retval; - int i; - unsigned char buf[4]; - - read_memory (pc, buf, sizeof (buf)); - - /* Start at the most significant end of the integer, and work towards - the least significant. */ - retval = 0; - for (i = 0; i < sizeof (buf); ++i) - retval = (retval << 8) | buf[i]; - return retval; -} - - -/* Branches with prediction are treated like their non-predicting cousins. */ -/* FIXME: What about floating point branches? */ +#include "sparc-tdep.h" -/* Macros to extract fields from sparc instructions. */ +/* This file implements the The SPARC 32-bit ABI as defined by the + section "Low-Level System Information" of the SPARC Compliance + Definition (SCD) 2.4.1, which is the 32-bit System V psABI for + SPARC. The SCD lists changes with respect to the origional 32-bit + psABI as defined in the "System V ABI, SPARC Processor + Supplement". + + Note that if we talk about SunOS, we mean SunOS 4.x, which was + BSD-based, which is sometimes (retroactively?) referred to as + Solaris 1.x. If we talk about Solaris we mean Solaris 2.x and + above (Solaris 7, 8 and 9 are nothing but Solaris 2.7, 2.8 and 2.9 + suffering from severe version number inflation). Solaris 2.x is + also known as SunOS 5.x, since that's what uname(1) says. Solaris + 2.x is SVR4-based. */ + +/* Please use the sparc32_-prefix for 32-bit specific code, the + sparc64_-prefix for 64-bit specific code and the sparc_-prefix for + code that can handle both. The 64-bit specific code lives in + sparc64-tdep.c; don't add any here. */ + +/* The SPARC Floating-Point Quad-Precision format is similar to + big-endian IA-64 Quad-recision format. */ +#define floatformat_sparc_quad floatformat_ia64_quad_big + +/* The stack pointer is offset from the stack frame by a BIAS of 2047 + (0x7ff) for 64-bit code. BIAS is likely to be defined on SPARC + hosts, so undefine it first. */ +#undef BIAS +#define BIAS 2047 + +/* Macros to extract fields from SPARC instructions. */ #define X_OP(i) (((i) >> 30) & 0x3) #define X_RD(i) (((i) >> 25) & 0x1f) #define X_A(i) (((i) >> 29) & 1) @@ -130,2225 +79,747 @@ fetch_instruction (CORE_ADDR pc) #define X_OP2(i) (((i) >> 22) & 0x7) #define X_IMM22(i) ((i) & 0x3fffff) #define X_OP3(i) (((i) >> 19) & 0x3f) -#define X_RS1(i) (((i) >> 14) & 0x1f) #define X_I(i) (((i) >> 13) & 1) -#define X_IMM13(i) ((i) & 0x1fff) /* Sign extension macros. */ -#define X_SIMM13(i) ((X_IMM13 (i) ^ 0x1000) - 0x1000) #define X_DISP22(i) ((X_IMM22 (i) ^ 0x200000) - 0x200000) -#define X_CC(i) (((i) >> 20) & 3) -#define X_P(i) (((i) >> 19) & 1) #define X_DISP19(i) ((((i) & 0x7ffff) ^ 0x40000) - 0x40000) -#define X_RCOND(i) (((i) >> 25) & 7) -#define X_DISP16(i) ((((((i) >> 6) && 0xc000) | ((i) & 0x3fff)) ^ 0x8000) - 0x8000) -#define X_FCN(i) (((i) >> 25) & 31) - -typedef enum -{ - Error, not_branch, bicc, bicca, ba, baa, ticc, ta, done_retry -} branch_type; - -/* Simulate single-step ptrace call for sun4. Code written by Gary - Beihl (beihl@mcc.com). */ - -/* npc4 and next_pc describe the situation at the time that the - step-breakpoint was set, not necessary the current value of DEPRECATED_NPC_REGNUM. */ -static CORE_ADDR next_pc, npc4, target; -static int brknpc4, brktrg; -typedef char binsn_quantum[BREAKPOINT_MAX]; -static binsn_quantum break_mem[3]; - -static branch_type isbranch (long, CORE_ADDR, CORE_ADDR *); -/* single_step() is called just before we want to resume the inferior, - if we want to single-step it but there is no hardware or kernel single-step - support (as on all SPARCs). We find all the possible targets of the - coming instruction and breakpoint them. +/* Fetch the instruction at PC. Instructions are always big-endian + even if the processor operates in little-endian mode. */ - single_step is also called just after the inferior stops. If we had - set up a simulated single-step, we undo our damage. */ - -void -sparc_software_single_step (enum target_signal ignore, /* pid, but we don't need it */ - int insert_breakpoints_p) +unsigned long +sparc_fetch_instruction (CORE_ADDR pc) { - branch_type br; - CORE_ADDR pc; - long pc_instruction; - - if (insert_breakpoints_p) - { - /* Always set breakpoint for NPC. */ - next_pc = read_register (DEPRECATED_NPC_REGNUM); - npc4 = next_pc + 4; /* branch not taken */ - - target_insert_breakpoint (next_pc, break_mem[0]); - /* printf_unfiltered ("set break at %x\n",next_pc); */ + unsigned char buf[4]; + unsigned long insn; + int i; - pc = read_register (PC_REGNUM); - pc_instruction = fetch_instruction (pc); - br = isbranch (pc_instruction, pc, &target); - brknpc4 = brktrg = 0; + read_memory (pc, buf, sizeof (buf)); - if (br == bicca) - { - /* Conditional annulled branch will either end up at - npc (if taken) or at npc+4 (if not taken). - Trap npc+4. */ - brknpc4 = 1; - target_insert_breakpoint (npc4, break_mem[1]); - } - else if (br == baa && target != next_pc) - { - /* Unconditional annulled branch will always end up at - the target. */ - brktrg = 1; - target_insert_breakpoint (target, break_mem[2]); - } - else if (GDB_TARGET_IS_SPARC64 && br == done_retry) - { - brktrg = 1; - target_insert_breakpoint (target, break_mem[2]); - } - } - else - { - /* Remove breakpoints */ - target_remove_breakpoint (next_pc, break_mem[0]); + insn = 0; + for (i = 0; i < sizeof (buf); i++) + insn = (insn << 8) | buf[i]; + return insn; +} + +/* Return the contents if register REGNUM as an address. */ - if (brknpc4) - target_remove_breakpoint (npc4, break_mem[1]); +static CORE_ADDR +sparc_address_from_register (int regnum) +{ + ULONGEST addr; - if (brktrg) - target_remove_breakpoint (target, break_mem[2]); - } + regcache_cooked_read_unsigned (current_regcache, regnum, &addr); + return addr; } -struct frame_extra_info -{ - CORE_ADDR bottom; - int in_prologue; - int flat; - /* Following fields only relevant for flat frames. */ - CORE_ADDR pc_addr; - CORE_ADDR fp_addr; - /* Add this to ->frame to get the value of the stack pointer at the - time of the register saves. */ - int sp_offset; -}; -/* Call this for each newly created frame. For SPARC, we need to - calculate the bottom of the frame, and do some extra work if the - prologue has been generated via the -mflat option to GCC. In - particular, we need to know where the previous fp and the pc have - been stashed, since their exact position within the frame may vary. */ +/* The functions on this page are intended to be used to classify + function arguments. */ -void -sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi) -{ - char *name; - CORE_ADDR prologue_start, prologue_end; - int insn; - - frame_extra_info_zalloc (fi, sizeof (struct frame_extra_info)); - frame_saved_regs_zalloc (fi); - - get_frame_extra_info (fi)->bottom = - (get_next_frame (fi) - ? (get_frame_base (fi) == get_frame_base (get_next_frame (fi)) - ? get_frame_extra_info (get_next_frame (fi))->bottom - : get_frame_base (get_next_frame (fi))) - : read_sp ()); - - /* If fi->next is NULL, then we already set ->frame by passing - deprecated_read_fp() to create_new_frame. */ - if (get_next_frame (fi)) - { - char buf[MAX_REGISTER_SIZE]; - - /* Compute ->frame as if not flat. If it is flat, we'll change - it later. */ - if (get_next_frame (get_next_frame (fi)) != NULL - && ((get_frame_type (get_next_frame (get_next_frame (fi))) == SIGTRAMP_FRAME) - || deprecated_frame_in_dummy (get_next_frame (get_next_frame (fi)))) - && frameless_look_for_prologue (get_next_frame (fi))) - { - /* A frameless function interrupted by a signal did not change - the frame pointer, fix up frame pointer accordingly. */ - deprecated_update_frame_base_hack (fi, get_frame_base (get_next_frame (fi))); - get_frame_extra_info (fi)->bottom = - get_frame_extra_info (get_next_frame (fi))->bottom; - } - else - { - /* Should we adjust for stack bias here? */ - ULONGEST tmp; - tmp = get_frame_register_unsigned (fi, DEPRECATED_FP_REGNUM); - deprecated_update_frame_base_hack (fi, tmp); - if (GDB_TARGET_IS_SPARC64 && (get_frame_base (fi) & 1)) - deprecated_update_frame_base_hack (fi, get_frame_base (fi) + 2047); - } - } +/* Check whether TYPE is "Integral or Pointer". */ - /* Decide whether this is a function with a ``flat register window'' - frame. For such functions, the frame pointer is actually in %i7. */ - get_frame_extra_info (fi)->flat = 0; - get_frame_extra_info (fi)->in_prologue = 0; - if (find_pc_partial_function (get_frame_pc (fi), &name, &prologue_start, &prologue_end)) - { - /* See if the function starts with an add (which will be of a - negative number if a flat frame) to the sp. FIXME: Does not - handle large frames which will need more than one instruction - to adjust the sp. */ - insn = fetch_instruction (prologue_start); - if (X_OP (insn) == 2 && X_RD (insn) == 14 && X_OP3 (insn) == 0 - && X_I (insn) && X_SIMM13 (insn) < 0) - { - int offset = X_SIMM13 (insn); - - /* Then look for a save of %i7 into the frame. */ - insn = fetch_instruction (prologue_start + 4); - if (X_OP (insn) == 3 - && X_RD (insn) == 31 - && X_OP3 (insn) == 4 - && X_RS1 (insn) == 14) - { - char buf[MAX_REGISTER_SIZE]; - - /* We definitely have a flat frame now. */ - get_frame_extra_info (fi)->flat = 1; - - get_frame_extra_info (fi)->sp_offset = offset; - - /* Overwrite the frame's address with the value in %i7. */ - { - ULONGEST tmp; - tmp = get_frame_register_unsigned (fi, I7_REGNUM); - deprecated_update_frame_base_hack (fi, tmp); - } - - if (GDB_TARGET_IS_SPARC64 && (get_frame_base (fi) & 1)) - deprecated_update_frame_base_hack (fi, get_frame_base (fi) + 2047); - - /* Record where the fp got saved. */ - get_frame_extra_info (fi)->fp_addr = - get_frame_base (fi) + get_frame_extra_info (fi)->sp_offset + X_SIMM13 (insn); - - /* Also try to collect where the pc got saved to. */ - get_frame_extra_info (fi)->pc_addr = 0; - insn = fetch_instruction (prologue_start + 12); - if (X_OP (insn) == 3 - && X_RD (insn) == 15 - && X_OP3 (insn) == 4 - && X_RS1 (insn) == 14) - get_frame_extra_info (fi)->pc_addr = - get_frame_base (fi) + get_frame_extra_info (fi)->sp_offset + X_SIMM13 (insn); - } - } - else - { - /* Check if the PC is in the function prologue before a SAVE - instruction has been executed yet. If so, set the frame - to the current value of the stack pointer and set - the in_prologue flag. */ - CORE_ADDR addr; - struct symtab_and_line sal; - - sal = find_pc_line (prologue_start, 0); - if (sal.line == 0) /* no line info, use PC */ - prologue_end = get_frame_pc (fi); - else if (sal.end < prologue_end) - prologue_end = sal.end; - if (get_frame_pc (fi) < prologue_end) - { - for (addr = prologue_start; addr < get_frame_pc (fi); addr += 4) - { - insn = read_memory_integer (addr, 4); - if (X_OP (insn) == 2 && X_OP3 (insn) == 0x3c) - break; /* SAVE seen, stop searching */ - } - if (addr >= get_frame_pc (fi)) - { - get_frame_extra_info (fi)->in_prologue = 1; - deprecated_update_frame_base_hack (fi, read_register (SP_REGNUM)); - } - } - } - } - if (get_next_frame (fi) && get_frame_base (fi) == 0) +static int +sparc_integral_or_pointer_p (const struct type *type) +{ + switch (TYPE_CODE (type)) { - /* Kludge to cause init_prev_frame_info to destroy the new frame. */ - deprecated_update_frame_base_hack (fi, get_frame_base (get_next_frame (fi))); - deprecated_update_frame_pc_hack (fi, get_frame_pc (get_next_frame (fi))); + case TYPE_CODE_INT: + case TYPE_CODE_BOOL: + case TYPE_CODE_CHAR: + case TYPE_CODE_ENUM: + case TYPE_CODE_RANGE: + { + /* We have byte, half-word, word and extended-word/doubleword + integral types. The doubleword is an extension to the + origional 32-bit ABI by the SCD 2.4.x. */ + int len = TYPE_LENGTH (type); + return (len == 1 || len == 2 || len == 4 || len == 8); + } + return 1; + case TYPE_CODE_PTR: + case TYPE_CODE_REF: + { + /* Allow either 32-bit or 64-bit pointers. */ + int len = TYPE_LENGTH (type); + return (len == 4 || len == 8); + } + return 1; + default: + break; } -} -CORE_ADDR -sparc_frame_chain (struct frame_info *frame) -{ - /* Value that will cause DEPRECATED_FRAME_CHAIN_VALID to not worry - about the chain value. If it really is zero, we detect it later - in sparc_init_prev_frame. - - Note: kevinb/2003-02-18: The constant 1 used to be returned here, - but, after some recent changes to legacy_frame_chain_valid(), - this value is no longer suitable for causing - legacy_frame_chain_valid() to "not worry about the chain value." - The constant ~0 (i.e, 0xfff...) causes the failing test in - legacy_frame_chain_valid() to succeed thus preserving the "not - worry" property. I had considered using something like - ``get_frame_base (frame) + 1''. However, I think a constant - value is better, because when debugging this problem, I knew that - something funny was going on as soon as I saw the constant 1 - being used as the frame chain elsewhere in GDB. */ - - return ~ (CORE_ADDR) 0; + return 0; } -/* Find the pc saved in frame FRAME. */ +/* Check whether TYPE is "Floating". */ -CORE_ADDR -sparc_frame_saved_pc (struct frame_info *frame) +static int +sparc_floating_p (const struct type *type) { - char buf[MAX_REGISTER_SIZE]; - CORE_ADDR addr; - - if ((get_frame_type (frame) == SIGTRAMP_FRAME)) + switch (TYPE_CODE (type)) { - /* This is the signal trampoline frame. - Get the saved PC from the sigcontext structure. */ - -#ifndef SIGCONTEXT_PC_OFFSET -#define SIGCONTEXT_PC_OFFSET 12 -#endif - - CORE_ADDR sigcontext_addr; - char *scbuf; - int saved_pc_offset = SIGCONTEXT_PC_OFFSET; - char *name = NULL; - - scbuf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT); - - /* Solaris2 ucbsigvechandler passes a pointer to a sigcontext - as the third parameter. The offset to the saved pc is 12. */ - find_pc_partial_function (get_frame_pc (frame), &name, - (CORE_ADDR *) NULL, (CORE_ADDR *) NULL); - if (name && DEPRECATED_STREQ (name, "ucbsigvechandler")) - saved_pc_offset = 12; - - /* The sigcontext address is contained in register O2. */ + case TYPE_CODE_FLT: { - ULONGEST tmp; - tmp = get_frame_register_unsigned (frame, O0_REGNUM + 2); - sigcontext_addr = tmp; + int len = TYPE_LENGTH (type); + return (len == 4 || len == 8 || len == 16); } - - /* Don't cause a memory_error when accessing sigcontext in case the - stack layout has changed or the stack is corrupt. */ - target_read_memory (sigcontext_addr + saved_pc_offset, - scbuf, sizeof (scbuf)); - return extract_unsigned_integer (scbuf, sizeof (scbuf)); - } - else if (get_frame_extra_info (frame)->in_prologue || - (get_next_frame (frame) != NULL && - ((get_frame_type (get_next_frame (frame)) == SIGTRAMP_FRAME) || - deprecated_frame_in_dummy (get_next_frame (frame))) && - frameless_look_for_prologue (frame))) - { - /* A frameless function interrupted by a signal did not save - the PC, it is still in %o7. */ - ULONGEST tmp; - tmp = get_frame_register_unsigned (frame, O7_REGNUM); - return PC_ADJUST (tmp); + default: + break; } - if (get_frame_extra_info (frame)->flat) - addr = get_frame_extra_info (frame)->pc_addr; - else - addr = get_frame_extra_info (frame)->bottom + FRAME_SAVED_I0 + - SPARC_INTREG_SIZE * (I7_REGNUM - I0_REGNUM); - - if (addr == 0) - /* A flat frame leaf function might not save the PC anywhere, - just leave it in %o7. */ - return PC_ADJUST (read_register (O7_REGNUM)); - read_memory (addr, buf, SPARC_INTREG_SIZE); - return PC_ADJUST (extract_unsigned_integer (buf, SPARC_INTREG_SIZE)); + return 0; } -/* Since an individual frame in the frame cache is defined by two - arguments (a frame pointer and a stack pointer), we need two - arguments to get info for an arbitrary stack frame. This routine - takes two arguments and makes the cached frames look as if these - two arguments defined a frame on the cache. This allows the rest - of info frame to extract the important arguments without - difficulty. */ +/* Check whether TYPE is "Structure or Union". */ -struct frame_info * -setup_arbitrary_frame (int argc, CORE_ADDR *argv) +static int +sparc_structure_or_union_p (const struct type *type) { - struct frame_info *frame; - - if (argc != 2) - error ("Sparc frame specifications require two arguments: fp and sp"); + switch (TYPE_CODE (type)) + { + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + return 1; + default: + break; + } - frame = create_new_frame (argv[0], 0); + return 0; +} - if (!frame) - internal_error (__FILE__, __LINE__, - "create_new_frame returned invalid frame"); +/* Register information. */ - get_frame_extra_info (frame)->bottom = argv[1]; - deprecated_update_frame_pc_hack (frame, DEPRECATED_FRAME_SAVED_PC (frame)); - return frame; -} +static const char *sparc32_register_names[] = +{ + "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7", + "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", + "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", + "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7", -/* Given a pc value, skip it forward past the function prologue by - disassembling instructions that appear to be a prologue. + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", - If FRAMELESS_P is set, we are only testing to see if the function - is frameless. This allows a quicker answer. + "y", "psr", "wim", "tbr", "pc", "npc", "fsr", "csr" +}; - This routine should be more specific in its actions; making sure - that it uses the same register in the initial prologue section. */ +/* Total number of registers. */ +#define SPARC32_NUM_REGS ARRAY_SIZE (sparc32_register_names) -static CORE_ADDR examine_prologue (CORE_ADDR, int, struct frame_info *, - CORE_ADDR *); +/* We provide the aliases %d0..%d30 for the floating registers as + "psuedo" registers. */ -static CORE_ADDR -examine_prologue (CORE_ADDR start_pc, int frameless_p, struct frame_info *fi, - CORE_ADDR *saved_regs) +static const char *sparc32_pseudo_register_names[] = { - int insn; - int dest = -1; - CORE_ADDR pc = start_pc; - int is_flat = 0; + "d0", "d2", "d4", "d6", "d8", "d10", "d12", "d14", + "d16", "d18", "d20", "d22", "d24", "d26", "d28", "d30" +}; - insn = fetch_instruction (pc); +/* Total number of pseudo registers. */ +#define SPARC32_NUM_PSEUDO_REGS ARRAY_SIZE (sparc32_pseudo_register_names) - /* Recognize the `sethi' insn and record its destination. */ - if (X_OP (insn) == 0 && X_OP2 (insn) == 4) - { - dest = X_RD (insn); - pc += 4; - insn = fetch_instruction (pc); - } +/* Return the name of register REGNUM. */ - /* Recognize an add immediate value to register to either %g1 or - the destination register recorded above. Actually, this might - well recognize several different arithmetic operations. - It doesn't check that rs1 == rd because in theory "sub %g0, 5, %g1" - followed by "save %sp, %g1, %sp" is a valid prologue (Not that - I imagine any compiler really does that, however). */ - if (X_OP (insn) == 2 - && X_I (insn) - && (X_RD (insn) == 1 || X_RD (insn) == dest)) - { - pc += 4; - insn = fetch_instruction (pc); - } - - /* Recognize any SAVE insn. */ - if (X_OP (insn) == 2 && X_OP3 (insn) == 60) - { - pc += 4; - if (frameless_p) /* If the save is all we care about, */ - return pc; /* return before doing more work */ - insn = fetch_instruction (pc); - } - /* Recognize add to %sp. */ - else if (X_OP (insn) == 2 && X_RD (insn) == 14 && X_OP3 (insn) == 0) - { - pc += 4; - if (frameless_p) /* If the add is all we care about, */ - return pc; /* return before doing more work */ - is_flat = 1; - insn = fetch_instruction (pc); - /* Recognize store of frame pointer (i7). */ - if (X_OP (insn) == 3 - && X_RD (insn) == 31 - && X_OP3 (insn) == 4 - && X_RS1 (insn) == 14) - { - pc += 4; - insn = fetch_instruction (pc); - - /* Recognize sub %sp, <anything>, %i7. */ - if (X_OP (insn) == 2 - && X_OP3 (insn) == 4 - && X_RS1 (insn) == 14 - && X_RD (insn) == 31) - { - pc += 4; - insn = fetch_instruction (pc); - } - else - return pc; - } - else - return pc; - } - else - /* Without a save or add instruction, it's not a prologue. */ - return start_pc; +static const char * +sparc32_register_name (int regnum) +{ + if (regnum >= 0 && regnum < SPARC32_NUM_REGS) + return sparc32_register_names[regnum]; - while (1) - { - /* Recognize stores into the frame from the input registers. - This recognizes all non alternate stores of an input register, - into a location offset from the frame pointer between - +68 and +92. */ - - /* The above will fail for arguments that are promoted - (eg. shorts to ints or floats to doubles), because the compiler - will pass them in positive-offset frame space, but the prologue - will save them (after conversion) in negative frame space at an - unpredictable offset. Therefore I am going to remove the - restriction on the target-address of the save, on the theory - that any unbroken sequence of saves from input registers must - be part of the prologue. In un-optimized code (at least), I'm - fairly sure that the compiler would emit SOME other instruction - (eg. a move or add) before emitting another save that is actually - a part of the function body. - - Besides, the reserved stack space is different for SPARC64 anyway. - - MVS 4/23/2000 */ - - if (X_OP (insn) == 3 - && (X_OP3 (insn) & 0x3c) == 4 /* Store, non-alternate. */ - && (X_RD (insn) & 0x18) == 0x18 /* Input register. */ - && X_I (insn) /* Immediate mode. */ - && X_RS1 (insn) == 30) /* Off of frame pointer. */ - ; /* empty statement -- fall thru to end of loop */ - else if (GDB_TARGET_IS_SPARC64 - && X_OP (insn) == 3 - && (X_OP3 (insn) & 0x3c) == 12 /* store, extended (64-bit) */ - && (X_RD (insn) & 0x18) == 0x18 /* input register */ - && X_I (insn) /* immediate mode */ - && X_RS1 (insn) == 30) /* off of frame pointer */ - ; /* empty statement -- fall thru to end of loop */ - else if (X_OP (insn) == 3 - && (X_OP3 (insn) & 0x3c) == 36 /* store, floating-point */ - && X_I (insn) /* immediate mode */ - && X_RS1 (insn) == 30) /* off of frame pointer */ - ; /* empty statement -- fall thru to end of loop */ - else if (is_flat - && X_OP (insn) == 3 - && X_OP3 (insn) == 4 /* store? */ - && X_RS1 (insn) == 14) /* off of frame pointer */ - { - if (saved_regs && X_I (insn)) - saved_regs[X_RD (insn)] = - get_frame_base (fi) + get_frame_extra_info (fi)->sp_offset + X_SIMM13 (insn); - } - else - break; - pc += 4; - insn = fetch_instruction (pc); - } + if (regnum < SPARC32_NUM_REGS + SPARC32_NUM_PSEUDO_REGS) + return sparc32_pseudo_register_names[regnum - SPARC32_NUM_REGS]; - return pc; + return NULL; } -/* Advance PC across any function entry prologue instructions to reach - some "real" code. */ +/* Return the GDB type object for the "standard" data type of data in + register REGNUM. */ -CORE_ADDR -sparc_skip_prologue (CORE_ADDR start_pc) +static struct type * +sparc32_register_type (struct gdbarch *gdbarch, int regnum) { - struct symtab_and_line sal; - CORE_ADDR func_start, func_end; + if (regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) + return builtin_type_float; - /* This is the preferred method, find the end of the prologue by - using the debugging information. */ - if (find_pc_partial_function (start_pc, NULL, &func_start, &func_end)) - { - sal = find_pc_line (func_start, 0); + if (regnum >= SPARC32_D0_REGNUM && regnum <= SPARC32_D30_REGNUM) + return builtin_type_double; - if (sal.end < func_end - && start_pc <= sal.end) - return sal.end; - } + if (regnum == SPARC_SP_REGNUM || regnum == SPARC_FP_REGNUM) + return builtin_type_void_data_ptr; - /* Oh well, examine the code by hand. */ - return examine_prologue (start_pc, 0, NULL, NULL); -} + if (regnum == SPARC32_PC_REGNUM || regnum == SPARC32_NPC_REGNUM) + return builtin_type_void_func_ptr; -/* Is the prologue at IP frameless? */ - -int -sparc_prologue_frameless_p (CORE_ADDR ip) -{ - return ip == examine_prologue (ip, 1, NULL, NULL); + return builtin_type_int32; } -/* Check instruction at ADDR to see if it is a branch. - All non-annulled instructions will go to NPC or will trap. - Set *TARGET if we find a candidate branch; set to zero if not. +static void +sparc32_pseudo_register_read (struct gdbarch *gdbarch, + struct regcache *regcache, + int regnum, void *buf) +{ + gdb_assert (regnum >= SPARC32_D0_REGNUM && regnum <= SPARC32_D30_REGNUM); - This isn't static as it's used by remote-sa.sparc.c. */ + regnum = SPARC_F0_REGNUM + 2 * (regnum - SPARC32_D0_REGNUM); + regcache_raw_read (regcache, regnum, buf); + regcache_raw_read (regcache, regnum + 1, ((char *)buf) + 4); +} -static branch_type -isbranch (long instruction, CORE_ADDR addr, CORE_ADDR *target) +static void +sparc32_pseudo_register_write (struct gdbarch *gdbarch, + struct regcache *regcache, + int regnum, const void *buf) { - branch_type val = not_branch; - long int offset = 0; /* Must be signed for sign-extend. */ - - *target = 0; - - if (X_OP (instruction) == 0 - && (X_OP2 (instruction) == 2 - || X_OP2 (instruction) == 6 - || X_OP2 (instruction) == 1 - || X_OP2 (instruction) == 3 - || X_OP2 (instruction) == 5 - || (GDB_TARGET_IS_SPARC64 && X_OP2 (instruction) == 7))) - { - if (X_COND (instruction) == 8) - val = X_A (instruction) ? baa : ba; - else - val = X_A (instruction) ? bicca : bicc; - switch (X_OP2 (instruction)) - { - case 7: - if (!GDB_TARGET_IS_SPARC64) - break; - /* else fall thru */ - case 2: - case 6: - offset = 4 * X_DISP22 (instruction); - break; - case 1: - case 5: - offset = 4 * X_DISP19 (instruction); - break; - case 3: - offset = 4 * X_DISP16 (instruction); - break; - } - *target = addr + offset; - } - else if (GDB_TARGET_IS_SPARC64 - && X_OP (instruction) == 2 - && X_OP3 (instruction) == 62) - { - if (X_FCN (instruction) == 0) - { - /* done */ - *target = read_register (TNPC_REGNUM); - val = done_retry; - } - else if (X_FCN (instruction) == 1) - { - /* retry */ - *target = read_register (TPC_REGNUM); - val = done_retry; - } - } + gdb_assert (regnum >= SPARC32_D0_REGNUM && regnum <= SPARC32_D30_REGNUM); - return val; + regnum = SPARC_F0_REGNUM + 2 * (regnum - SPARC32_D0_REGNUM); + regcache_raw_write (regcache, regnum, buf); + regcache_raw_write (regcache, regnum + 1, ((const char *)buf) + 4); } -/* Find register number REGNUM relative to FRAME and put its - (raw) contents in *RAW_BUFFER. Set *OPTIMIZED if the variable - was optimized out (and thus can't be fetched). If the variable - was fetched from memory, set *ADDRP to where it was fetched from, - otherwise it was fetched from a register. - - The argument RAW_BUFFER must point to aligned memory. */ -void -sparc_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, - struct frame_info *frame, int regnum, - enum lval_type *lval) +static CORE_ADDR +sparc32_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp, + CORE_ADDR funcaddr, int using_gcc, + struct value **args, int nargs, + struct type *value_type, + CORE_ADDR *real_pc, CORE_ADDR *bp_addr) { - struct frame_info *frame1; - CORE_ADDR addr; - - if (!target_has_registers) - error ("No registers."); + *bp_addr = sp - 4; + *real_pc = funcaddr; - if (optimized) - *optimized = 0; - - addr = 0; - - /* FIXME This code extracted from infcmd.c; should put elsewhere! */ - if (frame == NULL) + if (using_struct_return (value_type, using_gcc)) { - /* error ("No selected frame."); */ - if (!target_has_registers) - error ("The program has no registers now."); - if (deprecated_selected_frame == NULL) - error ("No selected frame."); - /* Try to use selected frame */ - frame = get_prev_frame (deprecated_selected_frame); - if (frame == 0) - error ("Cmd not meaningful in the outermost frame."); - } + char buf[4]; + /* This is an UNIMP instruction. */ + store_unsigned_integer (buf, 4, TYPE_LENGTH (value_type) & 0x1fff); + write_memory (sp - 8, buf, 4); + return sp - 8; + } - frame1 = get_next_frame (frame); + return sp - 4; +} - /* Get saved PC from the frame info if not in innermost frame. */ - if (regnum == PC_REGNUM && frame1 != NULL) - { - if (lval != NULL) - *lval = not_lval; - if (raw_buffer != NULL) - { - /* Put it back in target format. */ - store_unsigned_integer (raw_buffer, DEPRECATED_REGISTER_RAW_SIZE (regnum), get_frame_pc (frame)); - } - if (addrp != NULL) - *addrp = 0; - return; - } +static CORE_ADDR +sparc32_store_arguments (struct regcache *regcache, int nargs, + struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) +{ + /* Number of words in the "parameter array". */ + int num_elements = 0; + int element = 0; + int i; - while (frame1 != NULL) + for (i = 0; i < nargs; i++) { - /* FIXME MVS: wrong test for dummy frame at entry. */ + struct type *type = VALUE_TYPE (args[i]); + int len = TYPE_LENGTH (type); - if (get_frame_pc (frame1) >= (get_frame_extra_info (frame1)->bottom - ? get_frame_extra_info (frame1)->bottom - : read_sp ()) - && get_frame_pc (frame1) <= get_frame_base (frame1)) + if (sparc_structure_or_union_p (type) + || (sparc_floating_p (type) && len == 16)) { - /* Dummy frame. All but the window regs are in there somewhere. - The window registers are saved on the stack, just like in a - normal frame. */ - if (regnum >= G1_REGNUM && regnum < G1_REGNUM + 7) - addr = get_frame_base (frame1) + (regnum - G0_REGNUM) * SPARC_INTREG_SIZE - - (FP_REGISTER_BYTES + 8 * SPARC_INTREG_SIZE); - else if (regnum >= I0_REGNUM && regnum < I0_REGNUM + 8) - /* NOTE: cagney/2002-05-04: The call to get_prev_frame() - is safe/cheap - there will always be a prev frame. - This is because frame1 is initialized to frame->next - (frame1->prev == frame) and is then advanced towards - the innermost (next) frame. */ - addr = (get_frame_extra_info (get_prev_frame (frame1))->bottom - + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_I0); - else if (regnum >= L0_REGNUM && regnum < L0_REGNUM + 8) - /* NOTE: cagney/2002-05-04: The call to get_prev_frame() - is safe/cheap - there will always be a prev frame. - This is because frame1 is initialized to frame->next - (frame1->prev == frame) and is then advanced towards - the innermost (next) frame. */ - addr = (get_frame_extra_info (get_prev_frame (frame1))->bottom - + (regnum - L0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_L0); - else if (regnum >= O0_REGNUM && regnum < O0_REGNUM + 8) - addr = get_frame_base (frame1) + (regnum - O0_REGNUM) * SPARC_INTREG_SIZE - - (FP_REGISTER_BYTES + 16 * SPARC_INTREG_SIZE); - else if (SPARC_HAS_FPU && - regnum >= FP0_REGNUM && regnum < FP0_REGNUM + 32) - addr = get_frame_base (frame1) + (regnum - FP0_REGNUM) * 4 - - (FP_REGISTER_BYTES); - else if (GDB_TARGET_IS_SPARC64 && SPARC_HAS_FPU && - regnum >= FP0_REGNUM + 32 && regnum < FP_MAX_REGNUM) - addr = get_frame_base (frame1) + 32 * 4 + (regnum - FP0_REGNUM - 32) * 8 - - (FP_REGISTER_BYTES); - else if (regnum >= Y_REGNUM && regnum < NUM_REGS) - addr = get_frame_base (frame1) + (regnum - Y_REGNUM) * SPARC_INTREG_SIZE - - (FP_REGISTER_BYTES + 24 * SPARC_INTREG_SIZE); - } - else if (get_frame_extra_info (frame1)->flat) - { - - if (regnum == RP_REGNUM) - addr = get_frame_extra_info (frame1)->pc_addr; - else if (regnum == I7_REGNUM) - addr = get_frame_extra_info (frame1)->fp_addr; - else - { - CORE_ADDR func_start; - CORE_ADDR *regs; + /* Structure, Union and Quad-Precision Arguments. */ + sp -= len; - regs = alloca (NUM_REGS * sizeof (CORE_ADDR)); - memset (regs, 0, NUM_REGS * sizeof (CORE_ADDR)); + /* Use doubleword alignment for these values. That's always + correct, and wasting a few bytes shouldn't be a problem. */ + sp &= ~0x7; - find_pc_partial_function (get_frame_pc (frame1), NULL, &func_start, NULL); - examine_prologue (func_start, 0, frame1, regs); - addr = regs[regnum]; - } + write_memory (sp, VALUE_CONTENTS (args[i]), len); + args[i] = value_from_pointer (lookup_pointer_type (type), sp); + num_elements++; } - else + else if (sparc_floating_p (type)) { - /* Normal frame. Local and In registers are saved on stack. */ - if (regnum >= I0_REGNUM && regnum < I0_REGNUM + 8) - addr = (get_frame_extra_info (get_prev_frame (frame1))->bottom - + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_I0); - else if (regnum >= L0_REGNUM && regnum < L0_REGNUM + 8) - addr = (get_frame_extra_info (get_prev_frame (frame1))->bottom - + (regnum - L0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_L0); - else if (regnum >= O0_REGNUM && regnum < O0_REGNUM + 8) - { - /* Outs become ins. */ - int realnum; - frame_register (frame1, (regnum - O0_REGNUM + I0_REGNUM), - optimized, lval, addrp, &realnum, raw_buffer); - return; - } + /* Floating arguments. */ + gdb_assert (len == 4 || len == 8); + num_elements += (len / 4); } - if (addr != 0) - break; - frame1 = get_next_frame (frame1); - } - if (addr != 0) - { - if (lval != NULL) - *lval = lval_memory; - if (regnum == SP_REGNUM) + else { - if (raw_buffer != NULL) - { - /* Put it back in target format. */ - store_unsigned_integer (raw_buffer, DEPRECATED_REGISTER_RAW_SIZE (regnum), addr); - } - if (addrp != NULL) - *addrp = 0; - return; + /* Integral and pointer arguments. */ + gdb_assert (sparc_integral_or_pointer_p (type)); + + if (len < 4) + args[i] = value_cast (builtin_type_int32, args[i]); + num_elements += ((len + 3) / 4); } - if (raw_buffer != NULL) - read_memory (addr, raw_buffer, DEPRECATED_REGISTER_RAW_SIZE (regnum)); } - else - { - if (lval != NULL) - *lval = lval_register; - addr = DEPRECATED_REGISTER_BYTE (regnum); - if (raw_buffer != NULL) - deprecated_read_register_gen (regnum, raw_buffer); - } - if (addrp != NULL) - *addrp = addr; -} - -/* Push an empty stack frame, and record in it the current PC, regs, etc. - - We save the non-windowed registers and the ins. The locals and outs - are new; they don't need to be saved. The i's and l's of - the last frame were already saved on the stack. */ - -/* Definitely see tm-sparc.h for more doc of the frame format here. */ -/* See tm-sparc.h for how this is calculated. */ + /* Always allocate at least six words. */ + sp -= max (6, num_elements) * 4; -#define DUMMY_STACK_REG_BUF_SIZE \ - (((8+8+8) * SPARC_INTREG_SIZE) + FP_REGISTER_BYTES) -#define DUMMY_STACK_SIZE \ - (DUMMY_STACK_REG_BUF_SIZE + DUMMY_REG_SAVE_OFFSET) - -void -sparc_push_dummy_frame (void) -{ - CORE_ADDR sp, old_sp; - char *register_temp; - - register_temp = alloca (DUMMY_STACK_SIZE); + /* The psABI says that "Software convention requires space for the + struct/union return value pointer, even if the word is unused." */ + sp -= 4; - old_sp = sp = read_sp (); + /* The psABI says that "Although software convention and the + operating system require every stack frame to be doubleword + aligned." */ + sp &= ~0x7; - if (GDB_TARGET_IS_SPARC64) - { - /* PC, NPC, CCR, FSR, FPRS, Y, ASI */ - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (PC_REGNUM), - ®ister_temp[0], - DEPRECATED_REGISTER_RAW_SIZE (PC_REGNUM) * 7); - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (PSTATE_REGNUM), - ®ister_temp[7 * SPARC_INTREG_SIZE], - DEPRECATED_REGISTER_RAW_SIZE (PSTATE_REGNUM)); - /* FIXME: not sure what needs to be saved here. */ - } - else + for (i = 0; i < nargs; i++) { - /* Y, PS, WIM, TBR, PC, NPC, FPS, CPS regs */ - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (Y_REGNUM), - ®ister_temp[0], - DEPRECATED_REGISTER_RAW_SIZE (Y_REGNUM) * 8); - } - - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (O0_REGNUM), - ®ister_temp[8 * SPARC_INTREG_SIZE], - SPARC_INTREG_SIZE * 8); + char *valbuf = VALUE_CONTENTS (args[i]); + struct type *type = VALUE_TYPE (args[i]); + int len = TYPE_LENGTH (type); - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (G0_REGNUM), - ®ister_temp[16 * SPARC_INTREG_SIZE], - SPARC_INTREG_SIZE * 8); + gdb_assert (len == 4 || len == 8); - if (SPARC_HAS_FPU) - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM), - ®ister_temp[24 * SPARC_INTREG_SIZE], - FP_REGISTER_BYTES); + if (element < 6) + { + int regnum = SPARC_O0_REGNUM + element; - sp -= DUMMY_STACK_SIZE; + regcache_cooked_write (regcache, regnum, valbuf); + if (len > 4 && element < 5) + regcache_cooked_write (regcache, regnum + 1, valbuf + 4); + } - DEPRECATED_DUMMY_WRITE_SP (sp); + /* Always store the argument in memory. */ + write_memory (sp + 4 + element * 4, valbuf, len); + element += len / 4; + } - write_memory (sp + DUMMY_REG_SAVE_OFFSET, ®ister_temp[0], - DUMMY_STACK_REG_BUF_SIZE); + gdb_assert (element == num_elements); - if (strcmp (target_shortname, "sim") != 0) - { - /* NOTE: cagney/2002-04-04: The code below originally contained - GDB's _only_ call to write_fp(). That call was eliminated by - inlining the corresponding code. For the 64 bit case, the - old function (sparc64_write_fp) did the below although I'm - not clear why. The same goes for why this is only done when - the underlying target is a simulator. */ - if (GDB_TARGET_IS_SPARC64) - { - /* Target is a 64 bit SPARC. */ - CORE_ADDR oldfp = read_register (DEPRECATED_FP_REGNUM); - if (oldfp & 1) - write_register (DEPRECATED_FP_REGNUM, old_sp - 2047); - else - write_register (DEPRECATED_FP_REGNUM, old_sp); - } - else - { - /* Target is a 32 bit SPARC. */ - write_register (DEPRECATED_FP_REGNUM, old_sp); - } - /* Set return address register for the call dummy to the current PC. */ - write_register (I7_REGNUM, read_pc () - 8); - } - else + if (struct_return) { - /* The call dummy will write this value to FP before executing - the 'save'. This ensures that register window flushes work - correctly in the simulator. */ - write_register (G0_REGNUM + 1, read_register (DEPRECATED_FP_REGNUM)); - - /* The call dummy will write this value to FP after executing - the 'save'. */ - write_register (G0_REGNUM + 2, old_sp); - - /* The call dummy will write this value to the return address (%i7) after - executing the 'save'. */ - write_register (G0_REGNUM + 3, read_pc () - 8); - - /* Set the FP that the call dummy will be using after the 'save'. - This makes backtraces from an inferior function call work properly. */ - write_register (DEPRECATED_FP_REGNUM, old_sp); + char buf[4]; + + store_unsigned_integer (buf, 4, struct_addr); + write_memory (sp, buf, 4); } -} -/* sparc_frame_find_saved_regs (). This function is here only because - pop_frame uses it. Note there is an interesting corner case which - I think few ports of GDB get right--if you are popping a frame - which does not save some register that *is* saved by a more inner - frame (such a frame will never be a dummy frame because dummy - frames save all registers). + return sp; +} - NOTE: cagney/2003-03-12: Since pop_frame has been rewritten to use - frame_unwind_register() the need for this function is questionable. +static CORE_ADDR +sparc32_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, + struct regcache *regcache, CORE_ADDR bp_addr, + int nargs, struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) +{ + CORE_ADDR call_pc = (struct_return ? (bp_addr - 12) : (bp_addr - 8)); - Stores, into an array of CORE_ADDR, - the addresses of the saved registers of frame described by FRAME_INFO. - This includes special registers such as pc and fp saved in special - ways in the stack frame. sp is even more special: - the address we return for it IS the sp for the next frame. + /* Set return address. */ + regcache_cooked_write_unsigned (regcache, SPARC_O7_REGNUM, call_pc); - Note that on register window machines, we are currently making the - assumption that window registers are being saved somewhere in the - frame in which they are being used. If they are stored in an - inferior frame, find_saved_register will break. + /* Set up function arguments. */ + sp = sparc32_store_arguments (regcache, nargs, args, sp, + struct_return, struct_addr); - On the Sun 4, the only time all registers are saved is when - a dummy frame is involved. Otherwise, the only saved registers - are the LOCAL and IN registers which are saved as a result - of the "save/restore" opcodes. This condition is determined - by address rather than by value. + /* Allocate the 16-word window save area. */ + sp -= 16 * 4; - The "pc" is not stored in a frame on the SPARC. (What is stored - is a return address minus 8.) sparc_pop_frame knows how to - deal with that. Other routines might or might not. + /* Stack should be doubleword aligned at this point. */ + gdb_assert (sp % 8 == 0); - See tm-sparc.h (PUSH_DUMMY_FRAME and friends) for CRITICAL information - about how this works. */ + /* Finally, update the stack pointer. */ + regcache_cooked_write_unsigned (regcache, SPARC_SP_REGNUM, sp); -static void sparc_frame_find_saved_regs (struct frame_info *, CORE_ADDR *); + return sp; +} + -static void -sparc_frame_find_saved_regs (struct frame_info *fi, CORE_ADDR *saved_regs_addr) +/* Use the program counter to determine the contents and size of a + breakpoint instruction. Return a pointer to a string of bytes that + encode a breakpoint instruction, store the length of the string in + *LEN and optionally adjust *PC to point to the correct memory + location for inserting the breakpoint. */ + +static const unsigned char * +sparc_breakpoint_from_pc (CORE_ADDR *pc, int *len) { - int regnum; - CORE_ADDR frame_addr = get_frame_base (fi); - - gdb_assert (fi != NULL); - - memset (saved_regs_addr, 0, NUM_REGS * sizeof (CORE_ADDR)); - - if (get_frame_pc (fi) >= (get_frame_extra_info (fi)->bottom - ? get_frame_extra_info (fi)->bottom - : read_sp ()) - && get_frame_pc (fi) <= get_frame_base (fi)) - { - /* Dummy frame. All but the window regs are in there somewhere. */ - for (regnum = G1_REGNUM; regnum < G1_REGNUM + 7; regnum++) - saved_regs_addr[regnum] = - frame_addr + (regnum - G0_REGNUM) * SPARC_INTREG_SIZE - - DUMMY_STACK_REG_BUF_SIZE + 16 * SPARC_INTREG_SIZE; - - for (regnum = I0_REGNUM; regnum < I0_REGNUM + 8; regnum++) - saved_regs_addr[regnum] = - frame_addr + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE - - DUMMY_STACK_REG_BUF_SIZE + 8 * SPARC_INTREG_SIZE; - - if (SPARC_HAS_FPU) - for (regnum = FP0_REGNUM; regnum < FP_MAX_REGNUM; regnum++) - saved_regs_addr[regnum] = frame_addr + (regnum - FP0_REGNUM) * 4 - - DUMMY_STACK_REG_BUF_SIZE + 24 * SPARC_INTREG_SIZE; - - if (GDB_TARGET_IS_SPARC64) - { - for (regnum = PC_REGNUM; regnum < PC_REGNUM + 7; regnum++) - { - saved_regs_addr[regnum] = - frame_addr + (regnum - PC_REGNUM) * SPARC_INTREG_SIZE - - DUMMY_STACK_REG_BUF_SIZE; - } - saved_regs_addr[PSTATE_REGNUM] = - frame_addr + 8 * SPARC_INTREG_SIZE - DUMMY_STACK_REG_BUF_SIZE; - } - else - for (regnum = Y_REGNUM; regnum < NUM_REGS; regnum++) - saved_regs_addr[regnum] = - frame_addr + (regnum - Y_REGNUM) * SPARC_INTREG_SIZE - - DUMMY_STACK_REG_BUF_SIZE; - - frame_addr = (get_frame_extra_info (fi)->bottom - ? get_frame_extra_info (fi)->bottom - : read_sp ()); - } - else if (get_frame_extra_info (fi)->flat) - { - CORE_ADDR func_start; - find_pc_partial_function (get_frame_pc (fi), NULL, &func_start, NULL); - examine_prologue (func_start, 0, fi, saved_regs_addr); + static unsigned char break_insn[] = { 0x91, 0xd0, 0x20, 0x01 }; - /* Flat register window frame. */ - saved_regs_addr[RP_REGNUM] = get_frame_extra_info (fi)->pc_addr; - saved_regs_addr[I7_REGNUM] = get_frame_extra_info (fi)->fp_addr; - } - else - { - /* Normal frame. Just Local and In registers */ - frame_addr = (get_frame_extra_info (fi)->bottom - ? get_frame_extra_info (fi)->bottom - : read_sp ()); - for (regnum = L0_REGNUM; regnum < L0_REGNUM + 8; regnum++) - saved_regs_addr[regnum] = - (frame_addr + (regnum - L0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_L0); - for (regnum = I0_REGNUM; regnum < I0_REGNUM + 8; regnum++) - saved_regs_addr[regnum] = - (frame_addr + (regnum - I0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_I0); - } - if (get_next_frame (fi)) - { - if (get_frame_extra_info (fi)->flat) - { - saved_regs_addr[O7_REGNUM] = get_frame_extra_info (fi)->pc_addr; - } - else - { - /* Pull off either the next frame pointer or the stack pointer */ - CORE_ADDR next_next_frame_addr = - (get_frame_extra_info (get_next_frame (fi))->bottom - ? get_frame_extra_info (get_next_frame (fi))->bottom - : read_sp ()); - for (regnum = O0_REGNUM; regnum < O0_REGNUM + 8; regnum++) - saved_regs_addr[regnum] = - (next_next_frame_addr - + (regnum - O0_REGNUM) * SPARC_INTREG_SIZE - + FRAME_SAVED_I0); - } - } - /* Otherwise, whatever we would get from ptrace(GETREGS) is accurate */ - /* FIXME -- should this adjust for the sparc64 offset? */ - saved_regs_addr[SP_REGNUM] = get_frame_base (fi); + *len = sizeof (break_insn); + return break_insn; } + -/* Discard from the stack the innermost frame, restoring all saved registers. - - Note that the values stored in fsr by - deprecated_get_frame_saved_regs are *in the context of the called - frame*. What this means is that the i regs of fsr must be restored - into the o regs of the (calling) frame that we pop into. We don't - care about the output regs of the calling frame, since unless it's - a dummy frame, it won't have any output regs in it. - - We never have to bother with %l (local) regs, since the called routine's - locals get tossed, and the calling routine's locals are already saved - on its stack. */ - -/* Definitely see tm-sparc.h for more doc of the frame format here. */ +/* Allocate and initialize a frame cache. */ -void -sparc_pop_frame (void) +static struct sparc_frame_cache * +sparc_alloc_frame_cache (void) { - struct frame_info *frame = get_current_frame (); - CORE_ADDR pc; - CORE_ADDR *fsr; - char *raw_buffer; - int regnum; - - fsr = alloca (NUM_REGS * sizeof (CORE_ADDR)); - raw_buffer = alloca (DEPRECATED_REGISTER_BYTES); - sparc_frame_find_saved_regs (frame, &fsr[0]); - if (SPARC_HAS_FPU) - { - if (fsr[FP0_REGNUM]) - { - read_memory (fsr[FP0_REGNUM], raw_buffer, FP_REGISTER_BYTES); - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM), - raw_buffer, FP_REGISTER_BYTES); - } - if (!(GDB_TARGET_IS_SPARC64)) - { - if (fsr[FPS_REGNUM]) - { - read_memory (fsr[FPS_REGNUM], raw_buffer, SPARC_INTREG_SIZE); - deprecated_write_register_gen (FPS_REGNUM, raw_buffer); - } - if (fsr[CPS_REGNUM]) - { - read_memory (fsr[CPS_REGNUM], raw_buffer, SPARC_INTREG_SIZE); - deprecated_write_register_gen (CPS_REGNUM, raw_buffer); - } - } - } - if (fsr[G1_REGNUM]) - { - read_memory (fsr[G1_REGNUM], raw_buffer, 7 * SPARC_INTREG_SIZE); - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (G1_REGNUM), raw_buffer, - 7 * SPARC_INTREG_SIZE); - } - - if (get_frame_extra_info (frame)->flat) - { - /* Each register might or might not have been saved, need to test - individually. */ - for (regnum = L0_REGNUM; regnum < L0_REGNUM + 8; ++regnum) - if (fsr[regnum]) - write_register (regnum, read_memory_integer (fsr[regnum], - SPARC_INTREG_SIZE)); - for (regnum = I0_REGNUM; regnum < I0_REGNUM + 8; ++regnum) - if (fsr[regnum]) - write_register (regnum, read_memory_integer (fsr[regnum], - SPARC_INTREG_SIZE)); - - /* Handle all outs except stack pointer (o0-o5; o7). */ - for (regnum = O0_REGNUM; regnum < O0_REGNUM + 6; ++regnum) - if (fsr[regnum]) - write_register (regnum, read_memory_integer (fsr[regnum], - SPARC_INTREG_SIZE)); - if (fsr[O0_REGNUM + 7]) - write_register (O0_REGNUM + 7, - read_memory_integer (fsr[O0_REGNUM + 7], - SPARC_INTREG_SIZE)); - - DEPRECATED_DUMMY_WRITE_SP (get_frame_base (frame)); - } - else if (fsr[I0_REGNUM]) - { - CORE_ADDR sp; - - char *reg_temp; - - reg_temp = alloca (SPARC_INTREG_SIZE * 16); - - read_memory (fsr[I0_REGNUM], raw_buffer, 8 * SPARC_INTREG_SIZE); + struct sparc_frame_cache *cache; + int i; - /* Get the ins and locals which we are about to restore. Just - moving the stack pointer is all that is really needed, except - store_inferior_registers is then going to write the ins and - locals from the registers array, so we need to muck with the - registers array. */ - sp = fsr[SP_REGNUM]; - - if (GDB_TARGET_IS_SPARC64 && (sp & 1)) - sp += 2047; + cache = FRAME_OBSTACK_ZALLOC (struct sparc_frame_cache); - read_memory (sp, reg_temp, SPARC_INTREG_SIZE * 16); + /* Base address. */ + cache->base = 0; + cache->pc = 0; - /* Restore the out registers. - Among other things this writes the new stack pointer. */ - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (O0_REGNUM), raw_buffer, - SPARC_INTREG_SIZE * 8); + /* Frameless until proven otherwise. */ + cache->frameless_p = 1; - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (L0_REGNUM), reg_temp, - SPARC_INTREG_SIZE * 16); - } + cache->struct_return_p = 0; - if (!(GDB_TARGET_IS_SPARC64)) - if (fsr[PS_REGNUM]) - write_register (PS_REGNUM, - read_memory_integer (fsr[PS_REGNUM], - DEPRECATED_REGISTER_RAW_SIZE (PS_REGNUM))); - - if (fsr[Y_REGNUM]) - write_register (Y_REGNUM, - read_memory_integer (fsr[Y_REGNUM], - DEPRECATED_REGISTER_RAW_SIZE (Y_REGNUM))); - if (fsr[PC_REGNUM]) - { - /* Explicitly specified PC (and maybe NPC) -- just restore them. */ - write_register (PC_REGNUM, - read_memory_integer (fsr[PC_REGNUM], - DEPRECATED_REGISTER_RAW_SIZE (PC_REGNUM))); - if (fsr[DEPRECATED_NPC_REGNUM]) - write_register (DEPRECATED_NPC_REGNUM, - read_memory_integer (fsr[DEPRECATED_NPC_REGNUM], - DEPRECATED_REGISTER_RAW_SIZE (DEPRECATED_NPC_REGNUM))); - } - else if (get_frame_extra_info (frame)->flat) - { - if (get_frame_extra_info (frame)->pc_addr) - pc = PC_ADJUST ((CORE_ADDR) - read_memory_integer (get_frame_extra_info (frame)->pc_addr, - DEPRECATED_REGISTER_RAW_SIZE (PC_REGNUM))); - else - { - /* I think this happens only in the innermost frame, if so then - it is a complicated way of saying - "pc = read_register (O7_REGNUM);". */ - ULONGEST tmp; - tmp = get_frame_register_unsigned (frame, O7_REGNUM); - pc = PC_ADJUST (tmp); - } - - write_register (PC_REGNUM, pc); - write_register (DEPRECATED_NPC_REGNUM, pc + 4); - } - else if (fsr[I7_REGNUM]) - { - /* Return address in %i7 -- adjust it, then restore PC and NPC from it */ - pc = PC_ADJUST ((CORE_ADDR) read_memory_integer (fsr[I7_REGNUM], - SPARC_INTREG_SIZE)); - write_register (PC_REGNUM, pc); - write_register (DEPRECATED_NPC_REGNUM, pc + 4); - } - flush_cached_frames (); + return cache; } -/* On the Sun 4 under SunOS, the compile will leave a fake insn which - encodes the structure size being returned. If we detect such - a fake insn, step past it. */ - CORE_ADDR -sparc_pc_adjust (CORE_ADDR pc) +sparc_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc, + struct sparc_frame_cache *cache) { + struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); unsigned long insn; - char buf[4]; - int err; + int offset = 0; + int dest = -1; - err = target_read_memory (pc + 8, buf, 4); - insn = extract_unsigned_integer (buf, 4); - if ((err == 0) && (insn & 0xffc00000) == 0) - return pc + 12; - else - return pc + 8; -} + if (current_pc <= pc) + return current_pc; -/* If pc is in a shared library trampoline, return its target. - The SunOs 4.x linker rewrites the jump table entries for PIC - compiled modules in the main executable to bypass the dynamic linker - with jumps of the form - sethi %hi(addr),%g1 - jmp %g1+%lo(addr) - and removes the corresponding jump table relocation entry in the - dynamic relocations. - find_solib_trampoline_target relies on the presence of the jump - table relocation entry, so we have to detect these jump instructions - by hand. */ + /* We have to handle to "Procedure Linkage Table" (PLT) special. On + SPARC the linker usually defines a symbol (typically + _PROCEDURE_LINKAGE_TABLE_) at the start of the .plt section. + This symbol makes us end up here with PC pointing at the start of + the PLT and CURRENT_PC probably pointing at a PLT entry. If we + would do our normal prologue analysis, we would probably conclude + that we've got a frame when in reality we don't, since the + dynamic linker patches up the first PLT with some code that + starts with a SAVE instruction. Patch up PC such that it points + at the start of our PLT entry. */ + if (tdep->plt_entry_size > 0 && in_plt_section (current_pc, NULL)) + pc = current_pc - ((current_pc - pc) % tdep->plt_entry_size); -CORE_ADDR -sunos4_skip_trampoline_code (CORE_ADDR pc) -{ - unsigned long insn1; - char buf[4]; - int err; + insn = sparc_fetch_instruction (pc); - err = target_read_memory (pc, buf, 4); - insn1 = extract_unsigned_integer (buf, 4); - if (err == 0 && (insn1 & 0xffc00000) == 0x03000000) + /* Recognize a SETHI insn and record its destination. */ + if (X_OP (insn) == 0 && X_OP2 (insn) == 0x04) { - unsigned long insn2; - - err = target_read_memory (pc + 4, buf, 4); - insn2 = extract_unsigned_integer (buf, 4); - if (err == 0 && (insn2 & 0xffffe000) == 0x81c06000) - { - CORE_ADDR target_pc = (insn1 & 0x3fffff) << 10; - int delta = insn2 & 0x1fff; + dest = X_RD (insn); + offset += 4; - /* Sign extend the displacement. */ - if (delta & 0x1000) - delta |= ~0x1fff; - return target_pc + delta; - } + insn = sparc_fetch_instruction (pc + 4); } - return find_solib_trampoline_target (pc); -} - -#ifdef USE_PROC_FS /* Target dependent support for /proc */ -/* *INDENT-OFF* */ -/* The /proc interface divides the target machine's register set up into - two different sets, the general register set (gregset) and the floating - point register set (fpregset). For each set, there is an ioctl to get - the current register set and another ioctl to set the current values. - - The actual structure passed through the ioctl interface is, of course, - naturally machine dependent, and is different for each set of registers. - For the sparc for example, the general register set is typically defined - by: - - typedef int gregset_t[38]; - - #define R_G0 0 - ... - #define R_TBR 37 - - and the floating point set by: - - typedef struct prfpregset { - union { - u_long pr_regs[32]; - double pr_dregs[16]; - } pr_fr; - void * pr_filler; - u_long pr_fsr; - u_char pr_qcnt; - u_char pr_q_entrysize; - u_char pr_en; - u_long pr_q[64]; - } prfpregset_t; - - These routines provide the packing and unpacking of gregset_t and - fpregset_t formatted data. - - */ -/* *INDENT-ON* */ - -/* Given a pointer to a general register set in /proc format (gregset_t *), - unpack the register contents and supply them as gdb's idea of the current - register values. */ -void -supply_gregset (gdb_gregset_t *gregsetp) -{ - prgreg_t *regp = (prgreg_t *) gregsetp; - int regi, offset = 0; - - /* If the host is 64-bit sparc, but the target is 32-bit sparc, - then the gregset may contain 64-bit ints while supply_register - is expecting 32-bit ints. Compensate. */ - if (sizeof (regp[0]) == 8 && SPARC_INTREG_SIZE == 4) - offset = 4; - - /* GDB register numbers for Gn, On, Ln, In all match /proc reg numbers. */ - /* FIXME MVS: assumes the order of the first 32 elements... */ - for (regi = G0_REGNUM; regi <= I7_REGNUM; regi++) + /* Allow for an arithmetic operation on DEST or %g1. */ + if (X_OP (insn) == 2 && X_I (insn) + && (X_RD (insn) == 1 || X_RD (insn) == dest)) { - supply_register (regi, ((char *) (regp + regi)) + offset); - } - - /* These require a bit more care. */ - supply_register (PC_REGNUM, ((char *) (regp + R_PC)) + offset); - supply_register (DEPRECATED_NPC_REGNUM, ((char *) (regp + R_nPC)) + offset); - supply_register (Y_REGNUM, ((char *) (regp + R_Y)) + offset); + offset += 4; - if (GDB_TARGET_IS_SPARC64) - { -#ifdef R_CCR - supply_register (CCR_REGNUM, ((char *) (regp + R_CCR)) + offset); -#else - supply_register (CCR_REGNUM, NULL); -#endif -#ifdef R_FPRS - supply_register (FPRS_REGNUM, ((char *) (regp + R_FPRS)) + offset); -#else - supply_register (FPRS_REGNUM, NULL); -#endif -#ifdef R_ASI - supply_register (ASI_REGNUM, ((char *) (regp + R_ASI)) + offset); -#else - supply_register (ASI_REGNUM, NULL); -#endif - } - else /* sparc32 */ - { -#ifdef R_PS - supply_register (PS_REGNUM, ((char *) (regp + R_PS)) + offset); -#else - supply_register (PS_REGNUM, NULL); -#endif - - /* For 64-bit hosts, R_WIM and R_TBR may not be defined. - Steal R_ASI and R_FPRS, and hope for the best! */ - -#if !defined (R_WIM) && defined (R_ASI) -#define R_WIM R_ASI -#endif - -#if !defined (R_TBR) && defined (R_FPRS) -#define R_TBR R_FPRS -#endif - -#if defined (R_WIM) - supply_register (WIM_REGNUM, ((char *) (regp + R_WIM)) + offset); -#else - supply_register (WIM_REGNUM, NULL); -#endif - -#if defined (R_TBR) - supply_register (TBR_REGNUM, ((char *) (regp + R_TBR)) + offset); -#else - supply_register (TBR_REGNUM, NULL); -#endif + insn = sparc_fetch_instruction (pc + 8); } - /* Fill inaccessible registers with zero. */ - if (GDB_TARGET_IS_SPARC64) + /* Check for the SAVE instruction that sets up the frame. */ + if (X_OP (insn) == 2 && X_OP3 (insn) == 0x3c) { - /* - * don't know how to get value of any of the following: - */ - supply_register (VER_REGNUM, NULL); - supply_register (TICK_REGNUM, NULL); - supply_register (PIL_REGNUM, NULL); - supply_register (PSTATE_REGNUM, NULL); - supply_register (TSTATE_REGNUM, NULL); - supply_register (TBA_REGNUM, NULL); - supply_register (TL_REGNUM, NULL); - supply_register (TT_REGNUM, NULL); - supply_register (TPC_REGNUM, NULL); - supply_register (TNPC_REGNUM, NULL); - supply_register (WSTATE_REGNUM, NULL); - supply_register (CWP_REGNUM, NULL); - supply_register (CANSAVE_REGNUM, NULL); - supply_register (CANRESTORE_REGNUM, NULL); - supply_register (CLEANWIN_REGNUM, NULL); - supply_register (OTHERWIN_REGNUM, NULL); - supply_register (ASR16_REGNUM, NULL); - supply_register (ASR17_REGNUM, NULL); - supply_register (ASR18_REGNUM, NULL); - supply_register (ASR19_REGNUM, NULL); - supply_register (ASR20_REGNUM, NULL); - supply_register (ASR21_REGNUM, NULL); - supply_register (ASR22_REGNUM, NULL); - supply_register (ASR23_REGNUM, NULL); - supply_register (ASR24_REGNUM, NULL); - supply_register (ASR25_REGNUM, NULL); - supply_register (ASR26_REGNUM, NULL); - supply_register (ASR27_REGNUM, NULL); - supply_register (ASR28_REGNUM, NULL); - supply_register (ASR29_REGNUM, NULL); - supply_register (ASR30_REGNUM, NULL); - supply_register (ASR31_REGNUM, NULL); - supply_register (ICC_REGNUM, NULL); - supply_register (XCC_REGNUM, NULL); + cache->frameless_p = 0; + return pc + offset + 4; } - else - { - supply_register (CPS_REGNUM, NULL); - } -} - -void -fill_gregset (gdb_gregset_t *gregsetp, int regno) -{ - prgreg_t *regp = (prgreg_t *) gregsetp; - int regi, offset = 0; - - /* If the host is 64-bit sparc, but the target is 32-bit sparc, - then the gregset may contain 64-bit ints while supply_register - is expecting 32-bit ints. Compensate. */ - if (sizeof (regp[0]) == 8 && SPARC_INTREG_SIZE == 4) - offset = 4; - - for (regi = 0; regi <= R_I7; regi++) - if ((regno == -1) || (regno == regi)) - deprecated_read_register_gen (regi, (char *) (regp + regi) + offset); - - if ((regno == -1) || (regno == PC_REGNUM)) - deprecated_read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset); - if ((regno == -1) || (regno == DEPRECATED_NPC_REGNUM)) - deprecated_read_register_gen (DEPRECATED_NPC_REGNUM, (char *) (regp + R_nPC) + offset); - - if ((regno == -1) || (regno == Y_REGNUM)) - deprecated_read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset); - - if (GDB_TARGET_IS_SPARC64) - { -#ifdef R_CCR - if (regno == -1 || regno == CCR_REGNUM) - deprecated_read_register_gen (CCR_REGNUM, ((char *) (regp + R_CCR)) + offset); -#endif -#ifdef R_FPRS - if (regno == -1 || regno == FPRS_REGNUM) - deprecated_read_register_gen (FPRS_REGNUM, ((char *) (regp + R_FPRS)) + offset); -#endif -#ifdef R_ASI - if (regno == -1 || regno == ASI_REGNUM) - deprecated_read_register_gen (ASI_REGNUM, ((char *) (regp + R_ASI)) + offset); -#endif - } - else /* sparc32 */ - { -#ifdef R_PS - if (regno == -1 || regno == PS_REGNUM) - deprecated_read_register_gen (PS_REGNUM, ((char *) (regp + R_PS)) + offset); -#endif - - /* For 64-bit hosts, R_WIM and R_TBR may not be defined. - Steal R_ASI and R_FPRS, and hope for the best! */ - -#if !defined (R_WIM) && defined (R_ASI) -#define R_WIM R_ASI -#endif - -#if !defined (R_TBR) && defined (R_FPRS) -#define R_TBR R_FPRS -#endif - -#if defined (R_WIM) - if (regno == -1 || regno == WIM_REGNUM) - deprecated_read_register_gen (WIM_REGNUM, ((char *) (regp + R_WIM)) + offset); -#else - if (regno == -1 || regno == WIM_REGNUM) - deprecated_read_register_gen (WIM_REGNUM, NULL); -#endif - -#if defined (R_TBR) - if (regno == -1 || regno == TBR_REGNUM) - deprecated_read_register_gen (TBR_REGNUM, ((char *) (regp + R_TBR)) + offset); -#else - if (regno == -1 || regno == TBR_REGNUM) - deprecated_read_register_gen (TBR_REGNUM, NULL); -#endif - } + return pc; } -/* Given a pointer to a floating point register set in /proc format - (fpregset_t *), unpack the register contents and supply them as gdb's - idea of the current floating point register values. */ - -void -supply_fpregset (gdb_fpregset_t *fpregsetp) +static CORE_ADDR +sparc_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) { - int regi; - char *from; - - if (!SPARC_HAS_FPU) - return; - - for (regi = FP0_REGNUM; regi < FP_MAX_REGNUM; regi++) - { - from = (char *) &fpregsetp->pr_fr.pr_regs[regi - FP0_REGNUM]; - supply_register (regi, from); - } - - if (GDB_TARGET_IS_SPARC64) - { - /* - * don't know how to get value of the following. - */ - supply_register (FSR_REGNUM, NULL); /* zero it out for now */ - supply_register (FCC0_REGNUM, NULL); - supply_register (FCC1_REGNUM, NULL); /* don't know how to get value */ - supply_register (FCC2_REGNUM, NULL); /* don't know how to get value */ - supply_register (FCC3_REGNUM, NULL); /* don't know how to get value */ - } - else - { - supply_register (FPS_REGNUM, (char *) &(fpregsetp->pr_fsr)); - } + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + return frame_unwind_register_unsigned (next_frame, tdep->pc_regnum); } -/* Given a pointer to a floating point register set in /proc format - (fpregset_t *), update the register specified by REGNO from gdb's idea - of the current floating point register set. If REGNO is -1, update - them all. */ -/* This will probably need some changes for sparc64. */ +/* Return PC of first real instruction of the function starting at + START_PC. */ -void -fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) +static CORE_ADDR +sparc32_skip_prologue (CORE_ADDR start_pc) { - int regi; - char *to; - char *from; - - if (!SPARC_HAS_FPU) - return; + struct symtab_and_line sal; + CORE_ADDR func_start, func_end; + struct sparc_frame_cache cache; - for (regi = FP0_REGNUM; regi < FP_MAX_REGNUM; regi++) + /* This is the preferred method, find the end of the prologue by + using the debugging information. */ + if (find_pc_partial_function (start_pc, NULL, &func_start, &func_end)) { - if ((regno == -1) || (regno == regi)) - { - from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; - to = (char *) &fpregsetp->pr_fr.pr_regs[regi - FP0_REGNUM]; - memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regi)); - } + sal = find_pc_line (func_start, 0); + + if (sal.end < func_end + && start_pc <= sal.end) + return sal.end; } - if (!(GDB_TARGET_IS_SPARC64)) /* FIXME: does Sparc64 have this register? */ - if ((regno == -1) || (regno == FPS_REGNUM)) - { - from = (char *)&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)]; - to = (char *) &fpregsetp->pr_fsr; - memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (FPS_REGNUM)); - } + return sparc_analyze_prologue (start_pc, 0xffffffffUL, &cache); } -#endif /* USE_PROC_FS */ - -/* Because of Multi-arch, GET_LONGJMP_TARGET is always defined. So test - for a definition of JB_PC. */ -#ifdef JB_PC - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - output regs. %o0 (O0_REGNUM) points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ +/* Normal frames. */ -int -get_longjmp_target (CORE_ADDR *pc) +struct sparc_frame_cache * +sparc_frame_cache (struct frame_info *next_frame, void **this_cache) { - CORE_ADDR jb_addr; -#define LONGJMP_TARGET_SIZE 4 - char buf[LONGJMP_TARGET_SIZE]; + struct sparc_frame_cache *cache; - jb_addr = read_register (O0_REGNUM); + if (*this_cache) + return *this_cache; - if (target_read_memory (jb_addr + JB_PC * JB_ELEMENT_SIZE, buf, - LONGJMP_TARGET_SIZE)) - return 0; + cache = sparc_alloc_frame_cache (); + *this_cache = cache; - *pc = extract_unsigned_integer (buf, LONGJMP_TARGET_SIZE); + /* In priciple, for normal frames, %fp (%i6) holds the frame + pointer, which holds the base address for the current stack + frame. */ - return 1; -} -#endif /* GET_LONGJMP_TARGET */ - -#ifdef STATIC_TRANSFORM_NAME -/* SunPRO (3.0 at least), encodes the static variables. This is not - related to C++ mangling, it is done for C too. */ + cache->base = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM); + if (cache->base == 0) + return cache; -char * -sunpro_static_transform_name (char *name) -{ - char *p; - if (name[0] == '$') + cache->pc = frame_func_unwind (next_frame); + if (cache->pc != 0) { - /* For file-local statics there will be a dollar sign, 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; + CORE_ADDR addr_in_block = frame_unwind_address_in_block (next_frame); + sparc_analyze_prologue (cache->pc, addr_in_block, cache); } - return name; -} -#endif /* STATIC_TRANSFORM_NAME */ - - -/* Utilities for printing registers. - Page numbers refer to the SPARC Architecture Manual. */ -static void dump_ccreg (char *, int); - -static void -dump_ccreg (char *reg, int val) -{ - /* page 41 */ - printf_unfiltered ("%s:%s,%s,%s,%s", reg, - val & 8 ? "N" : "NN", - val & 4 ? "Z" : "NZ", - val & 2 ? "O" : "NO", - val & 1 ? "C" : "NC"); -} - -static char * -decode_asi (int val) -{ - /* page 72 */ - switch (val) + if (cache->frameless_p) { - case 4: - return "ASI_NUCLEUS"; - case 0x0c: - return "ASI_NUCLEUS_LITTLE"; - case 0x10: - return "ASI_AS_IF_USER_PRIMARY"; - case 0x11: - return "ASI_AS_IF_USER_SECONDARY"; - case 0x18: - return "ASI_AS_IF_USER_PRIMARY_LITTLE"; - case 0x19: - return "ASI_AS_IF_USER_SECONDARY_LITTLE"; - case 0x80: - return "ASI_PRIMARY"; - case 0x81: - return "ASI_SECONDARY"; - case 0x82: - return "ASI_PRIMARY_NOFAULT"; - case 0x83: - return "ASI_SECONDARY_NOFAULT"; - case 0x88: - return "ASI_PRIMARY_LITTLE"; - case 0x89: - return "ASI_SECONDARY_LITTLE"; - case 0x8a: - return "ASI_PRIMARY_NOFAULT_LITTLE"; - case 0x8b: - return "ASI_SECONDARY_NOFAULT_LITTLE"; - default: - return NULL; + /* We didn't find a valid frame, which means that CACHE->base + currently holds the frame pointer for our calling frame. */ + cache->base = frame_unwind_register_unsigned (next_frame, + SPARC_SP_REGNUM); } -} -/* Pretty print various registers. */ -/* FIXME: Would be nice if this did some fancy things for 32 bit sparc. */ + return cache; +} -static void -sparc_print_register_hook (int regno) +struct sparc_frame_cache * +sparc32_frame_cache (struct frame_info *next_frame, void **this_cache) { - ULONGEST val; + struct sparc_frame_cache *cache; + struct symbol *sym; - /* Handle double/quad versions of lower 32 fp regs. */ - if (regno >= FP0_REGNUM && regno < FP0_REGNUM + 32 - && (regno & 1) == 0) - { - char value[16]; + if (*this_cache) + return *this_cache; - if (frame_register_read (deprecated_selected_frame, regno, value) - && frame_register_read (deprecated_selected_frame, regno + 1, value + 4)) - { - printf_unfiltered ("\t"); - print_floating (value, builtin_type_double, gdb_stdout); - } -#if 0 /* FIXME: gdb doesn't handle long doubles */ - if ((regno & 3) == 0) - { - if (frame_register_read (deprecated_selected_frame, regno + 2, value + 8) - && frame_register_read (deprecated_selected_frame, regno + 3, value + 12)) - { - printf_unfiltered ("\t"); - print_floating (value, builtin_type_long_double, gdb_stdout); - } - } -#endif - return; - } + cache = sparc_frame_cache (next_frame, this_cache); -#if 0 /* FIXME: gdb doesn't handle long doubles */ - /* Print upper fp regs as long double if appropriate. */ - if (regno >= FP0_REGNUM + 32 && regno < FP_MAX_REGNUM - /* We test for even numbered regs and not a multiple of 4 because - the upper fp regs are recorded as doubles. */ - && (regno & 1) == 0) + sym = find_pc_function (cache->pc); + if (sym) { - char value[16]; + struct type *type = check_typedef (SYMBOL_TYPE (sym)); + enum type_code code = TYPE_CODE (type); - if (frame_register_read (deprecated_selected_frame, regno, value) - && frame_register_read (deprecated_selected_frame, regno + 1, value + 8)) + if (code == TYPE_CODE_FUNC || code == TYPE_CODE_METHOD) { - printf_unfiltered ("\t"); - print_floating (value, builtin_type_long_double, gdb_stdout); + type = check_typedef (TYPE_TARGET_TYPE (type)); + if (sparc_structure_or_union_p (type) + || (sparc_floating_p (type) && TYPE_LENGTH (type) == 16)) + cache->struct_return_p = 1; } - return; } -#endif - - /* FIXME: Some of these are priviledged registers. - Not sure how they should be handled. */ -#define BITS(n, mask) ((int) (((val) >> (n)) & (mask))) + return cache; +} - val = read_register (regno); +static void +sparc32_frame_this_id (struct frame_info *next_frame, void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc32_frame_cache (next_frame, this_cache); - /* pages 40 - 60 */ - if (GDB_TARGET_IS_SPARC64) - switch (regno) - { - case CCR_REGNUM: - printf_unfiltered ("\t"); - dump_ccreg ("xcc", val >> 4); - printf_unfiltered (", "); - dump_ccreg ("icc", val & 15); - break; - case FPRS_REGNUM: - printf ("\tfef:%d, du:%d, dl:%d", - BITS (2, 1), BITS (1, 1), BITS (0, 1)); - break; - case FSR_REGNUM: - { - static char *fcc[4] = - {"=", "<", ">", "?"}; - static char *rd[4] = - {"N", "0", "+", "-"}; - /* Long, but I'd rather leave it as is and use a wide screen. */ - printf_filtered ("\t0:%s, 1:%s, 2:%s, 3:%s, rd:%s, tem:%d, ", - fcc[BITS (10, 3)], fcc[BITS (32, 3)], - fcc[BITS (34, 3)], fcc[BITS (36, 3)], - rd[BITS (30, 3)], BITS (23, 31)); - printf_filtered ("ns:%d, ver:%d, ftt:%d, qne:%d, aexc:%d, cexc:%d", - BITS (22, 1), BITS (17, 7), BITS (14, 7), - BITS (13, 1), BITS (5, 31), BITS (0, 31)); - break; - } - case ASI_REGNUM: - { - char *asi = decode_asi (val); - if (asi != NULL) - printf ("\t%s", asi); - break; - } - case VER_REGNUM: - printf ("\tmanuf:%d, impl:%d, mask:%d, maxtl:%d, maxwin:%d", - BITS (48, 0xffff), BITS (32, 0xffff), - BITS (24, 0xff), BITS (8, 0xff), BITS (0, 31)); - break; - case PSTATE_REGNUM: - { - static char *mm[4] = - {"tso", "pso", "rso", "?"}; - printf_filtered ("\tcle:%d, tle:%d, mm:%s, red:%d, ", - BITS (9, 1), BITS (8, 1), - mm[BITS (6, 3)], BITS (5, 1)); - printf_filtered ("pef:%d, am:%d, priv:%d, ie:%d, ag:%d", - BITS (4, 1), BITS (3, 1), BITS (2, 1), - BITS (1, 1), BITS (0, 1)); - break; - } - case TSTATE_REGNUM: - /* FIXME: print all 4? */ - break; - case TT_REGNUM: - /* FIXME: print all 4? */ - break; - case TPC_REGNUM: - /* FIXME: print all 4? */ - break; - case TNPC_REGNUM: - /* FIXME: print all 4? */ - break; - case WSTATE_REGNUM: - printf ("\tother:%d, normal:%d", BITS (3, 7), BITS (0, 7)); - break; - case CWP_REGNUM: - printf ("\t%d", BITS (0, 31)); - break; - case CANSAVE_REGNUM: - printf ("\t%-2d before spill", BITS (0, 31)); - break; - case CANRESTORE_REGNUM: - printf ("\t%-2d before fill", BITS (0, 31)); - break; - case CLEANWIN_REGNUM: - printf ("\t%-2d before clean", BITS (0, 31)); - break; - case OTHERWIN_REGNUM: - printf ("\t%d", BITS (0, 31)); - break; - } - else /* Sparc32 */ - switch (regno) - { - case PS_REGNUM: - printf ("\ticc:%c%c%c%c, pil:%d, s:%d, ps:%d, et:%d, cwp:%d", - BITS (23, 1) ? 'N' : '-', BITS (22, 1) ? 'Z' : '-', - BITS (21, 1) ? 'V' : '-', BITS (20, 1) ? 'C' : '-', - BITS (8, 15), BITS (7, 1), BITS (6, 1), BITS (5, 1), - BITS (0, 31)); - break; - case FPS_REGNUM: - { - static char *fcc[4] = - {"=", "<", ">", "?"}; - static char *rd[4] = - {"N", "0", "+", "-"}; - /* Long, but I'd rather leave it as is and use a wide screen. */ - printf ("\trd:%s, tem:%d, ns:%d, ver:%d, ftt:%d, qne:%d, " - "fcc:%s, aexc:%d, cexc:%d", - rd[BITS (30, 3)], BITS (23, 31), BITS (22, 1), BITS (17, 7), - BITS (14, 7), BITS (13, 1), fcc[BITS (10, 3)], BITS (5, 31), - BITS (0, 31)); - break; - } - } + /* This marks the outermost frame. */ + if (cache->base == 0) + return; -#undef BITS + (*this_id) = frame_id_build (cache->base, cache->pc); } static void -sparc_print_registers (struct gdbarch *gdbarch, - struct ui_file *file, - struct frame_info *frame, - int regnum, int print_all, - void (*print_register_hook) (int)) +sparc32_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) { - int i; - const int numregs = NUM_REGS + NUM_PSEUDO_REGS; - char raw_buffer[MAX_REGISTER_SIZE]; - char virtual_buffer[MAX_REGISTER_SIZE]; + struct sparc_frame_cache *cache = + sparc32_frame_cache (next_frame, this_cache); - for (i = 0; i < numregs; i++) + if (regnum == SPARC32_PC_REGNUM || regnum == SPARC32_NPC_REGNUM) { - /* Decide between printing all regs, non-float / vector regs, or - specific reg. */ - if (regnum == -1) + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (valuep) { - if (!print_all) - { - if (TYPE_CODE (DEPRECATED_REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) - continue; - if (TYPE_VECTOR (DEPRECATED_REGISTER_VIRTUAL_TYPE (i))) - continue; - } - } - else - { - if (i != regnum) - continue; - } + CORE_ADDR pc = (regnum == SPARC32_NPC_REGNUM) ? 4 : 0; - /* If the register name is empty, it is undefined for this - processor, so don't display anything. */ - if (REGISTER_NAME (i) == NULL || *(REGISTER_NAME (i)) == '\0') - continue; + /* If this functions has a Structure, Union or + Quad-Precision return value, we have to skip the UNIMP + instruction that encodes the size of the structure. */ + if (cache->struct_return_p) + pc += 4; - fputs_filtered (REGISTER_NAME (i), file); - print_spaces_filtered (15 - strlen (REGISTER_NAME (i)), file); - - /* Get the data in raw format. */ - if (! frame_register_read (frame, i, raw_buffer)) - { - fprintf_filtered (file, "*value not available*\n"); - continue; + regnum = cache->frameless_p ? SPARC_O7_REGNUM : SPARC_I7_REGNUM; + pc += frame_unwind_register_unsigned (next_frame, regnum) + 8; + store_unsigned_integer (valuep, 4, pc); } + return; + } - memcpy (virtual_buffer, raw_buffer, DEPRECATED_REGISTER_VIRTUAL_SIZE (i)); - - /* If virtual format is floating, print it that way, and in raw - hex. */ - if (TYPE_CODE (DEPRECATED_REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) + /* The previous frame's `local' and `in' registers have been saved + in the register save area. */ + if (!cache->frameless_p + && regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) + { + *optimizedp = 0; + *lvalp = lval_memory; + *addrp = cache->base + (regnum - SPARC_L0_REGNUM) * 4; + *realnump = -1; + if (valuep) { - int j; - - val_print (DEPRECATED_REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, - file, 0, 1, 0, Val_pretty_default); + struct gdbarch *gdbarch = get_frame_arch (next_frame); - fprintf_filtered (file, "\t(raw 0x"); - for (j = 0; j < DEPRECATED_REGISTER_RAW_SIZE (i); j++) - { - int idx; - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) - idx = j; - else - idx = DEPRECATED_REGISTER_RAW_SIZE (i) - 1 - j; - fprintf_filtered (file, "%02x", (unsigned char) raw_buffer[idx]); - } - fprintf_filtered (file, ")"); - } - else - { - /* Print the register in hex. */ - val_print (DEPRECATED_REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, - file, 'x', 1, 0, Val_pretty_default); - /* If not a vector register, print it also according to its - natural format. */ - if (TYPE_VECTOR (DEPRECATED_REGISTER_VIRTUAL_TYPE (i)) == 0) - { - fprintf_filtered (file, "\t"); - val_print (DEPRECATED_REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, - file, 0, 1, 0, Val_pretty_default); - } + /* Read the value in from memory. */ + read_memory (*addrp, valuep, register_size (gdbarch, regnum)); } + return; + } - /* Some sparc specific info. */ - if (print_register_hook != NULL) - print_register_hook (i); + /* The previous frame's `out' registers are accessable as the + current frame's `in' registers. */ + if (!cache->frameless_p + && regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) + regnum += (SPARC_I0_REGNUM - SPARC_O0_REGNUM); - fprintf_filtered (file, "\n"); - } + frame_register_unwind (next_frame, regnum, + optimizedp, lvalp, addrp, realnump, valuep); } -static void -sparc_print_registers_info (struct gdbarch *gdbarch, - struct ui_file *file, - struct frame_info *frame, - int regnum, int print_all) +static const struct frame_unwind sparc32_frame_unwind = { - sparc_print_registers (gdbarch, file, frame, regnum, print_all, - sparc_print_register_hook); -} + NORMAL_FRAME, + sparc32_frame_this_id, + sparc32_frame_prev_register +}; -void -sparc_do_registers_info (int regnum, int all) +static const struct frame_unwind * +sparc32_frame_sniffer (struct frame_info *next_frame) { - sparc_print_registers_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, - regnum, all); + return &sparc32_frame_unwind; } - -#define SPARC_F0_REGNUM FP0_REGNUM /* %f0 */ -#define SPARC_F1_REGNUM (FP0_REGNUM + 1)/* %f1 */ -#define SPARC_O0_REGNUM O0_REGNUM /* %o0 */ -#define SPARC_O1_REGNUM O1_REGNUM /* %o1 */ - -/* Push the arguments onto the stack and into the appropriate registers. */ + static CORE_ADDR -sparc32_do_push_arguments (struct regcache *regcache, int nargs, - struct value **args, CORE_ADDR sp) +sparc32_frame_base_address (struct frame_info *next_frame, void **this_cache) { - CORE_ADDR *addr; - int size = 0; - int i; - - /* Structure, union and quad-precision arguments are passed by - reference. We allocate space for these arguments on the stack - and record their addresses in an array. Array elements for - arguments that are passed by value will be set to zero.*/ - addr = alloca (nargs * sizeof (CORE_ADDR)); - - for (i = nargs - 1; i >= 0; i--) - { - struct type *type = VALUE_ENCLOSING_TYPE (args[i]); - enum type_code code = TYPE_CODE (type); - int len = TYPE_LENGTH (type); - - /* Push the contents of structure, union and quad-precision - arguments on the stack. */ - if (code == TYPE_CODE_STRUCT || code == TYPE_CODE_UNION || len > 8) - { - /* Keep the stack doubleword aligned. */ - sp -= (len + 7) & ~7; - write_memory (sp, VALUE_CONTENTS_ALL (args[i]), len); - addr[i] = sp; - size += 4; - } - else - { - addr[i] = 0; - size += (len > 4) ? 8 : 4; - } - } - - /* The needed space for outgoing arguments should be a multiple of 4. */ - gdb_assert (size % 4 == 0); + struct sparc_frame_cache *cache = + sparc32_frame_cache (next_frame, this_cache); - /* Make sure we reserve space for the first six words of arguments - in the stack frame, even if we don't need them. */ - if (size < 24) - sp -= (24 - size); - - /* Make sure we end up with a doubleword aligned stack in the end. - Reserve an extra word if necessary in order to accomplish this. */ - if ((sp - size) % 8 == 0) - sp -= 4; - - /* Now push the arguments onto the stack. */ - for (i = nargs - 1; i >=0; i--) - { - char buf[8]; - int len; - - if (addr[i]) - { - store_unsigned_integer (buf, 4, addr[i]); - len = 4; - } - else - { - struct value *arg = args[i]; - - len = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (arg)); - - /* Expand signed and unsigned bytes and halfwords as needed. */ - if (len < 4) - { - arg = value_cast (builtin_type_long, arg); - len = 4; - } - else if (len > 4 && len < 8) - { - arg = value_cast (builtin_type_long_long, arg); - len = 4; - } - - gdb_assert (len == 4 || len == 8); - memcpy (buf, VALUE_CONTENTS_ALL (arg), len); - } - - /* We always write the argument word on the stack. */ - sp -= len; - write_memory (sp, buf, len); - - /* If this argument occupies one of the first 6 words, write it - into the appropriate register too. */ - size -= len; - if (size < 24) - { - int regnum = SPARC_O0_REGNUM + (size / 4); - - regcache_cooked_write (regcache, regnum, buf); - if (len == 8 && size < 20) - regcache_cooked_write (regcache, regnum + 1, buf + 4); - } - } - - /* Reserve space for the struct/union return value pointer. */ - sp -= 4; - - /* Stack should be doubleword aligned at this point. */ - gdb_assert (sp % 8 == 0); - - /* Return the adjusted stack pointer. */ - return sp; + return cache->base; } -/* The SPARC passes the arguments on the stack; arguments smaller - than an int are promoted to an int. The first 6 words worth of - args are also passed in registers o0 - o5. */ - -CORE_ADDR -sparc32_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +static const struct frame_base sparc32_frame_base = { - sp = sparc32_do_push_arguments (current_regcache, nargs, args, sp); - - /* FIXME: kettenis/20030525: We don't let this function set the - struct/union return pointer just yet. */ -#if 0 - if (struct_return) - { - char buf[4]; + &sparc32_frame_unwind, + sparc32_frame_base_address, + sparc32_frame_base_address, + sparc32_frame_base_address +}; - /* The space for the struct/union return value pointer has - already been reserved. */ - store_unsigned_integer (buf, 4, struct_addr); - write (sp, buf, 4); - } +static struct frame_id +sparc_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) +{ + CORE_ADDR sp; - return sp; -#else - return sp + 4; -#endif + sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM); + return frame_id_build (sp, frame_pc_unwind (next_frame)); } + -/* Extract from REGCACHE a function return value of type TYPE and copy - that into VALBUF. - - Note that REGCACHE specifies the register values for the frame of - the calling function. This means that we need to fetch the value - form %o0 and %o1, which correspond to %i0 and %i1 in the frame of - the called function. */ +/* Extract from an array REGBUF containing the (raw) register state, a + function return value of TYPE, and copy that into VALBUF. */ -void +static void sparc32_extract_return_value (struct type *type, struct regcache *regcache, void *valbuf) { int len = TYPE_LENGTH (type); char buf[8]; - if (TYPE_CODE (type) == TYPE_CODE_FLT && SPARC_HAS_FPU) - { - if (len == 4 || len == 8) - { - regcache_cooked_read (regcache, SPARC_F0_REGNUM, buf); - regcache_cooked_read (regcache, SPARC_F1_REGNUM, buf + 4); - memcpy (valbuf, buf, len); - return; - } - else - internal_error (__FILE__, __LINE__, "\ -Cannot extract floating-point return value of %d bytes long.", len); - } + gdb_assert (!sparc_structure_or_union_p (type)); + gdb_assert (!(sparc_floating_p (type) && len == 16)); - if (len <= 4) + if (sparc_floating_p (type)) { - regcache_cooked_read (regcache, SPARC_O0_REGNUM, buf); - memcpy (valbuf, buf + 4 - len, len); + /* Floating return values. */ + regcache_cooked_read (regcache, SPARC_F0_REGNUM, buf); + if (len > 4) + regcache_cooked_read (regcache, SPARC_F1_REGNUM, buf + 4); + memcpy (valbuf, buf, len); } - else if (len <= 8) + else { + /* Integral and pointer return values. */ + gdb_assert (sparc_integral_or_pointer_p (type)); + regcache_cooked_read (regcache, SPARC_O0_REGNUM, buf); - regcache_cooked_read (regcache, SPARC_O1_REGNUM, buf + 4); - memcpy (valbuf, buf + 8 - len, len); + if (len > 4) + { + regcache_cooked_read (regcache, SPARC_O1_REGNUM, buf + 4); + gdb_assert (len == 8); + memcpy (valbuf, buf, 8); + } + else + { + /* Just stripping off any unused bytes should preserve the + signed-ness just fine. */ + memcpy (valbuf, buf + 4 - len, len); + } } - else - internal_error (__FILE__, __LINE__, - "Cannot extract return value of %d bytes long.", len); } -/* Write into REGBUF a function return value VALBUF of type TYPE. */ +/* Write into the appropriate registers a function return value stored + in VALBUF of type TYPE. */ -void +static void sparc32_store_return_value (struct type *type, struct regcache *regcache, const void *valbuf) { int len = TYPE_LENGTH (type); char buf[8]; - if (TYPE_CODE (type) == TYPE_CODE_FLT && SPARC_HAS_FPU) + gdb_assert (!sparc_structure_or_union_p (type)); + gdb_assert (!(sparc_floating_p (type) && len == 16)); + + if (sparc_floating_p (type)) { - const char *buf = valbuf; + /* Floating return values. */ + memcpy (buf, valbuf, len); + regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf); + if (len > 4) + regcache_cooked_write (regcache, SPARC_F1_REGNUM, buf + 4); + } + else + { + /* Integral and pointer return values. */ + gdb_assert (sparc_integral_or_pointer_p (type)); - if (len == 4) + if (len > 4) { - regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf); - return; + gdb_assert (len == 8); + memcpy (buf, valbuf, 8); + regcache_cooked_write (regcache, SPARC_O1_REGNUM, buf + 4); } - else if (len == 8) + else { - regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf); - regcache_cooked_write (regcache, SPARC_F1_REGNUM, buf + 4); - return; + /* ??? Do we need to do any sign-extension here? */ + memcpy (buf + 4 - len, valbuf, len); } - else - internal_error (__FILE__, __LINE__, "\ -Cannot extract floating-point return value of %d bytes long.", len); - } - - /* Add leading zeros to the value. */ - memset (buf, 0, sizeof buf); - - if (len <= 4) - { - memcpy (buf + 4 - len, valbuf, len); - regcache_cooked_write (regcache, SPARC_O0_REGNUM, buf); - } - else if (len <= 8) - { - memcpy (buf + 8 - len, valbuf, len); regcache_cooked_write (regcache, SPARC_O0_REGNUM, buf); - regcache_cooked_write (regcache, SPARC_O1_REGNUM, buf); } - else - internal_error (__FILE__, __LINE__, - "Cannot extract return value of %d bytes long.", len); } -/* Extract from REGCACHE the address in which a function should return - its structure value. */ +/* Extract from REGCACHE, which contains the (raw) register state, the + address in which a function should return its structure value, as a + CORE_ADDR. */ -CORE_ADDR +static CORE_ADDR sparc_extract_struct_value_address (struct regcache *regcache) { ULONGEST addr; @@ -2357,1008 +828,527 @@ sparc_extract_struct_value_address (struct regcache *regcache) return addr; } -/* FIXME: kettenis/2003/05/24: Still used for sparc64. */ - -static void -sparc_store_return_value (struct type *type, char *valbuf) -{ - int regno; - char buffer[MAX_REGISTER_SIZE]; - - if (TYPE_CODE (type) == TYPE_CODE_FLT && SPARC_HAS_FPU) - /* Floating-point values are returned in the register pair */ - /* formed by %f0 and %f1 (doubles are, anyway). */ - regno = FP0_REGNUM; - else - /* Other values are returned in register %o0. */ - regno = O0_REGNUM; - - /* Add leading zeros to the value. */ - if (TYPE_LENGTH (type) < DEPRECATED_REGISTER_RAW_SIZE (regno)) - { - memset (buffer, 0, DEPRECATED_REGISTER_RAW_SIZE (regno)); - memcpy (buffer + DEPRECATED_REGISTER_RAW_SIZE (regno) - TYPE_LENGTH (type), valbuf, - TYPE_LENGTH (type)); - deprecated_write_register_gen (regno, buffer); - } - else - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regno), valbuf, - TYPE_LENGTH (type)); -} - -#ifndef CALL_DUMMY_CALL_OFFSET -#define CALL_DUMMY_CALL_OFFSET \ - (gdbarch_tdep (current_gdbarch)->call_dummy_call_offset) -#endif /* CALL_DUMMY_CALL_OFFSET */ - -/* Insert the function address into a call dummy instruction sequence - stored at DUMMY. - - For structs and unions, if the function was compiled with Sun cc, - it expects 'unimp' after the call. But gcc doesn't use that - (twisted) convention. So leave a nop there for gcc - (DEPRECATED_FIX_CALL_DUMMY can assume it is operating on a pristine - CALL_DUMMY, not one that has already been customized for a - different function). */ - -void -sparc_fix_call_dummy (char *dummy, CORE_ADDR pc, CORE_ADDR fun, - struct type *value_type, int using_gcc) -{ - int i; - - /* Store the relative adddress of the target function into the - 'call' instruction. */ - store_unsigned_integer (dummy + CALL_DUMMY_CALL_OFFSET, 4, - (0x40000000 - | (((fun - (pc + CALL_DUMMY_CALL_OFFSET)) >> 2) - & 0x3fffffff))); - - /* If the called function returns an aggregate value, fill in the UNIMP - instruction containing the size of the returned aggregate return value, - which follows the call instruction. - For details see the SPARC Architecture Manual Version 8, Appendix D.3. - - Adjust the call_dummy_breakpoint_offset for the bp_call_dummy breakpoint - to the proper address in the call dummy, so that `finish' after a stop - in a call dummy works. - - Tweeking current_gdbarch is not an optimal solution, but the call - to sparc_fix_call_dummy is immediately followed by a call to - call_function_by_hand, which is the only function where - dummy_breakpoint_offset is actually used, if it is non-zero. */ - if (TYPE_CODE (value_type) == TYPE_CODE_STRUCT - || TYPE_CODE (value_type) == TYPE_CODE_UNION) - { - store_unsigned_integer (dummy + CALL_DUMMY_CALL_OFFSET + 8, 4, - TYPE_LENGTH (value_type) & 0x1fff); - set_gdbarch_deprecated_call_dummy_breakpoint_offset (current_gdbarch, 0x30); - } - else - set_gdbarch_deprecated_call_dummy_breakpoint_offset (current_gdbarch, 0x2c); - - if (!(GDB_TARGET_IS_SPARC64)) - { - /* If this is not a simulator target, change the first four - instructions of the call dummy to NOPs. Those instructions - include a 'save' instruction and are designed to work around - problems with register window flushing in the simulator. */ - - if (strcmp (target_shortname, "sim") != 0) - { - for (i = 0; i < 4; i++) - store_unsigned_integer (dummy + (i * 4), 4, 0x01000000); - } - } -} - -/* - * Module "constructor" function. - */ - -static struct gdbarch * sparc_gdbarch_init (struct gdbarch_info info, - struct gdbarch_list *arches); -static void sparc_dump_tdep (struct gdbarch *, struct ui_file *); - -extern initialize_file_ftype _initialize_sparc_tdep; /* -Wmissing-prototypes */ - -void -_initialize_sparc_tdep (void) -{ - /* Hook us into the gdbarch mechanism. */ - gdbarch_register (bfd_arch_sparc, sparc_gdbarch_init, sparc_dump_tdep); -} - -/* Compensate for stack bias. Note that we currently don't handle - mixed 32/64 bit code. */ - -static CORE_ADDR -sparc64_read_sp (void) +static int +sparc32_use_struct_convention (int gcc_p, struct type *type) { - CORE_ADDR sp = read_register (SP_REGNUM); - - if (sp & 1) - sp += 2047; - return sp; + gdb_assert (sparc_structure_or_union_p (type)); + return 1; } -static CORE_ADDR -sparc64_read_fp (void) +static int +sparc32_return_value_on_stack (struct type *type) { - CORE_ADDR fp = read_register (DEPRECATED_FP_REGNUM); - - if (fp & 1) - fp += 2047; - return fp; + gdb_assert (!sparc_structure_or_union_p (type)); + return (sparc_floating_p (type) && TYPE_LENGTH (type) == 16); } -static void -sparc64_write_sp (CORE_ADDR val) +static int +sparc32_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type) { - CORE_ADDR oldsp = read_register (SP_REGNUM); - if (oldsp & 1) - write_register (SP_REGNUM, val - 2047); - else - write_register (SP_REGNUM, val); + return (sparc_structure_or_union_p (type) + || (sparc_floating_p (type) && TYPE_LENGTH (type) == 16)); } -/* The SPARC 64 ABI passes floating-point arguments in FP0 to FP31, - and all other arguments in O0 to O5. They are also copied onto - the stack in the correct places. Apparently (empirically), - structs of less than 16 bytes are passed member-by-member in - separate registers, but I am unable to figure out the algorithm. - Some members go in floating point regs, but I don't know which. - - FIXME: Handle small structs (less than 16 bytes containing floats). - - The counting regimen for using both integer and FP registers - for argument passing is rather odd -- a single counter is used - for both; this means that if the arguments alternate between - int and float, we will waste every other register of both types. */ + +/* The SPARC Architecture doesn't have hardware single-step support, + and most operating systems don't implement it either, so we provide + software single-step mechanism. */ static CORE_ADDR -sparc64_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_retaddr) +sparc_analyze_control_transfer (CORE_ADDR pc, CORE_ADDR *npc) { - int i, j, register_counter = 0; - CORE_ADDR tempsp; - struct type *sparc_intreg_type = - TYPE_LENGTH (builtin_type_long) == SPARC_INTREG_SIZE ? - builtin_type_long : builtin_type_long_long; - - sp = (sp & ~(((unsigned long) SPARC_INTREG_SIZE) - 1UL)); + unsigned long insn = sparc_fetch_instruction (pc); + int conditional_p = X_COND (insn) & 0x7; + int branch_p = 0; + long offset = 0; /* Must be signed for sign-extend. */ - /* Figure out how much space we'll need. */ - for (i = nargs - 1; i >= 0; i--) + if (X_OP (insn) == 0 && X_OP2 (insn) == 3 && (insn & 0x1000000) == 0) { - int len = TYPE_LENGTH (check_typedef (VALUE_TYPE (args[i]))); - struct value *copyarg = args[i]; - int copylen = len; - - if (copylen < SPARC_INTREG_SIZE) - { - copyarg = value_cast (sparc_intreg_type, copyarg); - copylen = SPARC_INTREG_SIZE; - } - sp -= copylen; + /* Branch on Integer Register with Prediction (BPr). */ + branch_p = 1; + conditional_p = 1; + } + else if (X_OP (insn) == 0 && X_OP2 (insn) == 6) + { + /* Branch on Floating-Point Condition Codes (FBfcc). */ + branch_p = 1; + offset = 4 * X_DISP22 (insn); + } + else if (X_OP (insn) == 0 && X_OP2 (insn) == 5) + { + /* Branch on Floating-Point Condition Codes with Prediction + (FBPfcc). */ + branch_p = 1; + offset = 4 * X_DISP19 (insn); + } + else if (X_OP (insn) == 0 && X_OP2 (insn) == 2) + { + /* Branch on Integer Condition Codes (Bicc). */ + branch_p = 1; + offset = 4 * X_DISP22 (insn); + } + else if (X_OP (insn) == 0 && X_OP2 (insn) == 1) + { + /* Branch on Integer Condition Codes with Prediction (BPcc). */ + branch_p = 1; + offset = 4 * X_DISP19 (insn); } - /* Round down. */ - sp = sp & ~7; - tempsp = sp; - - /* if STRUCT_RETURN, then first argument is the struct return location. */ - if (struct_return) - write_register (O0_REGNUM + register_counter++, struct_retaddr); + /* FIXME: Handle DONE and RETRY instructions. */ - /* Now write the arguments onto the stack, while writing FP - arguments into the FP registers, and other arguments into the - first six 'O' registers. */ + /* FIXME: Handle the Trap instruction. */ - for (i = 0; i < nargs; i++) + if (branch_p) { - int len = TYPE_LENGTH (check_typedef (VALUE_TYPE (args[i]))); - struct value *copyarg = args[i]; - enum type_code typecode = TYPE_CODE (VALUE_TYPE (args[i])); - int copylen = len; - - if (typecode == TYPE_CODE_INT || - typecode == TYPE_CODE_BOOL || - typecode == TYPE_CODE_CHAR || - typecode == TYPE_CODE_RANGE || - typecode == TYPE_CODE_ENUM) - if (len < SPARC_INTREG_SIZE) - { - /* Small ints will all take up the size of one intreg on - the stack. */ - copyarg = value_cast (sparc_intreg_type, copyarg); - copylen = SPARC_INTREG_SIZE; - } - - write_memory (tempsp, VALUE_CONTENTS (copyarg), copylen); - tempsp += copylen; - - /* Corner case: Structs consisting of a single float member are floats. - * FIXME! I don't know about structs containing multiple floats! - * Structs containing mixed floats and ints are even more weird. - */ - - - - /* Separate float args from all other args. */ - if (typecode == TYPE_CODE_FLT && SPARC_HAS_FPU) + if (conditional_p) { - if (register_counter < 16) - { - /* This arg gets copied into a FP register. */ - int fpreg; - - switch (len) { - case 4: /* Single-precision (float) */ - fpreg = FP0_REGNUM + 2 * register_counter + 1; - register_counter += 1; - break; - case 8: /* Double-precision (double) */ - fpreg = FP0_REGNUM + 2 * register_counter; - register_counter += 1; - break; - case 16: /* Quad-precision (long double) */ - fpreg = FP0_REGNUM + 2 * register_counter; - register_counter += 2; - break; - default: - internal_error (__FILE__, __LINE__, "bad switch"); - } - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (fpreg), - VALUE_CONTENTS (args[i]), - len); - } + /* For conditional branches, return nPC + 4 iff the annul + bit is 1. */ + return (X_A (insn) ? *npc + 4 : 0); + } + else + { + /* For unconditional branches, return the target if its + specified condition is "always" and return nPC + 4 if the + condition is "never". If the annul bit is 1, set *NPC to + zero. */ + if (X_COND (insn) == 0x0) + pc = *npc, offset = 4; + if (X_A (insn)) + *npc = 0; + + gdb_assert (offset != 0); + return pc + offset; } - else /* all other args go into the first six 'o' registers */ - { - for (j = 0; - j < len && register_counter < 6; - j += SPARC_INTREG_SIZE) - { - int oreg = O0_REGNUM + register_counter; - - deprecated_write_register_gen (oreg, VALUE_CONTENTS (copyarg) + j); - register_counter += 1; - } - } } - return sp; -} -/* Values <= 32 bytes are returned in o0-o3 (floating-point values are - returned in f0-f3). */ + return 0; +} -static void -sp64_extract_return_value (struct type *type, char *regbuf, char *valbuf, - int bitoffset) +void +sparc_software_single_step (enum target_signal sig, int insert_breakpoints_p) { - int typelen = TYPE_LENGTH (type); - int regsize = DEPRECATED_REGISTER_RAW_SIZE (O0_REGNUM); + struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + static CORE_ADDR npc, nnpc; + static char npc_save[4], nnpc_save[4]; - if (TYPE_CODE (type) == TYPE_CODE_FLT && SPARC_HAS_FPU) + if (insert_breakpoints_p) { - memcpy (valbuf, ®buf[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], typelen); - return; - } + CORE_ADDR pc; - if (TYPE_CODE (type) != TYPE_CODE_STRUCT - || (TYPE_LENGTH (type) > 32)) - { - memcpy (valbuf, - ®buf[O0_REGNUM * regsize + - (typelen >= regsize ? 0 : regsize - typelen)], - typelen); - return; + pc = sparc_address_from_register (tdep->pc_regnum); + npc = sparc_address_from_register (tdep->npc_regnum); + + /* Analyze the instruction at PC. */ + nnpc = sparc_analyze_control_transfer (pc, &npc); + if (npc != 0) + target_insert_breakpoint (npc, npc_save); + if (nnpc != 0) + target_insert_breakpoint (nnpc, nnpc_save); + + /* Assert that we have set at least one breakpoint, and that + they're not set at the same spot. */ + gdb_assert (npc != 0 || nnpc != 0); + gdb_assert (nnpc != npc); } else { - char *o0 = ®buf[O0_REGNUM * regsize]; - char *f0 = ®buf[FP0_REGNUM * regsize]; - int x; - - for (x = 0; x < TYPE_NFIELDS (type); x++) - { - struct field *f = &TYPE_FIELDS (type)[x]; - /* FIXME: We may need to handle static fields here. */ - int whichreg = (f->loc.bitpos + bitoffset) / 32; - int remainder = ((f->loc.bitpos + bitoffset) % 32) / 8; - int where = (f->loc.bitpos + bitoffset) / 8; - int size = TYPE_LENGTH (f->type); - int typecode = TYPE_CODE (f->type); - - if (typecode == TYPE_CODE_STRUCT) - { - sp64_extract_return_value (f->type, - regbuf, - valbuf, - bitoffset + f->loc.bitpos); - } - else if (typecode == TYPE_CODE_FLT && SPARC_HAS_FPU) - { - memcpy (valbuf + where, &f0[whichreg * 4] + remainder, size); - } - else - { - memcpy (valbuf + where, &o0[whichreg * 4] + remainder, size); - } - } + if (npc != 0) + target_remove_breakpoint (npc, npc_save); + if (nnpc != 0) + target_remove_breakpoint (nnpc, nnpc_save); } } static void -sparc64_extract_return_value (struct type *type, char *regbuf, char *valbuf) +sparc_write_pc (CORE_ADDR pc, ptid_t ptid) { - sp64_extract_return_value (type, regbuf, valbuf, 0); -} + struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); -extern CORE_ADDR -sparc32_stack_align (CORE_ADDR addr) -{ - return ((addr + 7) & -8); + write_register_pid (tdep->pc_regnum, pc, ptid); + write_register_pid (tdep->npc_regnum, pc + 4, ptid); } + +/* Unglobalize NAME. */ -static CORE_ADDR -sparc64_stack_align (CORE_ADDR addr) -{ - return ((addr + 15) & -16); -} +char * +sparc_stabs_unglobalize_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=<prefix>". 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. */ -extern void -sparc_print_extra_frame_info (struct frame_info *fi) -{ - if (fi && get_frame_extra_info (fi) && get_frame_extra_info (fi)->flat) - printf_filtered (" flat, pc saved at 0x%s, fp saved at 0x%s\n", - paddr_nz (get_frame_extra_info (fi)->pc_addr), - paddr_nz (get_frame_extra_info (fi)->fp_addr)); -} + if (name[0] == '$') + { + char *p = strrchr (name, '.'); + if (p) + return p + 1; + } -static const char * -sparc32_register_name (int regno) -{ - static char *register_names[] = - { "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7", - "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", - "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", - "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7", - - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", - - "y", "psr", "wim", "tbr", "pc", "npc", "fpsr", "cpsr" - }; - - if (regno < 0 || - regno >= (sizeof (register_names) / sizeof (register_names[0]))) - return NULL; - else - return register_names[regno]; + return name; } + -static const char * -sparc64_register_name (int regno) +static struct gdbarch * +sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { - static char *register_names[] = - { "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7", - "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", - "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", - "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7", - - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", - "f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46", - "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62", - - "pc", "npc", "ccr", "fsr", "fprs", "y", "asi", "ver", - "tick", "pil", "pstate", "tstate", "tba", "tl", "tt", "tpc", - "tnpc", "wstate", "cwp", "cansave", "canrestore", "cleanwin", "otherwin", - "asr16", "asr17", "asr18", "asr19", "asr20", "asr21", "asr22", "asr23", - "asr24", "asr25", "asr26", "asr27", "asr28", "asr29", "asr30", "asr31", - /* These are here at the end to simplify removing them if we have to. */ - "icc", "xcc", "fcc0", "fcc1", "fcc2", "fcc3" - }; - - if (regno < 0 || - regno >= (sizeof (register_names) / sizeof (register_names[0]))) - return NULL; - else - return register_names[regno]; -} + struct gdbarch_tdep *tdep; + struct gdbarch *gdbarch; -static CORE_ADDR -sparc_push_return_address (CORE_ADDR pc_unused, CORE_ADDR sp) -{ - if (CALL_DUMMY_LOCATION == AT_ENTRY_POINT) - { - /* The return PC of the dummy_frame is the former 'current' PC - (where we were before we made the target function call). - This is saved in %i7 by push_dummy_frame. + /* If there is already a candidate, use it. */ + arches = gdbarch_list_lookup_by_info (arches, &info); + if (arches != NULL) + return arches->gdbarch; - We will save the 'call dummy location' (ie. the address - to which the target function will return) in %o7. - This address will actually be the program's entry point. - There will be a special call_dummy breakpoint there. */ + /* Allocate space for the new architecture. */ + tdep = XMALLOC (struct gdbarch_tdep); + gdbarch = gdbarch_alloc (&info, tdep); - if (DEPRECATED_CALL_DUMMY_ADDRESS_P ()) - write_register (O7_REGNUM, DEPRECATED_CALL_DUMMY_ADDRESS () - 8); - else - write_register (O7_REGNUM, entry_point_address () - 8); - } + tdep->pc_regnum = SPARC32_PC_REGNUM; + tdep->npc_regnum = SPARC32_NPC_REGNUM; + tdep->plt_entry_size = 0; + + set_gdbarch_long_double_bit (gdbarch, 128); + set_gdbarch_long_double_format (gdbarch, &floatformat_sparc_quad); + + set_gdbarch_num_regs (gdbarch, SPARC32_NUM_REGS); + set_gdbarch_register_name (gdbarch, sparc32_register_name); + set_gdbarch_register_type (gdbarch, sparc32_register_type); + set_gdbarch_num_pseudo_regs (gdbarch, SPARC32_NUM_PSEUDO_REGS); + set_gdbarch_pseudo_register_read (gdbarch, sparc32_pseudo_register_read); + set_gdbarch_pseudo_register_write (gdbarch, sparc32_pseudo_register_write); + + /* Register numbers of various important registers. */ + set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); /* %sp */ + set_gdbarch_pc_regnum (gdbarch, SPARC32_PC_REGNUM); /* %pc */ + set_gdbarch_fp0_regnum (gdbarch, SPARC_F0_REGNUM); /* %f0 */ + + /* Call dummy code. */ + set_gdbarch_call_dummy_location (gdbarch, ON_STACK); + set_gdbarch_push_dummy_code (gdbarch, sparc32_push_dummy_code); + set_gdbarch_push_dummy_call (gdbarch, sparc32_push_dummy_call); + + set_gdbarch_extract_return_value (gdbarch, sparc32_extract_return_value); + set_gdbarch_store_return_value (gdbarch, sparc32_store_return_value); + set_gdbarch_extract_struct_value_address + (gdbarch, sparc_extract_struct_value_address); + set_gdbarch_use_struct_convention (gdbarch, sparc32_use_struct_convention); + set_gdbarch_return_value_on_stack (gdbarch, sparc32_return_value_on_stack); + set_gdbarch_stabs_argument_has_addr + (gdbarch, sparc32_stabs_argument_has_addr); + + set_gdbarch_skip_prologue (gdbarch, sparc32_skip_prologue); + + /* Stack grows downward. */ + set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - return sp; -} + set_gdbarch_breakpoint_from_pc (gdbarch, sparc_breakpoint_from_pc); + set_gdbarch_decr_pc_after_break (gdbarch, 0); + set_gdbarch_function_start_offset (gdbarch, 0); -/* Should call_function allocate stack space for a struct return? */ + set_gdbarch_frame_args_skip (gdbarch, 8); -static int -sparc64_use_struct_convention (int gcc_p, struct type *type) -{ - return (TYPE_LENGTH (type) > 32); -} + set_gdbarch_print_insn (gdbarch, print_insn_sparc); -/* Store the address of the place in which to copy the structure the - subroutine will return. This is called from call_function_by_hand. - The ultimate mystery is, tho, what is the value "16"? + set_gdbarch_software_single_step (gdbarch, sparc_software_single_step); + set_gdbarch_write_pc (gdbarch, sparc_write_pc); - MVS: That's the offset from where the sp is now, to where the - subroutine is gonna expect to find the struct return address. */ + set_gdbarch_unwind_dummy_id (gdbarch, sparc_unwind_dummy_id); -static void -sparc32_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) -{ - char *val; - CORE_ADDR o7; + set_gdbarch_unwind_pc (gdbarch, sparc_unwind_pc); - val = alloca (SPARC_INTREG_SIZE); - store_unsigned_integer (val, SPARC_INTREG_SIZE, addr); - write_memory (sp + (16 * SPARC_INTREG_SIZE), val, SPARC_INTREG_SIZE); + frame_base_set_default (gdbarch, &sparc32_frame_base); - if (CALL_DUMMY_LOCATION == AT_ENTRY_POINT) - { - /* Now adjust the value of the link register, which was previously - stored by push_return_address. Functions that return structs are - peculiar in that they return to link register + 12, rather than - link register + 8. */ + /* Hook in ABI-specific overrides, if they have been registered. */ + gdbarch_init_osabi (info, gdbarch); - o7 = read_register (O7_REGNUM); - write_register (O7_REGNUM, o7 - 4); - } + frame_unwind_append_sniffer (gdbarch, sparc32_frame_sniffer); + + return gdbarch; } + +/* Helper functions for dealing with register windows. */ -static void -sparc64_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) +void +sparc_supply_rwindow (struct regcache *regcache, CORE_ADDR sp, int regnum) { - /* FIXME: V9 uses %o0 for this. */ - /* FIXME MVS: Only for small enough structs!!! */ + int offset = 0; + char buf[8]; + int i; - target_write_memory (sp + (16 * SPARC_INTREG_SIZE), - (char *) &addr, SPARC_INTREG_SIZE); -#if 0 - if (CALL_DUMMY_LOCATION == AT_ENTRY_POINT) + if (sp & 1) { - /* Now adjust the value of the link register, which was previously - stored by push_return_address. Functions that return structs are - peculiar in that they return to link register + 12, rather than - link register + 8. */ + /* Registers are 64-bit. */ + sp += BIAS; - write_register (O7_REGNUM, read_register (O7_REGNUM) - 4); + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + { + target_read_memory (sp + ((i - SPARC_L0_REGNUM) * 8), buf, 8); + regcache_raw_supply (regcache, i, buf); + } + } } -#endif -} - -/* Default target data type for register REGNO. */ + else + { + /* Registers are 32-bit. Toss any sign-extension of the stack + pointer. */ + sp &= 0xffffffffUL; -static struct type * -sparc32_register_virtual_type (int regno) -{ - if (regno == PC_REGNUM || - regno == DEPRECATED_FP_REGNUM || - regno == SP_REGNUM) - return builtin_type_unsigned_int; - if (regno < 32) - return builtin_type_int; - if (regno < 64) - return builtin_type_float; - return builtin_type_int; -} + /* Clear out the top half of the temporary buffer, and put the + register value in the bottom half if we're in 64-bit mode. */ + if (gdbarch_ptr_bit (current_gdbarch) == 64) + { + memset (buf, 0, 4); + offset = 4; + } -static struct type * -sparc64_register_virtual_type (int regno) -{ - if (regno == PC_REGNUM || - regno == DEPRECATED_FP_REGNUM || - regno == SP_REGNUM) - return builtin_type_unsigned_long_long; - if (regno < 32) - return builtin_type_long_long; - if (regno < 64) - return builtin_type_float; - if (regno < 80) - return builtin_type_double; - return builtin_type_long_long; + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + { + target_read_memory (sp + ((i - SPARC_L0_REGNUM) * 4), + buf + offset, 4); + regcache_raw_supply (regcache, i, buf); + } + } + } } -/* Number of bytes of storage in the actual machine representation for - register REGNO. */ - -static int -sparc32_register_size (int regno) +void +sparc_collect_rwindow (const struct regcache *regcache, + CORE_ADDR sp, int regnum) { - return 4; -} + int offset = 0; + char buf[8]; + int i; -static int -sparc64_register_size (int regno) -{ - return (regno < 32 ? 8 : regno < 64 ? 4 : 8); -} + if (sp & 1) + { + /* Registers are 64-bit. */ + sp += BIAS; -/* Index within the `registers' buffer of the first byte of the space - for register REGNO. */ + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == -1 || regnum == SPARC_SP_REGNUM || regnum == i) + { + regcache_raw_collect (regcache, i, buf); + target_write_memory (sp + ((i - SPARC_L0_REGNUM) * 8), buf, 8); + } + } + } + else + { + /* Registers are 32-bit. Toss any sign-extension of the stack + pointer. */ + sp &= 0xffffffffUL; -static int -sparc32_register_byte (int regno) -{ - return (regno * 4); -} + /* Only use the bottom half if we're in 64-bit mode. */ + if (gdbarch_ptr_bit (current_gdbarch) == 64) + offset = 4; -static int -sparc64_register_byte (int regno) -{ - if (regno < 32) - return regno * 8; - else if (regno < 64) - return 32 * 8 + (regno - 32) * 4; - else if (regno < 80) - return 32 * 8 + 32 * 4 + (regno - 64) * 8; - else - return 64 * 8 + (regno - 80) * 8; + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == -1 || regnum == SPARC_SP_REGNUM || regnum == i) + { + regcache_raw_collect (regcache, i, buf); + target_write_memory (sp + ((i - SPARC_L0_REGNUM) * 4), + buf + offset, 4); + } + } + } } -/* Immediately after a function call, return the saved pc. - Can't go through the frames for this because on some machines - the new frame is not set up until the new function executes - some instructions. */ +/* Helper functions for dealing with register sets. */ -static CORE_ADDR -sparc_saved_pc_after_call (struct frame_info *fi) +void +sparc32_supply_gregset (const struct sparc_gregset *gregset, + struct regcache *regcache, + int regnum, const void *gregs) { - return sparc_pc_adjust (read_register (RP_REGNUM)); -} + const char *regs = gregs; + int i; -/* Init saved regs: nothing to do, just a place-holder function. */ + if (regnum == SPARC32_PSR_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_PSR_REGNUM, + regs + gregset->r_psr_offset); -static void -sparc_frame_init_saved_regs (struct frame_info *fi_ignored) -{ /* no-op */ -} + if (regnum == SPARC32_PC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_PC_REGNUM, + regs + gregset->r_pc_offset); -/* gdbarch fix call dummy: - All this function does is rearrange the arguments before calling - sparc_fix_call_dummy (which does the real work). */ + if (regnum == SPARC32_NPC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_NPC_REGNUM, + regs + gregset->r_npc_offset); -static void -sparc_gdbarch_fix_call_dummy (char *dummy, - CORE_ADDR pc, - CORE_ADDR fun, - int nargs, - struct value **args, - struct type *type, - int gcc_p) -{ - if (CALL_DUMMY_LOCATION == ON_STACK) - sparc_fix_call_dummy (dummy, pc, fun, type, gcc_p); -} - -/* DEPRECATED_CALL_DUMMY_ADDRESS: fetch the breakpoint address for a - call dummy. */ + if (regnum == SPARC32_Y_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_Y_REGNUM, + regs + gregset->r_y_offset); -static CORE_ADDR -sparc_call_dummy_address (void) -{ - return (DEPRECATED_CALL_DUMMY_START_OFFSET) + DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET; -} + if (regnum == SPARC_G0_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC_G0_REGNUM, NULL); -/* Supply the Y register number to those that need it. */ + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) + { + int offset = gregset->r_g1_offset; -int -sparc_y_regnum (void) -{ - return gdbarch_tdep (current_gdbarch)->y_regnum; -} + for (i = SPARC_G1_REGNUM; i <= SPARC_O7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + regcache_raw_supply (regcache, i, regs + offset); + offset += 4; + } + } -int -sparc_reg_struct_has_addr (int gcc_p, struct type *type) -{ - if (GDB_TARGET_IS_SPARC64) - return (TYPE_LENGTH (type) > 32); - else - return (gcc_p != 1); -} + if ((regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) || regnum == -1) + { + /* Not all of the register set variants include Locals and + Inputs. For those that don't, we read them off the stack. */ + if (gregset->r_l0_offset == -1) + { + ULONGEST sp; -int -sparc_intreg_size (void) -{ - return SPARC_INTREG_SIZE; -} + regcache_cooked_read_unsigned (regcache, SPARC_SP_REGNUM, &sp); + sparc_supply_rwindow (regcache, sp, regnum); + } + else + { + int offset = gregset->r_l0_offset; -static int -sparc_return_value_on_stack (struct type *type) -{ - if (TYPE_CODE (type) == TYPE_CODE_FLT && - TYPE_LENGTH (type) > 8) - return 1; - else - return 0; + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + regcache_raw_supply (regcache, i, regs + offset); + offset += 4; + } + } + } } -/* Get the ith function argument for the current function. */ -static CORE_ADDR -sparc_fetch_pointer_argument (struct frame_info *frame, int argi, - struct type *type) +void +sparc32_collect_gregset (const struct sparc_gregset *gregset, + const struct regcache *regcache, + int regnum, void *gregs) { - CORE_ADDR addr; - get_frame_register (frame, O0_REGNUM + argi, &addr); - return addr; -} + char *regs = gregs; + int i; -/* - * Gdbarch "constructor" function. - */ + if (regnum == SPARC32_PSR_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_PSR_REGNUM, + regs + gregset->r_psr_offset); -#define SPARC32_CALL_DUMMY_ON_STACK + if (regnum == SPARC32_PC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_PC_REGNUM, + regs + gregset->r_pc_offset); -#define SPARC_SP_REGNUM 14 -#define SPARC_FP_REGNUM 30 -#define SPARC_FP0_REGNUM 32 -#define SPARC32_NPC_REGNUM 69 -#define SPARC32_PC_REGNUM 68 -#define SPARC32_Y_REGNUM 64 -#define SPARC64_PC_REGNUM 80 -#define SPARC64_NPC_REGNUM 81 -#define SPARC64_Y_REGNUM 85 + if (regnum == SPARC32_NPC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_NPC_REGNUM, + regs + gregset->r_npc_offset); -static struct gdbarch * -sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) -{ - struct gdbarch *gdbarch; - struct gdbarch_tdep *tdep; + if (regnum == SPARC32_Y_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_Y_REGNUM, + regs + gregset->r_y_offset); - static LONGEST call_dummy_32[] = - { 0xbc100001, 0x9de38000, 0xbc100002, 0xbe100003, - 0xda03a058, 0xd803a054, 0xd603a050, 0xd403a04c, - 0xd203a048, 0x40000000, 0xd003a044, 0x01000000, - 0x91d02001, 0x01000000 - }; - static LONGEST call_dummy_64[] = - { 0x9de3bec0fd3fa7f7LL, 0xf93fa7eff53fa7e7LL, - 0xf13fa7dfed3fa7d7LL, 0xe93fa7cfe53fa7c7LL, - 0xe13fa7bfdd3fa7b7LL, 0xd93fa7afd53fa7a7LL, - 0xd13fa79fcd3fa797LL, 0xc93fa78fc53fa787LL, - 0xc13fa77fcc3fa777LL, 0xc83fa76fc43fa767LL, - 0xc03fa75ffc3fa757LL, 0xf83fa74ff43fa747LL, - 0xf03fa73f01000000LL, 0x0100000001000000LL, - 0x0100000091580000LL, 0xd027a72b93500000LL, - 0xd027a72791480000LL, 0xd027a72391400000LL, - 0xd027a71fda5ba8a7LL, 0xd85ba89fd65ba897LL, - 0xd45ba88fd25ba887LL, 0x9fc02000d05ba87fLL, - 0x0100000091d02001LL, 0x0100000001000000LL - }; - static LONGEST call_dummy_nil[] = {0}; - - /* Try to determine the OS ABI of the object we are loading. */ - - if (info.abfd != NULL - && info.osabi == GDB_OSABI_UNKNOWN) + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) { - /* If it's an ELF file, assume it's Solaris. */ - if (bfd_get_flavour (info.abfd) == bfd_target_elf_flavour) - info.osabi = GDB_OSABI_SOLARIS; - } - - /* First see if there is already a gdbarch that can satisfy the request. */ - arches = gdbarch_list_lookup_by_info (arches, &info); - if (arches != NULL) - return arches->gdbarch; - - /* None found: is the request for a sparc architecture? */ - if (info.bfd_arch_info->arch != bfd_arch_sparc) - return NULL; /* No; then it's not for us. */ + int offset = gregset->r_g1_offset; - /* Yes: create a new gdbarch for the specified machine type. */ - tdep = (struct gdbarch_tdep *) xmalloc (sizeof (struct gdbarch_tdep)); - gdbarch = gdbarch_alloc (&info, tdep); + /* %g0 is always zero. */ + for (i = SPARC_G1_REGNUM; i <= SPARC_O7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + regcache_raw_collect (regcache, i, regs + offset); + offset += 4; + } + } - /* First set settings that are common for all sparc architectures. */ - set_gdbarch_believe_pcc_promotion (gdbarch, 1); - set_gdbarch_breakpoint_from_pc (gdbarch, sparc_breakpoint_from_pc); - set_gdbarch_decr_pc_after_break (gdbarch, 0); - set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT); - set_gdbarch_extract_struct_value_address (gdbarch, - sparc_extract_struct_value_address); - set_gdbarch_deprecated_fix_call_dummy (gdbarch, sparc_gdbarch_fix_call_dummy); - set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_fp_regnum (gdbarch, SPARC_FP_REGNUM); - set_gdbarch_fp0_regnum (gdbarch, SPARC_FP0_REGNUM); - set_gdbarch_deprecated_frame_chain (gdbarch, sparc_frame_chain); - set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sparc_frame_init_saved_regs); - set_gdbarch_deprecated_frame_saved_pc (gdbarch, sparc_frame_saved_pc); - set_gdbarch_frameless_function_invocation (gdbarch, - frameless_look_for_prologue); - set_gdbarch_deprecated_get_saved_register (gdbarch, sparc_get_saved_register); - set_gdbarch_deprecated_init_extra_frame_info (gdbarch, sparc_init_extra_frame_info); - set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_long_double_bit (gdbarch, 16 * TARGET_CHAR_BIT); - set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, 8); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 8); - set_gdbarch_deprecated_pop_frame (gdbarch, sparc_pop_frame); - set_gdbarch_deprecated_push_return_address (gdbarch, sparc_push_return_address); - set_gdbarch_deprecated_push_dummy_frame (gdbarch, sparc_push_dummy_frame); - set_gdbarch_deprecated_reg_struct_has_addr - (gdbarch, sparc_reg_struct_has_addr); - set_gdbarch_return_value_on_stack (gdbarch, sparc_return_value_on_stack); - set_gdbarch_deprecated_saved_pc_after_call (gdbarch, sparc_saved_pc_after_call); - set_gdbarch_prologue_frameless_p (gdbarch, sparc_prologue_frameless_p); - set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); - set_gdbarch_skip_prologue (gdbarch, sparc_skip_prologue); - set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); - set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0); - set_gdbarch_write_pc (gdbarch, generic_target_write_pc); - - /* Helper for function argument information. */ - set_gdbarch_fetch_pointer_argument (gdbarch, sparc_fetch_pointer_argument); - - /* - * Settings that depend only on 32/64 bit word size - */ - - switch (info.bfd_arch_info->mach) + if ((regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) || regnum == -1) { - case bfd_mach_sparc: - case bfd_mach_sparc_v8plus: - case bfd_mach_sparc_v8plusa: - /* 32-bit machine types: */ - -#ifdef SPARC32_CALL_DUMMY_ON_STACK - set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); - set_gdbarch_deprecated_call_dummy_address (gdbarch, sparc_call_dummy_address); - set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, 0x30); - set_gdbarch_deprecated_call_dummy_length (gdbarch, 0x38); - - /* NOTE: cagney/2003-05-01: Using the just added push_dummy_code - architecture method, it is now possible to implement a - generic dummy frames based inferior function call that stores - the breakpoint (and struct info) on the stack. Further, by - treating a SIGSEG at a breakpoint as equivalent to a SIGTRAP - it is even possible to make this work when the stack is - no-execute. - - NOTE: cagney/2002-04-26: Based from info posted by Peter - Schauer around Oct '99. Briefly, due to aspects of the SPARC - ABI, it isn't possible to use ON_STACK with a strictly - compliant compiler. - - Peter Schauer writes ... - - No, any call from GDB to a user function returning a - struct/union will fail miserably. Try this: - - *NOINDENT* - struct x - { - int a[4]; - }; - - struct x gx; - - struct x - sret () - { - return gx; - } - - main () - { - int i; - for (i = 0; i < 4; i++) - gx.a[i] = i + 1; - gx = sret (); - } - *INDENT* - - Set a breakpoint at the gx = sret () statement, run to it and - issue a `print sret()'. It will not succed with your - approach, and I doubt that continuing the program will work - as well. - - For details of the ABI see the Sparc Architecture Manual. I - have Version 8 (Prentice Hall ISBN 0-13-825001-4) and the - calling conventions for functions returning aggregate values - are explained in Appendix D.3. */ - - set_gdbarch_call_dummy_location (gdbarch, ON_STACK); - set_gdbarch_deprecated_call_dummy_words (gdbarch, call_dummy_32); -#else - set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); - set_gdbarch_deprecated_call_dummy_words (gdbarch, call_dummy_nil); -#endif - set_gdbarch_deprecated_call_dummy_stack_adjust (gdbarch, 68); - set_gdbarch_frame_args_skip (gdbarch, 68); - set_gdbarch_function_start_offset (gdbarch, 0); - set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC32_NPC_REGNUM); - set_gdbarch_pc_regnum (gdbarch, SPARC32_PC_REGNUM); - set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_push_arguments (gdbarch, sparc32_push_arguments); - - set_gdbarch_deprecated_register_byte (gdbarch, sparc32_register_byte); - set_gdbarch_deprecated_register_raw_size (gdbarch, sparc32_register_size); - set_gdbarch_deprecated_register_size (gdbarch, 4); - set_gdbarch_deprecated_register_virtual_size (gdbarch, sparc32_register_size); - set_gdbarch_deprecated_register_virtual_type (gdbarch, sparc32_register_virtual_type); -#ifdef SPARC32_CALL_DUMMY_ON_STACK - set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof (call_dummy_32)); -#else - set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, 0); -#endif - set_gdbarch_deprecated_stack_align (gdbarch, sparc32_stack_align); - set_gdbarch_deprecated_extra_stack_alignment_needed (gdbarch, 1); - set_gdbarch_deprecated_store_struct_return (gdbarch, sparc32_store_struct_return); - set_gdbarch_use_struct_convention (gdbarch, - generic_use_struct_convention); - set_gdbarch_deprecated_dummy_write_sp (gdbarch, deprecated_write_sp); - tdep->y_regnum = SPARC32_Y_REGNUM; - tdep->fp_max_regnum = SPARC_FP0_REGNUM + 32; - tdep->intreg_size = 4; - tdep->reg_save_offset = 0x60; - tdep->call_dummy_call_offset = 0x24; - break; + /* Not all of the register set variants include Locals and + Inputs. For those that don't, we read them off the stack. */ + if (gregset->r_l0_offset != -1) + { + int offset = gregset->r_l0_offset; - case bfd_mach_sparc_v9: - case bfd_mach_sparc_v9a: - /* 64-bit machine types: */ - default: /* Any new machine type is likely to be 64-bit. */ - -#ifdef SPARC64_CALL_DUMMY_ON_STACK - set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); - set_gdbarch_deprecated_call_dummy_address (gdbarch, sparc_call_dummy_address); - set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, 8 * 4); - set_gdbarch_deprecated_call_dummy_length (gdbarch, 192); - set_gdbarch_call_dummy_location (gdbarch, ON_STACK); - set_gdbarch_deprecated_call_dummy_start_offset (gdbarch, 148); - set_gdbarch_deprecated_call_dummy_words (gdbarch, call_dummy_64); -#else - set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); - set_gdbarch_deprecated_call_dummy_words (gdbarch, call_dummy_nil); -#endif - set_gdbarch_deprecated_call_dummy_stack_adjust (gdbarch, 128); - set_gdbarch_frame_args_skip (gdbarch, 136); - set_gdbarch_function_start_offset (gdbarch, 0); - set_gdbarch_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); - set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); - set_gdbarch_ptr_bit (gdbarch, 8 * TARGET_CHAR_BIT); - set_gdbarch_deprecated_push_arguments (gdbarch, sparc64_push_arguments); - /* NOTE different for at_entry */ - set_gdbarch_deprecated_target_read_fp (gdbarch, sparc64_read_fp); - set_gdbarch_read_sp (gdbarch, sparc64_read_sp); - /* Some of the registers aren't 64 bits, but it's a lot simpler just - to assume they all are (since most of them are). */ - set_gdbarch_deprecated_register_byte (gdbarch, sparc64_register_byte); - set_gdbarch_deprecated_register_raw_size (gdbarch, sparc64_register_size); - set_gdbarch_deprecated_register_size (gdbarch, 8); - set_gdbarch_deprecated_register_virtual_size (gdbarch, sparc64_register_size); - set_gdbarch_deprecated_register_virtual_type (gdbarch, sparc64_register_virtual_type); -#ifdef SPARC64_CALL_DUMMY_ON_STACK - set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof (call_dummy_64)); -#else - set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, 0); -#endif - set_gdbarch_deprecated_stack_align (gdbarch, sparc64_stack_align); - set_gdbarch_deprecated_extra_stack_alignment_needed (gdbarch, 1); - set_gdbarch_deprecated_store_struct_return (gdbarch, sparc64_store_struct_return); - set_gdbarch_use_struct_convention (gdbarch, - sparc64_use_struct_convention); - set_gdbarch_deprecated_dummy_write_sp (gdbarch, sparc64_write_sp); - tdep->y_regnum = SPARC64_Y_REGNUM; - tdep->fp_max_regnum = SPARC_FP0_REGNUM + 48; - tdep->intreg_size = 8; - tdep->reg_save_offset = 0x90; - tdep->call_dummy_call_offset = 148 + 4 * 5; - break; + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + regcache_raw_collect (regcache, i, regs + offset); + offset += 4; + } + } } +} - /* - * Settings that vary per-architecture: - */ +void +sparc32_supply_fpregset (struct regcache *regcache, + int regnum, const void *fpregs) +{ + const char *regs = fpregs; + int i; - switch (info.bfd_arch_info->mach) + for (i = 0; i < 32; i++) { - case bfd_mach_sparc: - set_gdbarch_extract_return_value (gdbarch, sparc32_extract_return_value); - set_gdbarch_store_return_value (gdbarch, sparc32_store_return_value); - set_gdbarch_num_regs (gdbarch, 72); - set_gdbarch_deprecated_register_bytes (gdbarch, 32*4 + 32*4 + 8*4); - set_gdbarch_register_name (gdbarch, sparc32_register_name); - tdep->fp_register_bytes = 32 * 4; - tdep->print_insn_mach = bfd_mach_sparc; - break; - case bfd_mach_sparc_v8plus: - set_gdbarch_extract_return_value (gdbarch, sparc32_extract_return_value); - set_gdbarch_store_return_value (gdbarch, sparc32_store_return_value); - set_gdbarch_num_regs (gdbarch, 72); - set_gdbarch_deprecated_register_bytes (gdbarch, 32*4 + 32*4 + 8*4); - set_gdbarch_register_name (gdbarch, sparc32_register_name); - tdep->print_insn_mach = bfd_mach_sparc; - tdep->fp_register_bytes = 32 * 4; - break; - case bfd_mach_sparc_v8plusa: - set_gdbarch_extract_return_value (gdbarch, sparc32_extract_return_value); - set_gdbarch_store_return_value (gdbarch, sparc32_store_return_value); - set_gdbarch_num_regs (gdbarch, 72); - set_gdbarch_deprecated_register_bytes (gdbarch, 32*4 + 32*4 + 8*4); - set_gdbarch_register_name (gdbarch, sparc32_register_name); - tdep->fp_register_bytes = 32 * 4; - tdep->print_insn_mach = bfd_mach_sparc; - break; - case bfd_mach_sparc_v9: - set_gdbarch_deprecated_extract_return_value (gdbarch, sparc64_extract_return_value); - set_gdbarch_num_regs (gdbarch, 125); - set_gdbarch_deprecated_register_bytes (gdbarch, 32*8 + 32*8 + 45*8); - set_gdbarch_register_name (gdbarch, sparc64_register_name); - set_gdbarch_deprecated_store_return_value (gdbarch, sparc_store_return_value); - tdep->fp_register_bytes = 64 * 4; - tdep->print_insn_mach = bfd_mach_sparc_v9a; - break; - case bfd_mach_sparc_v9a: - set_gdbarch_deprecated_extract_return_value (gdbarch, sparc64_extract_return_value); - set_gdbarch_num_regs (gdbarch, 125); - set_gdbarch_deprecated_register_bytes (gdbarch, 32*8 + 32*8 + 45*8); - set_gdbarch_register_name (gdbarch, sparc64_register_name); - set_gdbarch_deprecated_store_return_value (gdbarch, sparc_store_return_value); - tdep->fp_register_bytes = 64 * 4; - tdep->print_insn_mach = bfd_mach_sparc_v9a; - break; + if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) + regcache_raw_supply (regcache, SPARC_F0_REGNUM + i, regs + (i * 4)); } - set_gdbarch_print_insn (gdbarch, print_insn_sparc); + if (regnum == SPARC32_FSR_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_FSR_REGNUM, regs + (32 * 4) + 4); +} - /* Hook in OS ABI-specific overrides, if they have been registered. */ - gdbarch_init_osabi (info, gdbarch); +void +sparc32_collect_fpregset (const struct regcache *regcache, + int regnum, void *fpregs) +{ + char *regs = fpregs; + int i; - return gdbarch; + for (i = 0; i < 32; i++) + { + if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) + regcache_raw_collect (regcache, SPARC_F0_REGNUM + i, regs + (i * 4)); + } + + if (regnum == SPARC32_FSR_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_FSR_REGNUM, regs + (32 * 4) + 4); } + -static void -sparc_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) +/* SunOS 4. */ + +/* From <machine/reg.h>. */ +const struct sparc_gregset sparc32_sunos4_gregset = { - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + 0 * 4, /* %psr */ + 1 * 4, /* %pc */ + 2 * 4, /* %npc */ + 3 * 4, /* %y */ + -1, /* %wim */ + -1, /* %tbr */ + 4 * 4, /* %g1 */ + -1 /* %l0 */ +}; + - if (tdep == NULL) - return; +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc_tdep (void); - fprintf_unfiltered (file, "sparc_dump_tdep: fp_register_bytes = %d\n", - tdep->fp_register_bytes); - fprintf_unfiltered (file, "sparc_dump_tdep: y_regnum = %d\n", - tdep->y_regnum); - fprintf_unfiltered (file, "sparc_dump_tdep: fp_max_regnum = %d\n", - tdep->fp_max_regnum); - fprintf_unfiltered (file, "sparc_dump_tdep: intreg_size = %d\n", - tdep->intreg_size); - fprintf_unfiltered (file, "sparc_dump_tdep: reg_save_offset = %d\n", - tdep->reg_save_offset); - fprintf_unfiltered (file, "sparc_dump_tdep: call_dummy_call_offset = %d\n", - tdep->call_dummy_call_offset); - fprintf_unfiltered (file, "sparc_dump_tdep: print_insn_match = %d\n", - tdep->print_insn_mach); +void +_initialize_sparc_tdep (void) +{ + register_gdbarch_init (bfd_arch_sparc, sparc32_gdbarch_init); } diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h index 7c119b407ab..05f2e369fa3 100644 --- a/gdb/sparc-tdep.h +++ b/gdb/sparc-tdep.h @@ -1,6 +1,6 @@ -/* Target-dependent code for the SPARC for GDB, the GNU debugger. +/* Target-dependent code for SPARC. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -19,4 +19,172 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern int sparc_y_regnum (void); +#ifndef SPARC_TDEP_H +#define SPARC_TDEP_H 1 + +struct gdbarch; +struct regcache; +struct trad_frame_saved_reg; + +/* Register offsets for the general-purpose register set. */ + +struct sparc_gregset +{ + int r_psr_offset; + int r_pc_offset; + int r_npc_offset; + int r_y_offset; + int r_wim_offset; + int r_tbr_offset; + int r_g1_offset; + int r_l0_offset; + int r_y_size; +}; + +/* SPARC architecture-specific information. */ + +struct gdbarch_tdep +{ + /* Register numbers for the PN and nPC registers. The definitions + for (64-bit) UltraSPARC differ from the (32-bit) SPARC + definitions. */ + int pc_regnum; + int npc_regnum; + + /* Offset of saved PC in jmp_buf. */ + int jb_pc_offset; + + /* Size of an Procedure Linkage Table (PLT) entry, 0 if we shouldn't + treat the PLT special when doing prologue analysis. */ + size_t plt_entry_size; +}; + +/* Register numbers of various important registers. */ + +enum sparc_regnum +{ + SPARC_G0_REGNUM, /* %g0 */ + SPARC_G1_REGNUM, + SPARC_G2_REGNUM, + SPARC_G3_REGNUM, + SPARC_G4_REGNUM, + SPARC_G5_REGNUM, + SPARC_G6_REGNUM, + SPARC_G7_REGNUM, /* %g7 */ + SPARC_O0_REGNUM, /* %o0 */ + SPARC_O1_REGNUM, + SPARC_O2_REGNUM, + SPARC_O3_REGNUM, + SPARC_O4_REGNUM, + SPARC_O5_REGNUM, + SPARC_SP_REGNUM, /* %sp (%o6) */ + SPARC_O7_REGNUM, /* %o7 */ + SPARC_L0_REGNUM, /* %l0 */ + SPARC_L1_REGNUM, + SPARC_L2_REGNUM, + SPARC_L3_REGNUM, + SPARC_L4_REGNUM, + SPARC_L5_REGNUM, + SPARC_L6_REGNUM, + SPARC_L7_REGNUM, /* %l7 */ + SPARC_I0_REGNUM, /* %i0 */ + SPARC_I1_REGNUM, + SPARC_I2_REGNUM, + SPARC_I3_REGNUM, + SPARC_I4_REGNUM, + SPARC_I5_REGNUM, + SPARC_FP_REGNUM, /* %fp (%i6) */ + SPARC_I7_REGNUM, /* %i7 */ + SPARC_F0_REGNUM, /* %f0 */ + SPARC_F1_REGNUM, + SPARC_F31_REGNUM /* %f31 */ + = SPARC_F0_REGNUM + 31 +}; + +enum sparc32_regnum +{ + SPARC32_Y_REGNUM /* %y */ + = SPARC_F31_REGNUM + 1, + SPARC32_PSR_REGNUM, /* %psr */ + SPARC32_WIM_REGNUM, /* %wim */ + SPARC32_TBR_REGNUM, /* %tbr */ + SPARC32_PC_REGNUM, /* %pc */ + SPARC32_NPC_REGNUM, /* %npc */ + SPARC32_FSR_REGNUM, /* %fsr */ + SPARC32_CSR_REGNUM, /* %csr */ + + /* Pseudo registers. */ + SPARC32_D0_REGNUM, /* %d0 */ + SPARC32_D30_REGNUM /* %d30 */ + = SPARC32_D0_REGNUM + 15 +}; + + +struct sparc_frame_cache +{ + /* Base address. */ + CORE_ADDR base; + CORE_ADDR pc; + + /* Do we have a frame? */ + int frameless_p; + + /* Do we have a Structure, Union or Quad-Precision return value?. */ + int struct_return_p; + + /* Table of saved registers. */ + struct trad_frame_saved_reg *saved_regs; +}; + +/* Fetch the instruction at PC. */ +extern unsigned long sparc_fetch_instruction (CORE_ADDR pc); + +extern CORE_ADDR sparc_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc, + struct sparc_frame_cache *cache); + +extern struct sparc_frame_cache * + sparc_frame_cache (struct frame_info *next_frame, void **this_cache); + +extern struct sparc_frame_cache * + sparc32_frame_cache (struct frame_info *next_frame, void **this_cache); + + + +extern void sparc_software_single_step (enum target_signal sig, + int insert_breakpoints_p); + +extern void sparc_supply_rwindow (struct regcache *regcache, + CORE_ADDR sp, int regnum); +extern void sparc_collect_rwindow (const struct regcache *regcache, + CORE_ADDR sp, int regnum); + +/* Register offsets for SunOS 4. */ +extern const struct sparc_gregset sparc32_sunos4_gregset; + +extern void sparc32_supply_gregset (const struct sparc_gregset *gregset, + struct regcache *regcache, + int regnum, const void *gregs); +extern void sparc32_collect_gregset (const struct sparc_gregset *gregset, + const struct regcache *regcache, + int regnum, void *gregs); +extern void sparc32_supply_fpregset (struct regcache *regcache, + int regnum, const void *fpregs); +extern void sparc32_collect_fpregset (const struct regcache *regcache, + int regnum, void *fpregs); + +/* Functions and variables exported from sparc-sol2-tdep.c. */ + +/* Register offsets for Solaris 2. */ +extern const struct sparc_gregset sparc32_sol2_gregset; + +extern int sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name); + +extern void sparc32_sol2_init_abi (struct gdbarch_info info, + struct gdbarch *gdbarch); + +/* Functions and variables exported from sparcnbsd-tdep.c. */ + +/* Register offsets for NetBSD. */ +extern const struct sparc_gregset sparc32nbsd_gregset; + +#endif /* sparc-tdep.h */ diff --git a/gdb/sparcbsd-nat.h b/gdb/sparc64-linux-nat.c index 326d669fe28..56ee2936938 100644 --- a/gdb/sparcbsd-nat.h +++ b/gdb/sparc64-linux-nat.c @@ -1,4 +1,4 @@ -/* Native-dependent code for SPARC BSD's. +/* Native-dependent code for GNU/Linux UltraSPARC. Copyright 2003 Free Software Foundation, Inc. @@ -19,19 +19,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef SPARCBSD_NAT_H -#define SPARCBSD_NAT_H - -/* Functions translating between `struct reg' and `struct fpreg' and - GDB's register cache. */ -extern void (*sparcbsd_supply_reg)(const char *, int); -extern void (*sparcbsd_fill_reg)(char *, int); -extern void (*sparcbsd_supply_fpreg)(const char *, int); -extern void (*sparcbsd_fill_fpreg)(char *, int); - -/* Functions indication whether `struct reg' or `struct fpreg' provides - a certain register. */ -extern int (*sparcbsd_reg_supplies_p)(int); -extern int (*sparcbsd_fpreg_supplies_p)(int); - -#endif /* sparcbsd-nat.h */ +#include "defs.h" + +#include "sparc64-tdep.h" +#include "sparc-nat.h" + +static const struct sparc_gregset sparc64_linux_ptrace_gregset = +{ + 16 * 8, /* "tstate" */ + 17 * 8, /* %pc */ + 18 * 8, /* %npc */ + 19 * 8, /* %y */ + -1, /* %wim */ + -1, /* %tbr */ + 0 * 8, /* %g1 */ + -1, /* %l0 */ + 4 /* sizeof (%y) */ +}; + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc64_linux_nat (void); + +void +_initialize_sparc64_linux_nat (void) +{ + sparc_gregset = &sparc64_linux_ptrace_gregset; +} diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c new file mode 100644 index 00000000000..cd785571d58 --- /dev/null +++ b/gdb/sparc64-linux-tdep.c @@ -0,0 +1,82 @@ +/* Target-dependent code for GNU/Linux UltraSPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "gdbarch.h" +#include "osabi.h" +#include "solib-svr4.h" + +#include "sparc64-tdep.h" + +static struct link_map_offsets * +sparc64_linux_svr4_fetch_link_map_offsets (void) +{ + static struct link_map_offsets lmo; + static struct link_map_offsets *lmp = NULL; + + if (lmp == NULL) + { + lmp = &lmo; + + /* Everything we need is in the first 16 bytes. */ + lmo.r_debug_size = 16; + lmo.r_map_offset = 8; + lmo.r_map_size = 8; + + /* Everything we need is in the first 40 bytes. */ + lmo.link_map_size = 40; + lmo.l_addr_offset = 0; + lmo.l_addr_size = 8; + lmo.l_name_offset = 8; + lmo.l_name_size = 8; + lmo.l_next_offset = 24; + lmo.l_next_size = 8; + lmo.l_prev_offset = 32; + lmo.l_prev_size = 8; + } + + return lmp; +} + +static void +sparc64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* GNU/Linux is very similar to Solaris ... */ + sparc64_sol2_init_abi (info, gdbarch); + + /* ... but doesn't have kernel-assisted single-stepping support. */ + set_gdbarch_software_single_step (gdbarch, sparc_software_single_step); + + set_solib_svr4_fetch_link_map_offsets + (gdbarch, sparc64_linux_svr4_fetch_link_map_offsets); +} + +/* Provide a prototype to silence -Wmissing-prototypes. */ +extern void _initialize_sparc64_linux_tdep (void); + +void +_initialize_sparc64_linux_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_sparc, bfd_mach_sparc_v9, + GDB_OSABI_LINUX, sparc64_linux_init_abi); +} diff --git a/gdb/sparc64-nat.c b/gdb/sparc64-nat.c new file mode 100644 index 00000000000..40a8b3b3904 --- /dev/null +++ b/gdb/sparc64-nat.c @@ -0,0 +1,87 @@ +/* Native-dependent code for GNU/Linux UltraSPARC. + + Copyright 2003 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "gdbarch.h" + +#include "sparc64-tdep.h" +#include "sparc-nat.h" + +/* Determine whether `gregset_t' contains register REGNUM. */ + +static int +sparc64_gregset_supplies_p (int regnum) +{ + if (gdbarch_ptr_bit (current_gdbarch) == 32) + return sparc32_gregset_supplies_p (regnum); + + /* Integer registers. */ + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM) + || (regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_L7_REGNUM) + || (regnum >= SPARC_I0_REGNUM && regnum <= SPARC_I7_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_PC_REGNUM + || regnum == SPARC64_NPC_REGNUM + || regnum == SPARC64_STATE_REGNUM + || regnum == SPARC64_Y_REGNUM + || regnum == SPARC64_FPRS_REGNUM) + return 1; + + return 0; +} + +/* Determine whether `fpregset_t' contains register REGNUM. */ + +static int +sparc64_fpregset_supplies_p (int regnum) +{ + if (gdbarch_ptr_bit (current_gdbarch) == 32) + return sparc32_fpregset_supplies_p (regnum); + + /* Floating-point registers. */ + if ((regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) + || (regnum >= SPARC64_F32_REGNUM && regnum <= SPARC64_F62_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_FSR_REGNUM) + return 1; + + return 0; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc64_nat (void); + +void +_initialize_sparc64_nat (void) +{ + sparc_supply_gregset = sparc64_supply_gregset; + sparc_collect_gregset = sparc64_collect_gregset; + sparc_supply_fpregset = sparc64_supply_fpregset; + sparc_collect_fpregset = sparc64_collect_fpregset; + sparc_gregset_supplies_p = sparc64_gregset_supplies_p; + sparc_fpregset_supplies_p = sparc64_fpregset_supplies_p; +} diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c new file mode 100644 index 00000000000..079f3c502e7 --- /dev/null +++ b/gdb/sparc64-sol2-tdep.c @@ -0,0 +1,182 @@ +/* Target-dependent code for Solaris UltraSPARC. + + Copyright 2003, 2004 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "frame.h" +#include "frame-unwind.h" +#include "gdbarch.h" +#include "symtab.h" +#include "objfiles.h" +#include "osabi.h" +#include "trad-frame.h" + +#include "gdb_assert.h" + +#include "sparc64-tdep.h" + +/* From <sys/regset.h>. */ +const struct sparc_gregset sparc64_sol2_gregset = +{ + 32 * 8, /* "tstate" */ + 33 * 8, /* %pc */ + 34 * 8, /* %npc */ + 35 * 8, /* %y */ + -1, /* %wim */ + -1, /* %tbr */ + 1 * 8, /* %g1 */ + 16 * 8, /* %l0 */ + 8 /* sizeof (%y) */ +}; + + +static struct sparc_frame_cache * +sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, + void **this_cache) +{ + struct sparc_frame_cache *cache; + CORE_ADDR mcontext_addr, addr; + int regnum; + + if (*this_cache) + return *this_cache; + + cache = sparc_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); + + cache->saved_regs = trad_frame_alloc_saved_regs (next_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) + 64; + + cache->saved_regs[SPARC64_CCR_REGNUM].addr = mcontext_addr + 0 * 8; + cache->saved_regs[SPARC64_PC_REGNUM].addr = mcontext_addr + 1 * 8; + cache->saved_regs[SPARC64_NPC_REGNUM].addr = mcontext_addr + 2 * 8; + cache->saved_regs[SPARC64_Y_REGNUM].addr = mcontext_addr + 3 * 8; + cache->saved_regs[SPARC64_ASI_REGNUM].addr = mcontext_addr + 19 * 8; + cache->saved_regs[SPARC64_FPRS_REGNUM].addr = mcontext_addr + 20 * 8; + + /* Since %g0 is always zero, keep the identity encoding. */ + for (regnum = SPARC_G1_REGNUM, addr = mcontext_addr + 4 * 8; + regnum <= SPARC_O7_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + + if (get_frame_memory_unsigned (next_frame, mcontext_addr + 21 * 8, 8)) + { + /* The register windows haven't been flushed. */ + for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++) + trad_frame_set_unknown (cache->saved_regs, regnum); + } + else + { + CORE_ADDR sp; + + addr = cache->saved_regs[SPARC_SP_REGNUM].addr; + sp = get_frame_memory_unsigned (next_frame, addr, 8); + for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS; + regnum <= SPARC_I7_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + } + + return cache; +} + +static void +sparc64_sol2_sigtramp_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc64_sol2_sigtramp_frame_cache (next_frame, this_cache); + + (*this_id) = frame_id_build (cache->base, cache->pc); +} + +static void +sparc64_sol2_sigtramp_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) +{ + struct sparc_frame_cache *cache = + sparc64_sol2_sigtramp_frame_cache (next_frame, this_cache); + + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} + +static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc64_sol2_sigtramp_frame_this_id, + sparc64_sol2_sigtramp_frame_prev_register +}; + +static const struct frame_unwind * +sparc64_sol2_sigtramp_frame_sniffer (struct frame_info *next_frame) +{ + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; + + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc_sol2_pc_in_sigtramp (pc, name)) + return &sparc64_sol2_sigtramp_frame_unwind; + + return NULL; +} + + +void +sparc64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + set_gdbarch_pc_in_sigtramp (gdbarch, sparc_sol2_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc64_sol2_sigtramp_frame_sniffer); + + sparc64_init_abi (info, gdbarch); + + /* 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); + + /* ...which means that we need some special handling when doing + prologue analysis. */ + tdep->plt_entry_size = 16; + + /* Solaris has kernel-assisted single-stepping support. */ + set_gdbarch_software_single_step (gdbarch, NULL); +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc64_sol2_tdep (void); + +void +_initialize_sparc64_sol2_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_sparc, bfd_mach_sparc_v9, + GDB_OSABI_SOLARIS, sparc64_sol2_init_abi); +} diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index b605a1d1862..ced47a4edbe 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for UltraSPARC. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -27,6 +27,9 @@ #include "frame-unwind.h" #include "gdbcore.h" #include "gdbtypes.h" +#include "inferior.h" +#include "symtab.h" +#include "objfiles.h" #include "osabi.h" #include "regcache.h" #include "target.h" @@ -45,41 +48,6 @@ /* Please use the sparc32_-prefix for 32-bit specific code, the sparc64_-prefix for 64-bit specific code and the sparc_-prefix for code can handle both. */ - -/* The stack pointer is offset from the stack frame by a BIAS of 2047 - (0x7ff) for 64-bit code. BIAS is likely to be defined on SPARC - hosts, so undefine it first. */ -#undef BIAS -#define BIAS 2047 - -/* Macros to extract fields from SPARC instructions. */ -#define X_OP(i) (((i) >> 30) & 0x3) -#define X_A(i) (((i) >> 29) & 1) -#define X_COND(i) (((i) >> 25) & 0xf) -#define X_OP2(i) (((i) >> 22) & 0x7) -#define X_IMM22(i) ((i) & 0x3fffff) -#define X_OP3(i) (((i) >> 19) & 0x3f) -/* Sign extension macros. */ -#define X_DISP22(i) ((X_IMM22 (i) ^ 0x200000) - 0x200000) -#define X_DISP19(i) ((((i) & 0x7ffff) ^ 0x40000) - 0x40000) - -/* Fetch the instruction at PC. Instructions are always big-endian - even if the processor operates in little-endian mode. */ - -static unsigned long -sparc_fetch_instruction (CORE_ADDR pc) -{ - unsigned char buf[4]; - unsigned long insn; - int i; - - read_memory (pc, buf, sizeof (buf)); - - insn = 0; - for (i = 0; i < sizeof (buf); i++) - insn = (insn << 8) | buf[i]; - return insn; -} /* The functions on this page are intended to be used to classify function arguments. */ @@ -163,14 +131,6 @@ sparc64_structure_or_union_p (const struct type *type) return 0; } -/* UltraSPARC architecture specific information. */ - -struct gdbarch_tdep -{ - /* Offset of saved PC in jmp_buf. */ - int jb_pc_offset; -}; - /* Register information. */ struct sparc64_register_info @@ -283,8 +243,7 @@ static struct sparc64_register_info sparc64_register_info[] = }; /* Total number of registers. */ -#define SPARC64_NUM_REGS \ - (sizeof (sparc64_register_info) / sizeof (sparc64_register_info[0])) +#define SPARC64_NUM_REGS ARRAY_SIZE (sparc64_register_info) /* We provide the aliases %d0..%d62 and %q0..%q60 for the floating registers as "psuedo" registers. */ @@ -348,9 +307,7 @@ static struct sparc64_register_info sparc64_pseudo_register_info[] = }; /* Total number of pseudo registers. */ -#define SPARC64_NUM_PSEUDO_REGS \ - (sizeof (sparc64_pseudo_register_info) \ - / sizeof (sparc64_pseudo_register_info[0])) +#define SPARC64_NUM_PSEUDO_REGS ARRAY_SIZE (sparc64_pseudo_register_info) /* Return the name of register REGNUM. */ @@ -499,79 +456,8 @@ sparc64_pseudo_register_write (struct gdbarch *gdbarch, regcache_raw_write_unsigned (regcache, SPARC64_STATE_REGNUM, state); } } - -/* Use the program counter to determine the contents and size of a - breakpoint instruction. Return a pointer to a string of bytes that - encode a breakpoint instruction, store the length of the string in - *LEN and optionally adjust *PC to point to the correct memory - location for inserting the breakpoint. */ - -static const unsigned char * -sparc_breakpoint_from_pc (CORE_ADDR *pc, int *len) -{ - static unsigned char break_insn[] = { 0x91, 0xd0, 0x20, 0x01 }; - - *len = sizeof (break_insn); - return break_insn; -} -struct sparc64_frame_cache -{ - /* Base address. */ - CORE_ADDR base; - CORE_ADDR pc; - - /* Do we have a frame? */ - int frameless_p; -}; - -/* Allocate and initialize a frame cache. */ - -static struct sparc64_frame_cache * -sparc64_alloc_frame_cache (void) -{ - struct sparc64_frame_cache *cache; - int i; - - cache = FRAME_OBSTACK_ZALLOC (struct sparc64_frame_cache); - - /* Base address. */ - cache->base = 0; - cache->pc = 0; - - /* Frameless until proven otherwise. */ - cache->frameless_p = 1; - - return cache; -} - -static CORE_ADDR -sparc64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc, - struct sparc64_frame_cache *cache) -{ - unsigned long insn; - - if (current_pc <= pc) - return current_pc; - - /* Check whether the function starts with a SAVE instruction. */ - insn = sparc_fetch_instruction (pc); - if (X_OP (insn) == 2 && X_OP3 (insn) == 0x3c) - { - cache->frameless_p = 0; - return pc + 4; - } - - return pc; -} - -static CORE_ADDR -sparc64_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, SPARC64_PC_REGNUM); -} - /* Return PC of first real instruction of the function starting at START_PC. */ @@ -580,7 +466,7 @@ sparc64_skip_prologue (CORE_ADDR start_pc) { struct symtab_and_line sal; CORE_ADDR func_start, func_end; - struct sparc64_frame_cache cache; + struct sparc_frame_cache cache; /* This is the preferred method, find the end of the prologue by using the debugging information. */ @@ -593,50 +479,22 @@ sparc64_skip_prologue (CORE_ADDR start_pc) return sal.end; } - return sparc64_analyze_prologue (start_pc, 0xffffffffffffffffUL, &cache); + return sparc_analyze_prologue (start_pc, 0xffffffffffffffffULL, &cache); } /* Normal frames. */ -static struct sparc64_frame_cache * +static struct sparc_frame_cache * sparc64_frame_cache (struct frame_info *next_frame, void **this_cache) { - struct sparc64_frame_cache *cache; - - if (*this_cache) - return *this_cache; - - cache = sparc64_alloc_frame_cache (); - *this_cache = cache; - - /* In priciple, for normal frames, %fp (%i6) holds the frame - pointer, which holds the base address for the current stack - frame. */ - - cache->base = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM); - if (cache->base == 0) - return cache; - - cache->pc = frame_func_unwind (next_frame); - if (cache->pc != 0) - sparc64_analyze_prologue (cache->pc, frame_pc_unwind (next_frame), cache); - - if (cache->frameless_p) - { - /* We didn't find a valid frame, which means that CACHE->base - currently holds the frame pointer for our calling frame. */ - cache->base = frame_unwind_register_unsigned (next_frame, - SPARC_SP_REGNUM); - } - - return cache; + return sparc_frame_cache (next_frame, this_cache); } static void sparc64_frame_this_id (struct frame_info *next_frame, void **this_cache, struct frame_id *this_id) { - struct sparc64_frame_cache *cache = + struct sparc_frame_cache *cache = sparc64_frame_cache (next_frame, this_cache); /* This marks the outermost frame. */ @@ -652,7 +510,7 @@ sparc64_frame_prev_register (struct frame_info *next_frame, void **this_cache, enum lval_type *lvalp, CORE_ADDR *addrp, int *realnump, void *valuep) { - struct sparc64_frame_cache *cache = + struct sparc_frame_cache *cache = sparc64_frame_cache (next_frame, this_cache); if (regnum == SPARC64_PC_REGNUM || regnum == SPARC64_NPC_REGNUM) @@ -718,7 +576,7 @@ sparc64_frame_sniffer (struct frame_info *next_frame) static CORE_ADDR sparc64_frame_base_address (struct frame_info *next_frame, void **this_cache) { - struct sparc64_frame_cache *cache = + struct sparc_frame_cache *cache = sparc64_frame_cache (next_frame, this_cache); /* ??? Should we take BIAS into account here? */ @@ -732,15 +590,6 @@ static const struct frame_base sparc64_frame_base = sparc64_frame_base_address, sparc64_frame_base_address }; - -static struct frame_id -sparc_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - CORE_ADDR sp; - - sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM); - return frame_id_build (sp, frame_pc_unwind (next_frame)); -} /* Check whether TYPE must be 16-byte aligned. */ @@ -1193,19 +1042,6 @@ sparc64_store_return_value (struct type *type, struct regcache *regcache, } } -/* Extract from REGCACHE, which contains the (raw) register state, the - address in which a function should return its structure value, as a - CORE_ADDR. */ - -static CORE_ADDR -sparc_extract_struct_value_address (struct regcache *regcache) -{ - ULONGEST addr; - - regcache_cooked_read_unsigned (regcache, SPARC_O0_REGNUM, &addr); - return addr; -} - static int sparc64_use_struct_convention (int gcc_p, struct type *type) { @@ -1213,138 +1049,20 @@ sparc64_use_struct_convention (int gcc_p, struct type *type) registers. */ return (TYPE_LENGTH (type) > 32); } - -/* The SPARC Architecture doesn't have hardware single-step support, - and most operating systems don't implement it either, so we provide - software single-step mechanism. */ - -static CORE_ADDR -sparc_analyze_control_transfer (CORE_ADDR pc, CORE_ADDR *npc) -{ - unsigned long insn = sparc_fetch_instruction (pc); - int conditional_p = X_COND (insn) & 0x7; - int branch_p = 0; - long offset = 0; /* Must be signed for sign-extend. */ - - if (X_OP (insn) == 0 && X_OP2 (insn) == 3 && (insn & 0x1000000) == 0) - { - /* Branch on Integer Register with Prediction (BPr). */ - branch_p = 1; - conditional_p = 1; - } - else if (X_OP (insn) == 0 && X_OP2 (insn) == 6) - { - /* Branch on Floating-Point Condition Codes (FBfcc). */ - branch_p = 1; - offset = 4 * X_DISP22 (insn); - } - else if (X_OP (insn) == 0 && X_OP2 (insn) == 5) - { - /* Branch on Floating-Point Condition Codes with Prediction - (FBPfcc). */ - branch_p = 1; - offset = 4 * X_DISP19 (insn); - } - else if (X_OP (insn) == 0 && X_OP2 (insn) == 2) - { - /* Branch on Integer Condition Codes (Bicc). */ - branch_p = 1; - offset = 4 * X_DISP22 (insn); - } - else if (X_OP (insn) == 0 && X_OP2 (insn) == 1) - { - /* Branch on Integer Condition Codes with Prediction (BPcc). */ - branch_p = 1; - offset = 4 * X_DISP19 (insn); - } - - /* FIXME: Handle DONE and RETRY instructions. */ - - /* FIXME: Handle the Trap instruction. */ - - if (branch_p) - { - if (conditional_p) - { - /* For conditional branches, return nPC + 4 iff the annul - bit is 1. */ - return (X_A (insn) ? *npc + 4 : 0); - } - else - { - /* For unconditional branches, return the target if its - specified condition is "always" and return nPC + 4 if the - condition is "never". If the annul bit is 1, set *NPC to - zero. */ - if (X_COND (insn) == 0x0) - pc = *npc, offset = 4; - if (X_A (insn)) - *npc = 0; - - gdb_assert (offset != 0); - return pc + offset; - } - } - - return 0; -} void -sparc_software_single_step (enum target_signal sig, int insert_breakpoints_p) -{ - static CORE_ADDR npc, nnpc; - static char npc_save[4], nnpc_save[4]; - - if (insert_breakpoints_p) - { - CORE_ADDR pc; - - pc = sparc_address_from_register (SPARC64_PC_REGNUM); - npc = sparc_address_from_register (SPARC64_NPC_REGNUM); - - /* Analyze the instruction at PC. */ - nnpc = sparc_analyze_control_transfer (pc, &npc); - if (npc != 0) - target_insert_breakpoint (npc, npc_save); - if (nnpc != 0) - target_insert_breakpoint (nnpc, nnpc_save); - - /* Assert that we have set at least one breakpoint. */ - gdb_assert (npc != 0 || nnpc != 0); - } - else - { - if (npc != 0) - target_remove_breakpoint (npc, npc_save); - if (nnpc != 0) - target_remove_breakpoint (nnpc, nnpc_save); - - npc = 0; - nnpc = 0; - } -} - - -static struct gdbarch * -sparc64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +sparc64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - struct gdbarch_tdep *tdep; - struct gdbarch *gdbarch; + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - /* If there is already a candidate, use it. */ - arches = gdbarch_list_lookup_by_info (arches, &info); - if (arches != NULL) - return arches->gdbarch; - - /* Allocate space for the new architecture. */ - tdep = XMALLOC (struct gdbarch_tdep); - gdbarch = gdbarch_alloc (&info, tdep); + tdep->pc_regnum = SPARC64_PC_REGNUM; + tdep->npc_regnum = SPARC64_NPC_REGNUM; + /* This is what all the fuss is about. */ set_gdbarch_long_bit (gdbarch, 64); set_gdbarch_long_long_bit (gdbarch, 64); set_gdbarch_ptr_bit (gdbarch, 64); - set_gdbarch_long_double_bit (gdbarch, 128); set_gdbarch_num_regs (gdbarch, SPARC64_NUM_REGS); set_gdbarch_register_name (gdbarch, sparc64_register_name); @@ -1354,147 +1072,329 @@ sparc64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_pseudo_register_write (gdbarch, sparc64_pseudo_register_write); /* Register numbers of various important registers. */ - set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); /* %sp */ set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); /* %pc */ - set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); - set_gdbarch_fp0_regnum (gdbarch, SPARC_F0_REGNUM); /* %f0 */ /* Call dummy code. */ + set_gdbarch_call_dummy_location (gdbarch, AT_ENTRY_POINT); + set_gdbarch_push_dummy_code (gdbarch, NULL); set_gdbarch_push_dummy_call (gdbarch, sparc64_push_dummy_call); set_gdbarch_extract_return_value (gdbarch, sparc64_extract_return_value); set_gdbarch_store_return_value (gdbarch, sparc64_store_return_value); - set_gdbarch_extract_struct_value_address - (gdbarch, sparc_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, sparc64_use_struct_convention); + set_gdbarch_return_value_on_stack + (gdbarch, generic_return_value_on_stack_not); + set_gdbarch_stabs_argument_has_addr + (gdbarch, default_stabs_argument_has_addr); set_gdbarch_skip_prologue (gdbarch, sparc64_skip_prologue); - /* Stack grows downward. */ - set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - - set_gdbarch_breakpoint_from_pc (gdbarch, sparc_breakpoint_from_pc); - set_gdbarch_decr_pc_after_break (gdbarch, 0); - set_gdbarch_function_start_offset (gdbarch, 0); - - set_gdbarch_frame_args_skip (gdbarch, 8); - - set_gdbarch_print_insn (gdbarch, print_insn_sparc); - - set_gdbarch_software_single_step (gdbarch, sparc_software_single_step); - - set_gdbarch_unwind_dummy_id (gdbarch, sparc_unwind_dummy_id); - - set_gdbarch_unwind_pc (gdbarch, sparc64_unwind_pc); - + frame_unwind_append_sniffer (gdbarch, sparc64_frame_sniffer); frame_base_set_default (gdbarch, &sparc64_frame_base); +} + - /* Hook in ABI-specific overrides, if they have been registered. */ - gdbarch_init_osabi (info, gdbarch); +/* Helper functions for dealing with register sets. */ - frame_unwind_append_sniffer (gdbarch, sparc64_frame_sniffer); +#define TSTATE_CWP 0x000000000000001fULL +#define TSTATE_ICC 0x0000000f00000000ULL +#define TSTATE_XCC 0x000000f000000000ULL - return gdbarch; -} - -/* Helper functions for dealing with register windows. */ +#define PSR_S 0x00000080 +#define PSR_ICC 0x00f00000 +#define PSR_VERS 0x0f000000 +#define PSR_IMPL 0xf0000000 +#define PSR_V8PLUS 0xff000000 +#define PSR_XCC 0x000f0000 void -sparc_supply_rwindow (CORE_ADDR sp, int regnum) +sparc64_supply_gregset (const struct sparc_gregset *gregset, + struct regcache *regcache, + int regnum, const void *gregs) { - int offset = 0; - char buf[8]; + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + const char *regs = gregs; int i; - if (sp & 1) + if (sparc32) { - /* Registers are 64-bit. */ - sp += BIAS; + if (regnum == SPARC32_PSR_REGNUM || regnum == -1) + { + int offset = gregset->r_tstate_offset; + ULONGEST tstate, psr; + char buf[4]; + + tstate = extract_unsigned_integer (regs + offset, 8); + psr = ((tstate & TSTATE_CWP) | PSR_S | ((tstate & TSTATE_ICC) >> 12) + | ((tstate & TSTATE_XCC) >> 20) | PSR_V8PLUS); + store_unsigned_integer (buf, 4, psr); + regcache_raw_supply (regcache, SPARC32_PSR_REGNUM, buf); + } + + if (regnum == SPARC32_PC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_PC_REGNUM, + regs + gregset->r_pc_offset + 4); + + if (regnum == SPARC32_NPC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_NPC_REGNUM, + regs + gregset->r_npc_offset + 4); - for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + if (regnum == SPARC32_Y_REGNUM || regnum == -1) { - if (regnum == i || regnum == -1) - { - target_read_memory (sp + ((i - SPARC_L0_REGNUM) * 8), buf, 8); - supply_register (i, buf); - } + int offset = gregset->r_y_offset + 8 - gregset->r_y_size; + regcache_raw_supply (regcache, SPARC32_Y_REGNUM, regs + offset); } } else { - /* Registers are 32-bit. Toss any sign-extension of the stack - pointer. */ - sp &= 0xffffffffUL; + if (regnum == SPARC64_STATE_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC64_STATE_REGNUM, + regs + gregset->r_tstate_offset); - /* Clear out the top half of the temporary buffer, and put the - register value in the bottom half if we're in 64-bit mode. */ - if (gdbarch_ptr_bit (current_gdbarch) == 64) + if (regnum == SPARC64_PC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC64_PC_REGNUM, + regs + gregset->r_pc_offset); + + if (regnum == SPARC64_NPC_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC64_NPC_REGNUM, + regs + gregset->r_npc_offset); + + if (regnum == SPARC64_Y_REGNUM || regnum == -1) { - memset (buf, 0, 4); - offset = 4; + char buf[8]; + + memset (buf, 0, 8); + memcpy (buf + 8 - gregset->r_y_size, + regs + gregset->r_y_offset, gregset->r_y_size); + regcache_raw_supply (regcache, SPARC64_Y_REGNUM, buf); } - for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + if ((regnum == SPARC64_FPRS_REGNUM || regnum == -1) + && gregset->r_fprs_offset != -1) + regcache_raw_supply (regcache, SPARC64_FPRS_REGNUM, + regs + gregset->r_fprs_offset); + } + + if (regnum == SPARC_G0_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC_G0_REGNUM, NULL); + + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) + { + int offset = gregset->r_g1_offset; + + if (sparc32) + offset += 4; + + for (i = SPARC_G1_REGNUM; i <= SPARC_O7_REGNUM; i++) { if (regnum == i || regnum == -1) + regcache_raw_supply (regcache, i, regs + offset); + offset += 8; + } + } + + if ((regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) || regnum == -1) + { + /* Not all of the register set variants include Locals and + Inputs. For those that don't, we read them off the stack. */ + if (gregset->r_l0_offset == -1) + { + ULONGEST sp; + + regcache_cooked_read_unsigned (regcache, SPARC_SP_REGNUM, &sp); + sparc_supply_rwindow (regcache, sp, regnum); + } + else + { + int offset = gregset->r_l0_offset; + + if (sparc32) + offset += 4; + + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) { - target_read_memory (sp + ((i - SPARC_L0_REGNUM) * 4), - buf + offset, 4); - supply_register (i, buf); + if (regnum == i || regnum == -1) + regcache_raw_supply (regcache, i, regs + offset); + offset += 8; } } } } void -sparc_fill_rwindow (CORE_ADDR sp, int regnum) +sparc64_collect_gregset (const struct sparc_gregset *gregset, + const struct regcache *regcache, + int regnum, void *gregs) { - int offset = 0; - char buf[8]; + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + char *regs = gregs; int i; - if (sp & 1) + if (sparc32) { - /* Registers are 64-bit. */ - sp += BIAS; + if (regnum == SPARC32_PSR_REGNUM || regnum == -1) + { + int offset = gregset->r_tstate_offset; + ULONGEST tstate, psr; + char buf[8]; + + tstate = extract_unsigned_integer (regs + offset, 8); + regcache_raw_collect (regcache, SPARC32_PSR_REGNUM, buf); + psr = extract_unsigned_integer (buf, 4); + tstate |= (psr & PSR_ICC) << 12; + if ((psr & (PSR_VERS | PSR_IMPL)) == PSR_V8PLUS) + tstate |= (psr & PSR_XCC) << 20; + store_unsigned_integer (buf, 8, tstate); + memcpy (regs + offset, buf, 8); + } - for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + if (regnum == SPARC32_PC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_PC_REGNUM, + regs + gregset->r_pc_offset + 4); + + if (regnum == SPARC32_NPC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_NPC_REGNUM, + regs + gregset->r_npc_offset + 4); + + if (regnum == SPARC32_Y_REGNUM || regnum == -1) { - if (regnum == -1 || regnum == SPARC_SP_REGNUM || regnum == i) - { - regcache_collect (i, buf); - target_write_memory (sp + ((i - SPARC_L0_REGNUM) * 8), buf, 8); - } + int offset = gregset->r_y_offset + 8 - gregset->r_y_size; + regcache_raw_collect (regcache, SPARC32_Y_REGNUM, regs + offset); } } else { - /* Registers are 32-bit. Toss any sign-extension of the stack - pointer. */ - sp &= 0xffffffffUL; + if (regnum == SPARC64_STATE_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC64_STATE_REGNUM, + regs + gregset->r_tstate_offset); + + if (regnum == SPARC64_PC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC64_PC_REGNUM, + regs + gregset->r_pc_offset); - /* Only use the bottom half if we're in 64-bit mode. */ - if (gdbarch_ptr_bit (current_gdbarch) == 64) - offset = 4; + if (regnum == SPARC64_NPC_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC64_NPC_REGNUM, + regs + gregset->r_npc_offset); - for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) + if (regnum == SPARC64_Y_REGNUM || regnum == -1) { - if (regnum == -1 || regnum == SPARC_SP_REGNUM || regnum == i) + char buf[8]; + + regcache_raw_collect (regcache, SPARC64_Y_REGNUM, buf); + memcpy (regs + gregset->r_y_offset, + buf + 8 - gregset->r_y_size, gregset->r_y_size); + } + + if ((regnum == SPARC64_FPRS_REGNUM || regnum == -1) + && gregset->r_fprs_offset != -1) + regcache_raw_collect (regcache, SPARC64_FPRS_REGNUM, + regs + gregset->r_fprs_offset); + + } + + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) + { + int offset = gregset->r_g1_offset; + + if (sparc32) + offset += 4; + + /* %g0 is always zero. */ + for (i = SPARC_G1_REGNUM; i <= SPARC_O7_REGNUM; i++) + { + if (regnum == i || regnum == -1) + regcache_raw_collect (regcache, i, regs + offset); + offset += 8; + } + } + + if ((regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) || regnum == -1) + { + /* Not all of the register set variants include Locals and + Inputs. For those that don't, we read them off the stack. */ + if (gregset->r_l0_offset != -1) + { + int offset = gregset->r_l0_offset; + + if (sparc32) + offset += 4; + + for (i = SPARC_L0_REGNUM; i <= SPARC_I7_REGNUM; i++) { - regcache_collect (i, buf); - target_write_memory (sp + ((i - SPARC_L0_REGNUM) * 4), - buf + offset, 4); + if (regnum == i || regnum == -1) + regcache_raw_collect (regcache, i, regs + offset); + offset += 8; } } } } - -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_sparc64_tdep (void); +void +sparc64_supply_fpregset (struct regcache *regcache, + int regnum, const void *fpregs) +{ + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + const char *regs = fpregs; + int i; + + for (i = 0; i < 32; i++) + { + if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) + regcache_raw_supply (regcache, SPARC_F0_REGNUM + i, regs + (i * 4)); + } + + if (sparc32) + { + if (regnum == SPARC32_FSR_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC32_FSR_REGNUM, + regs + (32 * 4) + (16 * 8) + 4); + } + else + { + for (i = 0; i < 16; i++) + { + if (regnum == (SPARC64_F32_REGNUM + i) || regnum == -1) + regcache_raw_supply (regcache, SPARC64_F32_REGNUM + i, + regs + (32 * 4) + (i * 8)); + } + + if (regnum == SPARC64_FSR_REGNUM || regnum == -1) + regcache_raw_supply (regcache, SPARC64_FSR_REGNUM, + regs + (32 * 4) + (16 * 8)); + } +} void -_initialize_sparc64_tdep (void) +sparc64_collect_fpregset (const struct regcache *regcache, + int regnum, void *fpregs) { - register_gdbarch_init (bfd_arch_sparc, sparc64_gdbarch_init); + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + char *regs = fpregs; + int i; + + for (i = 0; i < 32; i++) + { + if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) + regcache_raw_collect (regcache, SPARC_F0_REGNUM + i, regs + (i * 4)); + } + + if (sparc32) + { + if (regnum == SPARC32_FSR_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC32_FSR_REGNUM, + regs + (32 * 4) + (16 * 8) + 4); + } + else + { + for (i = 0; i < 16; i++) + { + if (regnum == (SPARC64_F32_REGNUM + i) || regnum == -1) + regcache_raw_collect (regcache, SPARC64_F32_REGNUM + i, + regs + (32 * 4) + (i * 8)); + } + + if (regnum == SPARC64_FSR_REGNUM || regnum == -1) + regcache_raw_collect (regcache, SPARC64_FSR_REGNUM, + regs + (32 * 4) + (16 * 8)); + } } diff --git a/gdb/sparc64-tdep.h b/gdb/sparc64-tdep.h index e7b910d55fe..4a150d9970e 100644 --- a/gdb/sparc64-tdep.h +++ b/gdb/sparc64-tdep.h @@ -1,6 +1,6 @@ /* Target-dependent code for UltraSPARC. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -20,84 +20,94 @@ Boston, MA 02111-1307, USA. */ #ifndef SPARC64_TDEP_H -#define SPARC62_TDEP_H 1 +#define SPARC64_TDEP_H 1 -/* Register numbers of various important registers. */ +#include "sparc-tdep.h" -enum sparc_regnum -{ - SPARC_G0_REGNUM, /* %g0 */ - SPARC_G1_REGNUM, - SPARC_G2_REGNUM, - SPARC_G3_REGNUM, - SPARC_G4_REGNUM, - SPARC_G5_REGNUM, - SPARC_G6_REGNUM, - SPARC_G7_REGNUM, /* %g7 */ - SPARC_O0_REGNUM, /* %o0 */ - SPARC_O1_REGNUM, - SPARC_O2_REGNUM, - SPARC_O3_REGNUM, - SPARC_O4_REGNUM, - SPARC_O5_REGNUM, - SPARC_SP_REGNUM, /* %sp (%o6) */ - SPARC_O7_REGNUM, /* %o7 */ - SPARC_L0_REGNUM, /* %l0 */ - SPARC_L1_REGNUM, - SPARC_L2_REGNUM, - SPARC_L3_REGNUM, - SPARC_L4_REGNUM, - SPARC_L5_REGNUM, - SPARC_L6_REGNUM, - SPARC_L7_REGNUM, /* %l7 */ - SPARC_I0_REGNUM, /* %i0 */ - SPARC_I1_REGNUM, - SPARC_I2_REGNUM, - SPARC_I3_REGNUM, - SPARC_I4_REGNUM, - SPARC_I5_REGNUM, - SPARC_FP_REGNUM, /* %fp (%i6) */ - SPARC_I7_REGNUM, /* %i7 */ - SPARC_F0_REGNUM, /* %f0 */ - SPARC_F31_REGNUM = SPARC_F0_REGNUM + 31 /* %f31 */ -}; +/* The stack pointer is offset from the stack frame by a BIAS of 2047 + (0x7ff) for 64-bit code. BIAS is likely to be defined on SPARC + hosts, so undefine it first. */ +#undef BIAS +#define BIAS 2047 + +/* Register offsets for the general-purpose register set. */ + +/* UltraSPARC doesn't have %psr. */ +#define r_tstate_offset r_psr_offset + +/* UltraSPARC doesn't have %wim either. */ +#define r_fprs_offset r_wim_offset + +/* Register numbers of various important registers. */ enum sparc64_regnum { - SPARC64_F32_REGNUM = SPARC_F0_REGNUM + 32, /* %f32 */ - SPARC64_F62_REGNUM = SPARC64_F32_REGNUM + 15, /* %f62 */ + SPARC64_F32_REGNUM /* %f32 */ + = SPARC_F0_REGNUM + 32, + SPARC64_F62_REGNUM /* %f62 */ + = SPARC64_F32_REGNUM + 15, SPARC64_PC_REGNUM, /* %pc */ SPARC64_NPC_REGNUM, /* %npc */ SPARC64_STATE_REGNUM, SPARC64_FSR_REGNUM, /* %fsr */ SPARC64_FPRS_REGNUM, /* %fprs */ SPARC64_Y_REGNUM, /* %y */ - + /* Pseudo registers. */ SPARC64_CWP_REGNUM, /* %cwp */ SPARC64_PSTATE_REGNUM, /* %pstate */ SPARC64_ASI_REGNUM, /* %asi */ SPARC64_CCR_REGNUM, /* %ccr */ SPARC64_D0_REGNUM, /* %d0 */ - SPARC64_D10_REGNUM = SPARC64_D0_REGNUM + 5, /* %d10 */ - SPARC64_D30_REGNUM = SPARC64_D0_REGNUM + 15, /* %d30 */ - SPARC64_D32_REGNUM = SPARC64_D0_REGNUM + 16, /* %d32 */ - SPARC64_D62_REGNUM = SPARC64_D0_REGNUM + 31, /* %d62 */ + SPARC64_D10_REGNUM /* %d10 */ + = SPARC64_D0_REGNUM + 5, + SPARC64_D30_REGNUM /* %d30 */ + = SPARC64_D0_REGNUM + 15, + SPARC64_D32_REGNUM /* %d32 */ + = SPARC64_D0_REGNUM + 16, + SPARC64_D62_REGNUM /* %d62 */ + = SPARC64_D0_REGNUM + 31, SPARC64_Q0_REGNUM, /* %q0 */ - SPARC64_Q8_REGNUM = SPARC64_Q0_REGNUM + 2, /* %q8 */ - SPARC64_Q28_REGNUM = SPARC64_Q0_REGNUM + 7, /* %q28 */ - SPARC64_Q32_REGNUM = SPARC64_Q0_REGNUM + 8, /* %q32 */ - SPARC64_Q60_REGNUM = SPARC64_Q0_REGNUM + 15 /* %q60 */ + SPARC64_Q8_REGNUM /* %q8 */ + = SPARC64_Q0_REGNUM + 2, + SPARC64_Q28_REGNUM /* %q28 */ + = SPARC64_Q0_REGNUM + 7, + SPARC64_Q32_REGNUM /* %q32 */ + = SPARC64_Q0_REGNUM + 8, + SPARC64_Q60_REGNUM /* %q60 */ + = SPARC64_Q0_REGNUM + 15 }; -extern void sparc_supply_rwindow (CORE_ADDR sp, int regnum); -extern void sparc_fill_rwindow (CORE_ADDR sp, int regnum); +extern void sparc64_init_abi (struct gdbarch_info info, + struct gdbarch *gdbarch); + +extern void sparc64_supply_gregset (const struct sparc_gregset *gregset, + struct regcache *regcache, + int regnum, const void *gregs); +extern void sparc64_collect_gregset (const struct sparc_gregset *gregset, + const struct regcache *regcache, + int regnum, void *gregs); +extern void sparc64_supply_fpregset (struct regcache *regcache, + int regnum, const void *fpregs); +extern void sparc64_collect_fpregset (const struct regcache *regcache, + int regnum, void *fpregs); + +/* Functions and variables exported from sparc64-sol2-tdep.c. */ + +/* Register offsets for Solaris 2. */ +extern const struct sparc_gregset sparc64_sol2_gregset; + +extern void sparc64_sol2_init_abi (struct gdbarch_info info, + struct gdbarch *gdbarch); + +/* Variables exported from sparc64fbsd-tdep.c. */ + +/* Register offsets for FreeBSD/sparc64. */ +extern const struct sparc_gregset sparc64fbsd_gregset; -/* Functions exported from sparc64fbsd-tdep.c. */ +/* Variables exported from sparc64nbsd-tdep.c. */ -extern void sparc64fbsd_supply_reg (const char *regs, int regnum); -extern void sparc64fbsd_fill_reg (char *regs, int regnum); -extern void sparc64fbsd_supply_fpreg (const char *regs, int regnum); -extern void sparc64fbsd_fill_fpreg (char *regs, int regnum); +/* Register offsets for NetBSD/sparc64. */ +extern const struct sparc_gregset sparc64nbsd_gregset; #endif /* sparc64-tdep.h */ diff --git a/gdb/sparc64fbsd-nat.c b/gdb/sparc64fbsd-nat.c index 26c58d8d13b..09bf12a4c00 100644 --- a/gdb/sparc64fbsd-nat.c +++ b/gdb/sparc64fbsd-nat.c @@ -22,47 +22,7 @@ #include "defs.h" #include "sparc64-tdep.h" -#include "sparcbsd-nat.h" - -/* Determine whether `struct reg' contains register REGNUM. */ - -static int -sparc64fbsd_reg_supplies_p (int regnum) -{ - /* Integer registers. */ - if ((regnum >= SPARC_G0_REGNUM && regnum <= SPARC_G7_REGNUM) - || (regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) - || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_L7_REGNUM) - || (regnum >= SPARC_I0_REGNUM && regnum <= SPARC_I7_REGNUM)) - return 1; - - /* Control registers. */ - if (regnum == SPARC64_PC_REGNUM - || regnum == SPARC64_NPC_REGNUM - || regnum == SPARC64_STATE_REGNUM - || regnum == SPARC64_FPRS_REGNUM - || regnum == SPARC64_Y_REGNUM) - return 1; - - return 0; -} - -/* Determine whether `struct fpreg' contains register REGNUM. */ - -static int -sparc64fbsd_fpreg_supplies_p (int regnum) -{ - /* Floating-point registers. */ - if ((regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) - || (regnum >= SPARC64_F32_REGNUM && regnum <= SPARC64_F62_REGNUM)) - return 1; - - /* Control registers. */ - if (regnum == SPARC64_FSR_REGNUM) - return 1; - - return 0; -} +#include "sparc-nat.h" /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_sparc64fbsd_nat (void); @@ -70,11 +30,5 @@ void _initialize_sparc64fbsd_nat (void); void _initialize_sparc64fbsd_nat (void) { - sparcbsd_supply_reg = sparc64fbsd_supply_reg; - sparcbsd_fill_reg = sparc64fbsd_fill_reg; - sparcbsd_supply_fpreg = sparc64fbsd_supply_fpreg; - sparcbsd_fill_fpreg = sparc64fbsd_fill_fpreg; - - sparcbsd_reg_supplies_p = sparc64fbsd_reg_supplies_p; - sparcbsd_fpreg_supplies_p = sparc64fbsd_fpreg_supplies_p; + sparc_gregset = &sparc64fbsd_gregset; } diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c index 2b910c1b33d..14ecf9604f2 100644 --- a/gdb/sparc64fbsd-tdep.c +++ b/gdb/sparc64fbsd-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for FreeBSD/sparc64. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -20,168 +20,38 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include "frame.h" +#include "frame-unwind.h" #include "gdbcore.h" #include "osabi.h" #include "regcache.h" #include "target.h" +#include "trad-frame.h" +#include "gdb_assert.h" #include "gdb_string.h" #include "sparc64-tdep.h" /* From <machine/reg.h>. */ - -/* Offset of registers in `struct reg'. */ -int sparc64fbsd_r_global_offset = (0 * 8); -int sparc64fbsd_r_out_offset = (8 * 8); -int sparc64fbsd_r_fprs_offset = (16 * 8); -int sparc64fbsd_r_tnpc_offset = (24 * 8); -int sparc64fbsd_r_tpc_offset = (25 * 8); -int sparc64fbsd_r_tstate_offset = (26 * 8); -int sparc64fbsd_r_y_offset = (28 * 8); - -/* Size of `struct reg' and `struct fpreg'. */ -int sparc64fbsd_sizeof_struct_reg = 256; -int sparc64fbsd_sizeof_struct_fpreg = 272; - -void -sparc64fbsd_supply_reg (const char *regs, int regnum) -{ - char buf[8]; - int i; - - if (regnum == SPARC64_PC_REGNUM || regnum == -1) - supply_register (SPARC64_PC_REGNUM, regs + sparc64fbsd_r_tpc_offset); - - if (regnum == SPARC64_NPC_REGNUM || regnum == -1) - supply_register (SPARC64_NPC_REGNUM, regs + sparc64fbsd_r_tnpc_offset); - - if (regnum == SPARC64_STATE_REGNUM || regnum == -1) - supply_register (SPARC64_STATE_REGNUM, regs + sparc64fbsd_r_tstate_offset); - - if (regnum == SPARC64_FPRS_REGNUM || regnum == -1) - supply_register (SPARC64_FPRS_REGNUM, regs + sparc64fbsd_r_fprs_offset); - - if (regnum == SPARC64_Y_REGNUM || regnum == -1) - supply_register (SPARC64_Y_REGNUM, regs + sparc64fbsd_r_y_offset); - - if ((regnum >= SPARC_G0_REGNUM && regnum <= SPARC_G7_REGNUM) || regnum == -1) - { - if (regnum == SPARC_G0_REGNUM || regnum == -1) - supply_register (SPARC_G0_REGNUM, NULL); /* %g0 is always zero. */ - for (i = SPARC_G1_REGNUM; i <= SPARC_G7_REGNUM; i++) - { - if (regnum == i || regnum == -1) - supply_register (i, (regs + sparc64fbsd_r_global_offset - + ((i - SPARC_G0_REGNUM) * 8))); - } - } - - if ((regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) - { - for (i = SPARC_O0_REGNUM; i <= SPARC_O7_REGNUM; i++) - { - if (regnum == i || regnum == -1) - supply_register (i, (regs + sparc64fbsd_r_out_offset - + ((i - SPARC_O0_REGNUM) * 8))); - } - } - - /* Inputs and Locals are stored onto the stack by by the kernel. */ - if ((regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM) || regnum == -1) - { - ULONGEST sp; - - regcache_cooked_read_unsigned (current_regcache, SPARC_SP_REGNUM, &sp); - sparc_supply_rwindow (sp, regnum); - } -} - -void -sparc64fbsd_fill_reg (char *regs, int regnum) -{ - char buf[8]; - int i; - - if (regnum == SPARC64_PC_REGNUM || regnum == -1) - regcache_collect (SPARC64_PC_REGNUM, regs + sparc64fbsd_r_tpc_offset); - - if (regnum == SPARC64_NPC_REGNUM || regnum == -1) - regcache_collect (SPARC64_NPC_REGNUM, regs + sparc64fbsd_r_tnpc_offset); - - if (regnum == SPARC64_FPRS_REGNUM || regnum == -1) - regcache_collect (SPARC64_FPRS_REGNUM, regs + sparc64fbsd_r_fprs_offset); - - if (regnum == SPARC64_Y_REGNUM || regnum == -1) - regcache_collect (SPARC64_Y_REGNUM, regs + sparc64fbsd_r_y_offset); - - if ((regnum >= SPARC_G0_REGNUM && regnum <= SPARC_G7_REGNUM) || regnum == -1) - { - /* %g0 is always zero. */ - for (i = SPARC_G1_REGNUM; i <= SPARC_G7_REGNUM; i++) - { - if (regnum == i || regnum == -1) - regcache_collect (i, (regs + sparc64fbsd_r_global_offset - + ((i - SPARC_G0_REGNUM) * 8))); - } - } - - if ((regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) || regnum == -1) - { - for (i = SPARC_O0_REGNUM; i <= SPARC_O7_REGNUM; i++) - { - if (regnum == i || regnum == -1) - regcache_collect (i, (regs + sparc64fbsd_r_out_offset - + ((i - SPARC_O0_REGNUM) * 8))); - } - } - - /* Responsibility for the stack regs is pushed off onto the caller. */ -} - -void -sparc64fbsd_supply_fpreg (const char *fpregs, int regnum) -{ - int i; - - for (i = 0; i < 32; i++) - { - if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) - supply_register (SPARC_F0_REGNUM + i, fpregs + (i * 4)); - } - - for (i = 0; i < 16; i++) - { - if (regnum == (SPARC64_F32_REGNUM + i) || regnum == -1) - supply_register (SPARC64_F32_REGNUM + i, fpregs + (32 * 4) + (i * 8)); - } - - if (regnum == SPARC64_FSR_REGNUM || regnum == -1) - supply_register (SPARC64_FSR_REGNUM, fpregs + (32 * 4) + (16 * 8)); -} - -void -sparc64fbsd_fill_fpreg (char *fpregs, int regnum) +const struct sparc_gregset sparc64fbsd_gregset = { - int i; - - for (i = 0; i < 32; i++) - { - if (regnum == (SPARC_F0_REGNUM + i) || regnum == -1) - regcache_collect (SPARC_F0_REGNUM + i, fpregs + (i * 4)); - } - - for (i = 0; i < 16; i++) - { - if (regnum == (SPARC64_F32_REGNUM + i) || regnum == -1) - regcache_collect (SPARC64_F32_REGNUM + i, fpregs + (32 * 4) + (i * 8)); - } - - if (regnum == SPARC64_FSR_REGNUM || regnum == -1) - regcache_collect (SPARC64_FSR_REGNUM, fpregs + (32 * 4) + (16 * 8)); -} + 26 * 8, /* "tstate" */ + 25 * 8, /* %pc */ + 24 * 8, /* %npc */ + 28 * 8, /* %y */ + 16 * 8, /* %fprs */ + -1, + 1 * 8, /* %g1 */ + -1, /* %l0 */ + 8 /* sizeof (%y) */ +}; +/* Size of `struct reg' and `struct fpreg'. */ +static const int sparc64fbsd_sizeof_struct_reg = 256; +static const int sparc64fbsd_sizeof_struct_fpreg = 272; + static void fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, CORE_ADDR ignore) @@ -192,14 +62,15 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, if (core_reg_size != sparc64fbsd_sizeof_struct_reg) warning ("Wrong size register set in core file."); else - sparc64fbsd_supply_reg (core_reg_sect, -1); + sparc64_supply_gregset (&sparc64fbsd_gregset, current_regcache, + -1, core_reg_sect); break; case 2: /* Floating pointer registers */ if (core_reg_size != sparc64fbsd_sizeof_struct_fpreg) warning ("Wrong size FP register set in core file."); else - sparc64fbsd_supply_fpreg (core_reg_sect, -1); + sparc64_supply_fpregset (current_regcache, -1, core_reg_sect); break; default: @@ -218,10 +89,141 @@ static struct core_fns sparc64fbsd_core_fns = }; +/* Signal trampolines. */ + +static int +sparc64fbsd_pc_in_sigtramp (CORE_ADDR pc, char *name) +{ + return (name && strcmp (name, "__sigtramp") == 0); +} + +static struct sparc_frame_cache * +sparc64fbsd_sigtramp_frame_cache (struct frame_info *next_frame, + void **this_cache) +{ + struct sparc_frame_cache *cache; + CORE_ADDR addr, mcontext_addr, sp; + LONGEST fprs; + int regnum; + + if (*this_cache) + return *this_cache; + + cache = sparc_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); + + cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); + + /* The third argument is a pointer to an instance of `ucontext_t', + which has a member `uc_mcontext' that contains the saved + registers. */ + addr = frame_unwind_register_unsigned (next_frame, SPARC_O2_REGNUM); + mcontext_addr = addr + 64; + + /* The following registers travel in the `mc_local' slots of + `mcontext_t'. */ + addr = mcontext_addr + 16 * 8; + cache->saved_regs[SPARC64_FPRS_REGNUM].addr = addr + 0 * 8; + cache->saved_regs[SPARC64_FSR_REGNUM].addr = addr + 1 * 8; + + /* The following registers travel in the `mc_in' slots of + `mcontext_t'. */ + addr = mcontext_addr + 24 * 8; + cache->saved_regs[SPARC64_NPC_REGNUM].addr = addr + 0 * 8; + cache->saved_regs[SPARC64_PC_REGNUM].addr = addr + 1 * 8; + cache->saved_regs[SPARC64_STATE_REGNUM].addr = addr + 2 * 8; + cache->saved_regs[SPARC64_Y_REGNUM].addr = addr + 4 * 8; + + /* The `global' and `out' registers travel in the `mc_global' and + `mc_out' slots of `mcontext_t', except for %g0. Since %g0 is + always zero, keep the identity encoding. */ + for (regnum = SPARC_G1_REGNUM, addr = mcontext_addr + 8; + regnum <= SPARC_O7_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + + /* The `local' and `in' registers have been saved in the register + save area. */ + addr = cache->saved_regs[SPARC_SP_REGNUM].addr; + sp = get_frame_memory_unsigned (next_frame, addr, 8); + for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS; + regnum <= SPARC_I7_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + + /* The floating-point registers are only saved if the FEF bit in + %fprs has been set. */ + +#define FPRS_FEF (1 << 2) + + addr = cache->saved_regs[SPARC64_FPRS_REGNUM].addr; + fprs = get_frame_memory_unsigned (next_frame, addr, 8); + if (fprs & FPRS_FEF) + { + for (regnum = SPARC_F0_REGNUM, addr = mcontext_addr + 32 * 8; + regnum <= SPARC_F31_REGNUM; regnum++, addr += 4) + cache->saved_regs[regnum].addr = addr; + + for (regnum = SPARC64_F32_REGNUM; + regnum <= SPARC64_F62_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + } + + return cache; +} + +static void +sparc64fbsd_sigtramp_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc64fbsd_sigtramp_frame_cache (next_frame, this_cache); + + (*this_id) = frame_id_build (cache->base, cache->pc); +} + +static void +sparc64fbsd_sigtramp_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) +{ + struct sparc_frame_cache *cache = + sparc64fbsd_sigtramp_frame_cache (next_frame, this_cache); + + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} + +static const struct frame_unwind sparc64fbsd_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc64fbsd_sigtramp_frame_this_id, + sparc64fbsd_sigtramp_frame_prev_register +}; + +static const struct frame_unwind * +sparc64fbsd_sigtramp_frame_sniffer (struct frame_info *next_frame) +{ + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; + + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc64fbsd_pc_in_sigtramp (pc, name)) + return &sparc64fbsd_sigtramp_frame_unwind; + + return NULL; +} + + static void sparc64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - /* Nothing yet. */ + set_gdbarch_pc_in_sigtramp (gdbarch, sparc64fbsd_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc64fbsd_sigtramp_frame_sniffer); + + sparc64_init_abi (info, gdbarch); } /* Provide a prototype to silence -Wmissing-prototypes. */ diff --git a/gdb/sparc64nbsd-nat.c b/gdb/sparc64nbsd-nat.c index c68b96b6a73..91577039eb3 100644 --- a/gdb/sparc64nbsd-nat.c +++ b/gdb/sparc64nbsd-nat.c @@ -1,6 +1,6 @@ -/* Native-dependent code for UltraSPARC systems running NetBSD. - Copyright 2002, 2003 Free Software Foundation, Inc. - Contributed by Wasabi Systems, Inc. +/* Native-dependent code for NetBSD/sparc64. + + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -20,189 +20,120 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" -#include "inferior.h" -#include "regcache.h" -#include "sparc-tdep.h" -#include "sparcnbsd-tdep.h" +#include "sparc64-tdep.h" +#include "sparc-nat.h" -#include <sys/types.h> -#include <sys/ptrace.h> -#include <machine/reg.h> +/* NetBSD is different from the other OSes that support both SPARC and + UltraSPARC in that the result of ptrace(2) depends on whether the + traced process is 32-bit or 64-bit. */ -/* NOTE: We don't bother with any of the deferred_store nonsense; it - makes things a lot more complicated than they need to be. */ +static void +sparc64nbsd_supply_gregset (const struct sparc_gregset *gregset, + struct regcache *regcache, + int regnum, const void *gregs) +{ + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); -/* Determine if PT_GETREGS fetches this register. */ -static int -getregs_supplies (int regno) + if (sparc32) + sparc32_supply_gregset (&sparc32nbsd_gregset, regcache, regnum, gregs); + else + sparc64_supply_gregset (&sparc64nbsd_gregset, regcache, regnum, gregs); +} + +static void +sparc64nbsd_collect_gregset (const struct sparc_gregset *gregset, + const struct regcache *regcache, + int regnum, void *gregs) +{ + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + + if (sparc32) + sparc32_collect_gregset (&sparc32nbsd_gregset, regcache, regnum, gregs); + else + sparc64_collect_gregset (&sparc64nbsd_gregset, regcache, regnum, gregs); +} + +static void +sparc64nbsd_supply_fpregset (struct regcache *regcache, + int regnum, const void *fpregs) +{ + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + + if (sparc32) + sparc32_supply_fpregset (regcache, regnum, fpregs); + else + sparc64_supply_fpregset (regcache, regnum, fpregs); +} + +static void +sparc64nbsd_collect_fpregset (const struct regcache *regcache, + int regnum, void *fpregs) { - /* FIXME: PS_REGNUM for 32-bit code. */ - return (regno == TSTATE_REGNUM - || regno == PC_REGNUM - || regno == DEPRECATED_NPC_REGNUM - || regno == Y_REGNUM - || (regno >= G0_REGNUM && regno <= G7_REGNUM) - || (regno >= O0_REGNUM && regno <= O7_REGNUM) - /* stack regs (handled by sparcnbsd_supply_reg) */ - || (regno >= L0_REGNUM && regno <= I7_REGNUM)); + int sparc32 = (gdbarch_ptr_bit (current_gdbarch) == 32); + + if (sparc32) + sparc32_collect_fpregset (regcache, regnum, fpregs); + else + sparc64_collect_fpregset (regcache, regnum, fpregs); } -/* Determine if PT_GETFPREGS fetches this register. */ +/* Determine whether `gregset_t' contains register REGNUM. */ + static int -getfpregs_supplies (int regno) +sparc64nbsd_gregset_supplies_p (int regnum) { - return ((regno >= FP0_REGNUM && regno <= (FP0_REGNUM + 47)) - || regno == FPS_REGNUM); + if (gdbarch_ptr_bit (current_gdbarch) == 32) + return sparc32_gregset_supplies_p (regnum); + + /* Integer registers. */ + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM) + || (regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_L7_REGNUM) + || (regnum >= SPARC_I0_REGNUM && regnum <= SPARC_I7_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_PC_REGNUM + || regnum == SPARC64_NPC_REGNUM + || regnum == SPARC64_STATE_REGNUM + || regnum == SPARC64_Y_REGNUM) + return 1; + + return 0; } -void -fetch_inferior_registers (int regno) +/* Determine whether `fpregset_t' contains register REGNUM. */ + +static int +sparc64nbsd_fpregset_supplies_p (int regnum) { - /* We don't use deferred stores. */ - if (deferred_stores) - internal_error (__FILE__, __LINE__, - "fetch_inferior_registers: deferred stores pending"); - - if (regno == -1 || getregs_supplies (regno)) - { - union { - struct reg32 regs32; - struct reg64 regs64; - } regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_supply_reg32 ((char *) ®s.regs32, regno); - else - sparcnbsd_supply_reg64 ((char *) ®s.regs64, regno); - if (regno != -1) - return; - } - - if (regno == -1 || getfpregs_supplies (regno)) - { - union { - struct fpreg32 fpregs32; - struct fpreg64 fpregs64; - } fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point registers"); - - if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_supply_fpreg32 ((char *) &fpregs.fpregs32, regno); - else - sparcnbsd_supply_fpreg64 ((char *) &fpregs.fpregs64, regno); - if (regno != -1) - return; - } + if (gdbarch_ptr_bit (current_gdbarch) == 32) + return sparc32_fpregset_supplies_p (regnum); + + /* Floating-point registers. */ + if ((regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) + || (regnum >= SPARC64_F32_REGNUM && regnum <= SPARC64_F62_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_FSR_REGNUM) + return 1; + + return 0; } + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparcnbsd_nat (void); + void -store_inferior_registers (int regno) +_initialize_sparcnbsd_nat (void) { - /* We don't use deferred stores. */ - if (deferred_stores) - internal_error (__FILE__, __LINE__, - "store_inferior_registers: deferred stores pending"); - - if (regno == -1 || getregs_supplies (regno)) - { - union { - struct reg32 regs32; - struct reg64 regs64; - } regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_fill_reg32 ((char *) ®s.regs32, regno); - else - sparcnbsd_fill_reg64 ((char *) ®s.regs64, regno); - - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); - - /* Deal with the stack regs. */ - if (regno == -1 || regno == SP_REGNUM - || (regno >= L0_REGNUM && regno <= I7_REGNUM)) - { - CORE_ADDR sp = read_register (SP_REGNUM); - int i; - char buf[8]; - - if (sp & 1) - { - /* Registers are 64-bit. */ - sp += 2047; - - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == -1 || regno == SP_REGNUM || regno == i) - { - regcache_collect (i, buf); - target_write_memory (sp + ((i - L0_REGNUM) * 8), - buf, sizeof (buf)); - } - } - } - else - { - /* Registers are 32-bit. Toss any sign-extension of the stack - pointer. - - FIXME: We don't currently handle 32-bit code in a binary - that indicated LP64. Do we have to care about that? */ - if (gdbarch_ptr_bit (current_gdbarch) != 32) - internal_error - (__FILE__, __LINE__, - "store_inferior_registers: 32-bit code in 64-bit inferior"); - - sp &= 0xffffffffUL; - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == -1 || regno == SP_REGNUM || regno == i) - { - regcache_collect (i, buf); - target_write_memory (sp + ((i - L0_REGNUM) * 4), buf, 4); - } - } - } - } - - if (regno != -1) - return; - } - - if (regno == -1 || getfpregs_supplies (regno)) - { - union { - struct fpreg32 fpregs32; - struct fpreg64 fpregs64; - } fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point registers"); - - if (gdbarch_ptr_bit (current_gdbarch) == 32) - sparcnbsd_fill_fpreg32 ((char *) &fpregs.fpregs32, regno); - else - sparcnbsd_fill_fpreg64 ((char *) &fpregs.fpregs64, regno); - - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point registers"); - - if (regno != -1) - return; - } + sparc_supply_gregset = sparc64nbsd_supply_gregset; + sparc_collect_gregset = sparc64nbsd_collect_gregset; + sparc_supply_fpregset = sparc64nbsd_supply_fpregset; + sparc_collect_fpregset = sparc64nbsd_collect_fpregset; + sparc_gregset_supplies_p = sparc64nbsd_gregset_supplies_p; + sparc_fpregset_supplies_p = sparc64nbsd_fpregset_supplies_p; } diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c new file mode 100644 index 00000000000..3e657b49eda --- /dev/null +++ b/gdb/sparc64nbsd-tdep.c @@ -0,0 +1,258 @@ +/* Target-dependent code for NetBSD/sparc64. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. + Based on code contributed by Wasabi Systems, 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. */ + +#include "defs.h" +#include "frame.h" +#include "frame-unwind.h" +#include "gdbcore.h" +#include "osabi.h" +#include "regcache.h" +#include "symtab.h" +#include "solib-svr4.h" +#include "trad-frame.h" + +#include "gdb_assert.h" +#include "gdb_string.h" + +#include "sparc64-tdep.h" +#include "nbsd-tdep.h" + +/* From <machine/reg.h>. */ +const struct sparc_gregset sparc64nbsd_gregset = +{ + 0 * 8, /* "tstate" */ + 1 * 8, /* %pc */ + 2 * 8, /* %npc */ + 3 * 8, /* %y */ + -1, /* %fprs */ + -1, + 5 * 8, /* %g1 */ + -1, /* %l0 */ + 4 /* sizeof (%y) */ +}; + +/* Size of `struct reg' and `struct fpreg'. */ +static const int sparc64nbsd_sizeof_struct_reg = 160; +static const int sparc64nbsd_sizeof_struct_fpreg = 272; + +static void +fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, + CORE_ADDR ignore) +{ + switch (which) + { + case 0: /* Integer registers */ + if (core_reg_size != sparc64nbsd_sizeof_struct_reg) + warning ("Wrong size register set in core file."); + else + sparc64_supply_gregset (&sparc64nbsd_gregset, current_regcache, + -1, core_reg_sect); + break; + + case 2: /* Floating pointer registers */ + if (core_reg_size != sparc64nbsd_sizeof_struct_fpreg) + warning ("Wrong size FP register set in core file."); + else + sparc64_supply_fpregset (current_regcache, -1, core_reg_sect); + break; + + default: + /* Don't know what kind of register request this is; just ignore it. */ + break; + } +} + +static struct core_fns sparc64nbsd_core_fns = +{ + bfd_target_elf_flavour, /* core_flavour */ + default_check_format, /* check_format */ + default_core_sniffer, /* core_sniffer */ + 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. */ + +static const CORE_ADDR sparc64nbsd_sigtramp_start = 0xffffffffffffdee4ULL; +static const CORE_ADDR sparc64nbsd_sigtramp_end = 0xffffffffffffe000ULL; + +static int +sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name) +{ + if (pc >= sparc64nbsd_sigtramp_start && pc < sparc64nbsd_sigtramp_end) + return 1; + + return nbsd_pc_in_sigtramp (pc, name); +} + +static struct sparc_frame_cache * +sparc64nbsd_sigcontext_frame_cache (struct frame_info *next_frame, + void **this_cache) +{ + struct sparc_frame_cache *cache; + CORE_ADDR addr, sigcontext_addr, sp; + LONGEST fprs; + int regnum, delta; + + if (*this_cache) + return *this_cache; + + cache = sparc_frame_cache (next_frame, this_cache); + gdb_assert (cache == *this_cache); + + /* 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. */ + + /* 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 = sparc64nbsd_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 + BIAS + 128 + 8; + + cache->saved_regs[SPARC_SP_REGNUM].addr = sigcontext_addr + 8; + cache->saved_regs[SPARC64_PC_REGNUM].addr = sigcontext_addr + 16; + cache->saved_regs[SPARC64_NPC_REGNUM].addr = sigcontext_addr + 24; + cache->saved_regs[SPARC64_STATE_REGNUM].addr = sigcontext_addr + 32; + cache->saved_regs[SPARC_G1_REGNUM].addr = sigcontext_addr + 40; + cache->saved_regs[SPARC_O0_REGNUM].addr = sigcontext_addr + 48; + + /* 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[SPARC64_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; + sp = get_frame_memory_unsigned (next_frame, addr, 8); + for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS; + regnum <= SPARC_I7_REGNUM; regnum++, addr += 8) + cache->saved_regs[regnum].addr = addr; + + /* TODO: Handle the floating-point registers. */ + + return cache; +} + +static void +sparc64nbsd_sigcontext_frame_this_id (struct frame_info *next_frame, + void **this_cache, + struct frame_id *this_id) +{ + struct sparc_frame_cache *cache = + sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache); + + (*this_id) = frame_id_build (cache->base, cache->pc); +} + +static void +sparc64nbsd_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) +{ + struct sparc_frame_cache *cache = + sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache); + + trad_frame_prev_register (next_frame, cache->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); +} + +static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind = +{ + SIGTRAMP_FRAME, + sparc64nbsd_sigcontext_frame_this_id, + sparc64nbsd_sigcontext_frame_prev_register +}; + +static const struct frame_unwind * +sparc64nbsd_sigtramp_frame_sniffer (struct frame_info *next_frame) +{ + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; + + find_pc_partial_function (pc, &name, NULL, NULL); + if (sparc64nbsd_pc_in_sigtramp (pc, name)) + { + if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21)) + return &sparc64nbsd_sigcontext_frame_unwind; + } + + return NULL; +} + + +static void +sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + set_gdbarch_pc_in_sigtramp (gdbarch, sparc64nbsd_pc_in_sigtramp); + frame_unwind_append_sniffer (gdbarch, sparc64nbsd_sigtramp_frame_sniffer); + + sparc64_init_abi (info, gdbarch); + + set_solib_svr4_fetch_link_map_offsets + (gdbarch, nbsd_lp64_solib_svr4_fetch_link_map_offsets); +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc64nbsd_tdep (void); + +void +_initialize_sparc64nbsd_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_sparc, bfd_mach_sparc_v9, + GDB_OSABI_NETBSD_ELF, sparc64nbsd_init_abi); + + add_core_fns (&sparc64nbsd_core_fns); +} diff --git a/gdb/sparcbsd-nat.c b/gdb/sparcbsd-nat.c deleted file mode 100644 index 8ab95375d08..00000000000 --- a/gdb/sparcbsd-nat.c +++ /dev/null @@ -1,126 +0,0 @@ -/* Native-dependent code for SPARC BSD's. - - Copyright 2002, 2003 Free Software Foundation, Inc. - Based on code contributed by Wasabi Systems, 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#include "defs.h" -#include "inferior.h" -#include "regcache.h" - -/* FIXME: Should be changed to sparc-tdep.h when the old code is gone. */ -#include "sparc64-tdep.h" -#include "sparcbsd-nat.h" - -#include <sys/types.h> -#include <sys/ptrace.h> -#include <machine/reg.h> - -/* Functions translating between `struct reg' and `struct fpreg' and - GDB's register cache. */ -void (*sparcbsd_supply_reg)(const char *, int); -void (*sparcbsd_fill_reg)(char *, int); -void (*sparcbsd_supply_fpreg)(const char *, int); -void (*sparcbsd_fill_fpreg)(char *, int); - -/* Functions indication whether `struct reg' or `struct fpreg' provides - a certain register. */ -int (*sparcbsd_reg_supplies_p)(int); -int (*sparcbsd_fpreg_supplies_p)(int); - -void -fetch_inferior_registers (int regnum) -{ - if (regnum == -1 || sparcbsd_reg_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - sparcbsd_supply_reg ((char *) ®s, regnum); - if (regnum != -1) - return; - } - - if (regnum == -1 || sparcbsd_fpreg_supplies_p (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating-point registers"); - - sparcbsd_supply_fpreg ((char *) &fpregs, regnum); - if (regnum != -1) - return; - } -} - -void -store_inferior_registers (int regnum) -{ - if (regnum == -1 || sparcbsd_reg_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - sparcbsd_fill_reg ((char *) ®s, regnum); - - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); - - /* Deal with the stack regs. */ - if (regnum == -1 || regnum == SPARC_SP_REGNUM - || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM)) - { - ULONGEST sp; - - regcache_cooked_read_unsigned (current_regcache, - SPARC_SP_REGNUM, &sp); - sparc_fill_rwindow (sp, regnum); - } - - if (regnum != -1) - return; - } - - if (regnum == -1 || sparcbsd_fpreg_supplies_p (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating-point registers"); - - sparcbsd_fill_fpreg ((char *) &fpregs, regnum); - - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating-point registers"); - - if (regnum != -1) - return; - } -} diff --git a/gdb/sparcnbsd-nat.c b/gdb/sparcnbsd-nat.c index ef52746deae..9038ea334b6 100644 --- a/gdb/sparcnbsd-nat.c +++ b/gdb/sparcnbsd-nat.c @@ -1,6 +1,6 @@ -/* Native-dependent code for SPARC systems running NetBSD. - Copyright 2002, 2003 Free Software Foundation, Inc. - Contributed by Wasabi Systems, Inc. +/* Native-dependent code for NetBSD/sparc. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -20,136 +20,15 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" -#include "inferior.h" -#include "regcache.h" #include "sparc-tdep.h" -#include "sparcnbsd-tdep.h" - -#include <sys/types.h> -#include <sys/ptrace.h> -#include <machine/reg.h> - -/* NOTE: We don't bother with any of the deferred_store nonsense; it - makes things a lot more complicated than they need to be. */ - -/* Determine if PT_GETREGS fetches this register. */ -static int -getregs_supplies (int regno) -{ - return (regno == PS_REGNUM - || regno == PC_REGNUM - || regno == DEPRECATED_NPC_REGNUM - || regno == Y_REGNUM - || (regno >= G0_REGNUM && regno <= G7_REGNUM) - || (regno >= O0_REGNUM && regno <= O7_REGNUM) - /* stack regs (handled by sparcnbsd_supply_reg) */ - || (regno >= L0_REGNUM && regno <= I7_REGNUM)); -} +#include "sparc-nat.h" -/* Determine if PT_GETFPREGS fetches this register. */ -static int -getfpregs_supplies (int regno) -{ - return ((regno >= FP0_REGNUM && regno <= (FP0_REGNUM + 31)) - || regno == FPS_REGNUM); -} +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparcnbsd_nat (void); void -fetch_inferior_registers (int regno) +_initialize_sparcnbsd_nat (void) { - /* We don't use deferred stores. */ - if (deferred_stores) - internal_error (__FILE__, __LINE__, - "fetch_inferior_registers: deferred stores pending"); - - if (regno == -1 || getregs_supplies (regno)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - sparcnbsd_supply_reg32 ((char *) ®s, regno); - if (regno != -1) - return; - } - - if (regno == -1 || getfpregs_supplies (regno)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point registers"); - - sparcnbsd_supply_fpreg32 ((char *) &fpregs, regno); - if (regno != -1) - return; - } -} - -void -store_inferior_registers (int regno) -{ - /* We don't use deferred stores. */ - if (deferred_stores) - internal_error (__FILE__, __LINE__, - "store_inferior_registers: deferred stores pending"); - - if (regno == -1 || getregs_supplies (regno)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - sparcnbsd_fill_reg32 ((char *) ®s, regno); - - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); - - /* Deal with the stack regs. */ - if (regno == -1 || regno == SP_REGNUM - || (regno >= L0_REGNUM && regno <= I7_REGNUM)) - { - CORE_ADDR sp = read_register (SP_REGNUM); - int i; - char buf[4]; - - for (i = L0_REGNUM; i <= I7_REGNUM; i++) - { - if (regno == -1 || regno == SP_REGNUM || regno == i) - { - regcache_collect (i, buf); - target_write_memory (sp + ((i - L0_REGNUM) * 4), - buf, sizeof (buf)); - } - } - } - - if (regno != -1) - return; - } - - if (regno == -1 || getfpregs_supplies (regno)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point registers"); - - sparcnbsd_fill_fpreg32 ((char *) &fpregs, regno); - - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point registers"); - - if (regno != -1) - return; - } + sparc_gregset = &sparc32nbsd_gregset; } 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); diff --git a/gdb/sparcnbsd-tdep.h b/gdb/sparcnbsd-tdep.h deleted file mode 100644 index bad2d653c8e..00000000000 --- a/gdb/sparcnbsd-tdep.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Common target dependent code for GDB on SPARC systems running NetBSD. - Copyright 2002 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -#ifndef SPARCNBSD_TDEP_H -#define SPARCNBSD_TDEP_H - -void sparcnbsd_supply_reg32 (char *, int); -void sparcnbsd_supply_reg64 (char *, int); -void sparcnbsd_fill_reg32 (char *, int); -void sparcnbsd_fill_reg64 (char *, int); - -void sparcnbsd_supply_fpreg32 (char *, int); -void sparcnbsd_supply_fpreg64 (char *, int); -void sparcnbsd_fill_fpreg32 (char *, int); -void sparcnbsd_fill_fpreg64 (char *, int); - -#endif /* SPARCNBSD_TDEP_H */ |