diff options
author | Mark Kettenis <kettenis@gnu.org> | 2003-05-31 08:15:38 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@gnu.org> | 2003-05-31 08:15:38 +0000 |
commit | c4f35dd8e1037d2a8e1aa11894cb67de96279bfa (patch) | |
tree | fde4b39a640ec5c24ade4ec9c302e2425b305aed /gdb/config | |
parent | f2c822e386797796f5f0436c86d2d08baf61e22a (diff) | |
download | fsf-binutils-gdb-c4f35dd8e1037d2a8e1aa11894cb67de96279bfa.zip fsf-binutils-gdb-c4f35dd8e1037d2a8e1aa11894cb67de96279bfa.tar.gz fsf-binutils-gdb-c4f35dd8e1037d2a8e1aa11894cb67de96279bfa.tar.bz2 |
* x86-64-tdep.h (x86_64_num_regs, x86_64_num_gregs): Remove
variable declarations.
(x86_64_register_number, x86_64_register_name): Remove prototypes.
(x86_64_linux_frame_saved_pc, x86_64_linux+saved_pc_after_call,
x86_64_linux_in_sigtramp, x86_64_linux_frame_chain,
x86_64_init_frame_pc, x86_64_init_frame_pc,
x86_64_function_has_prologue): Remove prototypes.
(X86_64_NUM_GREGS): New define.
(x86_64_supply_fxsave, x86_64_fill_fxsave): New prototypes.
* x86-64-tdep.c: Don't include "dwarf2cfi.h". Include
"dummy_frame.h", "frame.h", "frame-base.h", "frame-unwind.h".
(RAX_REGNUM, RDX_REGNUM, RDI_REGNUM, EFLAGS_REGNUM, ST0_REGNUM,
XMM1_REGNUM): Remove defines.
(X86_64_RAX_REGNUM, X86_64_RDX_REGNUM, X86_64_RDI_REGNUM,
X86_64_RBP_REGNUM, X86_64_RSP_REGNUM, X86_64_RIP_REGNUM,
X86_64_EFLAGS_REGNUM, X86_64_ST0_REGNUM, X86_64_XMM0_REGNUM,
X86_64_XMM1_REGNUM): New defines.
(struct x86_64_register_info): Renamed from `struct
register_info'. Remove `size' member.
(x86_64_register_info_table): Remove variable.
(x86_64_register_info): New variable.
(X86_64_NUM_REGS): New define.
(X86_64_NUM_GREGS): Remove define.
(x86_64_num_regs, x86_64_num_gregs): Remove variables.
(x86_64_dwarf2gdb_regno_map, x86_64_dwarf2gdb_regno_map_length):
Remove variables.
(x86_54_dwarf2_reg_to_regnum): Remove function.
(x86_64_dwarf_regmap, x86_64_dwarf_regmap_len): New variables.
(x86_64_dwarf_reg_to_regnum): New function.
(x86_64_register_name): Rewrite.
(x86_64_register_raw_size): Remove function.
(x86_64_register_byte_table): Remove variable.
(x86_64_register_byte): Remove function.
(x86_64_register_virtual_type): Remove function.
(x86_64_register_type): New function.
(x86_64_register_convertible, x86_64_register_convert_to_virtual,
x86_64_register_convert_to_raw): Remove functions.
(x86_64_push_return_address, x86_64_pop_frame): Remove functon.
(x86_64_use_struct_convention): Make static. Adjust for renamed
defines.
(x86_64_frame_init_saved_regs): Remove function.
(x86_64_push_arguments): Make static. Change to accept a regcache
as argument.
(x86_64_store_return_value, x86_64_extract_return_value): Make
static. Rewrite based on i386 counterparts.
(x86_64_push_dummy_call): New function.
(X86_64_NUM_SAVED_REGS): New define.
(x86_64_register_number): Remove function.
(x86_64_store_struct_return): Remove function.
(x86_64_frameless_function_invocation,
x86_64_function_has_prologue): Remove functions.
(PROLOG_BUFSIZE): Remove define.
(struct x86_64_frame_cache): New structure.
(x86_64_alloc_frame_cache, x86_64_analyze_prologue,
x86_64_frame_cache, x86_64_frame_this_id,
x86_64_frame_prev_register, x86_64_frame_p,
x86_64_sigtramp_frame_cache, x86_64_sigtramp_frame_this_id,
x86_64_sigtramp_frame_prev_register, x86_sigtramp_frame_p): New
functions.
(x86_64_frame_unwind, x86_64_sigtramp_frame_unwind): New
variables.
(x86_64_skip_prologue): Rewrite in terms of
x86_64_analyze_prologue.
(x86_64_frame_base_address): New function.
(x86_64_frame_base): New variable.
(x86_64_save_dummy_frame_tos, x86_64_unwind_dummy_id): Rewrite.
(x86_64_init_abi): Set register_type and push_dummy_call. Don't
set deprecated_fp_regnum, deprecated_register_size,
deprecated_register_bytes, register_raw_size, register_byte,
register_virtual_type, register_convertiable,
register_convert_to_virtual, convert_to_raw,
deprecated_get_saved_register, deprecated_target_read_fp,
deprecated_push_arguments, deprecated_push_return_address,
deprecated_pop_frame, deprecated_store_struct_return,
deprecated_frame_init_saved_regs, deprecated_frame_chain,
frameless_function_invocation, deprecated_frame_saved_pc,
deprecated_saved_pc_after_call, frame_num_args, pc_in_sigtramp,
dwarf2_build_frame_info, deprecated_init_extra_frame_info,
deprecated_init_frame_pc and virtual_frame_pointer. Call
frame_unwind_append_predicate to register x86_64_sigtramp_frame_p
and x86_64_frame_p. Call frame_base_set_default to register
x86_64_frame_base.
(I387_FISEG_REGNUM, I387_FOSEG_REGNUM): New defines.
(x86_64_supply_fxsave, x86_64_fill_fxsave): New functions.
(_initialize_x86_64_tdep): Remove function.
* x86-64-linux-tdep.c: Don't include "dwarf2cfi.h".
(LINUX_SIGINFO_SIZE, LINUX_UCONTEXT_SIGCONTEXT_OFFSET,
LINUX_SIGCONTEXT_PC_OFFSET, LINUX_SIGCONTEXT_FP_OFFSET): Don't
define.
(X86_64_LINUX_UCONTEXT_SIGCONTEXT_OFFSET): Define.
(x86_64_linux_sigcontext_addr): Rewrite.
(x86_64_linux_sigtramp_saved_pc, x86_64_linux_saved_pc_after_call,
x86_64_linux_frame_saved_pc): Remove functions.
(x86_64_linux_pc_in_sigtramp): Renamed from
x86_64_linux_in_sigtramp. Try harder to recognize a signal
trampoline.
(x86_64_linux_frame_chain, x86_64_init_frame_pc):
Remove_functions.
(x86_64_linux_init_abi): Set pc_in_sigtramp. Initialize
TDEP->sigcontext_addr, TDEP->sc_pc_offset and TDEP->sc_sp_offset.
* x86-64-linux-nat.c: Sync with i386-linux-tdep.c.
(x86_64_regmap): Rename to regmap.
(GETREGS_SUPPLIES): Use X86_64_NUM_GREGS instead of
x86_64_num_gregs.
(supply_gregset, fill_gregset): Likewise. Use regmap instead of
x86_64_regmap.
(x86_64_fxsave_offset): Remove function.
(supply_fpregset): Simply call x86_64_supply_fxsave.
(fill_fpregset): Simply call x86_64_fill_fxsave.
(fetch_inferior_registers, store_inferior_registers): Avoid
asignment in if-statement.
(LINUX_SYSCALL_LEN, LINUX_SYSCALL_REGNUM, SYS_Sigreturn,
SYS_rt_sigreturn, LINUX_SIGCONTEXT_EFLAGS_OFFSET,
LINUX_UCONTEXT_SIGCONTEXT_OFFSET): Remove defines.
(fetch_core_registers): Remove function.
(linux_elf_core_fns): Remove.
(offsetoff): Don't define.
(_initialize_x86_64_linux_nat, kernel_u_size): Remove functions.
* config/i386/x86-64linux.mt (TDEPFILES): Add i386-linux-tdep.o.
* config/i386/x86-64linux.mh (NATDEPFILES): Remove core-aout.o,
add core-regset.o.
* config/i386/nm-x86-64linux.h: Use NM_X86_64_LINUX_H for
protection against multiple includes instead of NM_X86_64_h. Add
various comments. Include "config/nm-linux.h". Don't include
<signal.h>.
(REGISTER_U_ADDR, KERNEL_U_SIZE, U_REGS_OFFSET, KERN_U_ADDR,
GET_THREAD_SIGNALS): Remove defines.
(x86_64_register_u_addr, kernel_u_size,
lin_thread_get_thread_signals): Remove prototypes.
(PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Define to `long'.
[HAVE_LINK_H]: Don't include "solib.h".
[HAVE_LINK_H] (SVR4_SHARED_LIBS): Remove define.
* config/i386/tm-x86-64linux.h: Fix comments.
* Makefile.in (x86-64-linux-nat.o, x86_64-linux-tdep.o,
x86-64-tdep.o): Update dependencies.
Diffstat (limited to 'gdb/config')
-rw-r--r-- | gdb/config/i386/nm-x86-64linux.h | 54 | ||||
-rw-r--r-- | gdb/config/i386/tm-x86-64linux.h | 10 | ||||
-rw-r--r-- | gdb/config/i386/x86-64linux.mh | 7 | ||||
-rw-r--r-- | gdb/config/i386/x86-64linux.mt | 4 |
4 files changed, 27 insertions, 48 deletions
diff --git a/gdb/config/i386/nm-x86-64linux.h b/gdb/config/i386/nm-x86-64linux.h index 4430fcb..4df2f5d 100644 --- a/gdb/config/i386/nm-x86-64linux.h +++ b/gdb/config/i386/nm-x86-64linux.h @@ -1,7 +1,8 @@ /* Native support for GNU/Linux x86-64. - Copyright 2001, 2002 Free Software Foundation, Inc. Contributed by - Jiri Smid, SuSE Labs. + Copyright 2001, 2002, 2003 Free Software Foundation, Inc. + + Contributed by Jiri Smid, SuSE Labs. This file is part of GDB. @@ -20,15 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef NM_X86_64_H -#define NM_X86_64_H - -#include "config/nm-linux.h" +#ifndef NM_X86_64_LINUX_H +#define NM_X86_64_LINUX_H +/* GNU/Linux supports the i386 hardware debugging registers. */ #define I386_USE_GENERIC_WATCHPOINTS + #include "i386/nm-i386.h" +#include "config/nm-linux.h" -/* Support for 8-byte wide hw watchpoints. */ +/* Support for 8-byte wide hardware watchpoints. */ #define TARGET_HAS_DR_LEN_8 1 /* Provide access to the i386 hardware debugging registers. */ @@ -50,41 +52,17 @@ extern unsigned long x86_64_linux_dr_get_status (void); x86_64_linux_dr_get_status () -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = x86_64_register_u_addr ((blockend),(regno)); -CORE_ADDR x86_64_register_u_addr (CORE_ADDR, int); - -/* Return the size of the user struct. */ -#define KERNEL_U_SIZE kernel_u_size() -extern int kernel_u_size (void); - -/* Offset of the registers within the user area. */ -#define U_REGS_OFFSET 0 - -/* 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 PTRACE_ARG3_TYPE void* -#define PTRACE_XFER_TYPE unsigned long - - -/* We define this if link.h is available, because with ELF we use SVR4 style - shared libraries. */ +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE long -#ifdef HAVE_LINK_H -#define SVR4_SHARED_LIBS -#include "solib.h" /* Support for shared libraries. */ -#endif +/* 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 + +/* FIXME: kettenis/20030416: Why? */ #undef PREPARE_TO_PROCEED -#include <signal.h> - -extern void lin_thread_get_thread_signals (sigset_t * mask); -#define GET_THREAD_SIGNALS(mask) lin_thread_get_thread_signals (mask) - -#endif /* NM_X86_64.h */ +#endif /* NM_X86_64_LINUX_H */ diff --git a/gdb/config/i386/tm-x86-64linux.h b/gdb/config/i386/tm-x86-64linux.h index 11eea93..4c16766 100644 --- a/gdb/config/i386/tm-x86-64linux.h +++ b/gdb/config/i386/tm-x86-64linux.h @@ -1,6 +1,6 @@ /* Definitions to target GDB to GNU/Linux on x86-64. - Copyright 2002 Free Software Foundation, Inc. + Copyright 2002, 2003 Free Software Foundation, Inc. Contributed by Michal Ludvig, SuSE Labs. @@ -25,10 +25,10 @@ #define TM_X86_64LINUX_H /* We define SVR4_SHARED_LIBS unconditionally, on the assumption that - * link.h is available on all linux platforms. For I386 and SH3/4, - * we hard-code the information rather than use link.h anyway (for - * the benefit of cross-debugging). We may move to doing that for - * other architectures as well. */ + link.h is available on all linux platforms. For I386 and SH3/4, we + hard-code the information rather than use link.h anyway (for the + benefit of cross-debugging). We may move to doing that for other + architectures as well. */ #define SVR4_SHARED_LIBS #include "solib.h" /* Support for shared libraries. */ diff --git a/gdb/config/i386/x86-64linux.mh b/gdb/config/i386/x86-64linux.mh index 7c221eb..895d1fb 100644 --- a/gdb/config/i386/x86-64linux.mh +++ b/gdb/config/i386/x86-64linux.mh @@ -4,8 +4,9 @@ XM_FILE= xm-i386.h NAT_FILE= nm-x86-64linux.h NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \ - core-aout.o i386-nat.o x86-64-linux-nat.o \ - proc-service.o thread-db.o lin-lwp.o \ - linux-proc.o gcore.o + core-regset.o i386-nat.o x86-64-linux-nat.o \ + proc-service.o thread-db.o lin-lwp.o linux-proc.o gcore.o +# The dynamically loaded libthread_db needs access to symbols in the +# gdb executable. LOADLIBES = -ldl -rdynamic diff --git a/gdb/config/i386/x86-64linux.mt b/gdb/config/i386/x86-64linux.mt index d0ffb34..d448452 100644 --- a/gdb/config/i386/x86-64linux.mt +++ b/gdb/config/i386/x86-64linux.mt @@ -1,6 +1,6 @@ # Target: AMD x86-64 running GNU/Linux -TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o dwarf2cfi.o \ - i386-tdep.o i387-tdep.o \ +TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o \ + i386-tdep.o i387-tdep.o i386-linux-tdep.o \ solib.o solib-svr4.o solib-legacy.o GDB_MULTI_ARCH=GDB_MULTI_ARCH_TM |