* amd64-linux-tdep.h: Remove file.
* amd64-linux-tdep.c: Don't include "inferior.h" and "amd64-linux-tdep.h". Include "frame.h" and "solib-svr4.h". (USER_R15, USER_R14, USER_R13, USER_R12, USER_RBP, USER_RBX) (USER_R11, USER_R10, USER_R9, USER_R8, USER_RAX, USER_RCX) (USER_RDX, USER_RSI, USER_RDI, USER_RIP, USER_CS, USER_EFLAGS) (USER_RSP, USER_SS, USER_DS, USER_ES, USER_FS, USER_GS): Remove macros. (user_to_gdb_regmap): Remove variable. (amd64_linux_gregset_reg_offset): New variable. (amd64_core_fns): Remove variable. (fetch_core_registers): Remove function. (amd64_linux_supply_gregset, amd64_linux_fill_gregset): Remove functions. (_initialize_amd64_linux_tdep): Don't set add_core_fns. * amd64-linux-nat.c: Don't include "amd64-linux-tdep.h". * Makefile.in (amd64_linux_tdep_h): Remove. (amd64-linux-nat.o): Update dependencies. (amd64-linux-tdep.o): Update dependencies.
This commit is contained in:
Mark Kettenis
parent
99679982ac
commit
187e21d161
5 changed files with 63 additions and 152 deletions
|
|
@ -1,5 +1,25 @@
|
|||
2004-03-14 Mark Kettenis <kettenis@gnu.org>
|
||||
|
||||
* amd64-linux-tdep.h: Remove file.
|
||||
* amd64-linux-tdep.c: Don't include "inferior.h" and
|
||||
"amd64-linux-tdep.h". Include "frame.h" and "solib-svr4.h".
|
||||
(USER_R15, USER_R14, USER_R13, USER_R12, USER_RBP, USER_RBX)
|
||||
(USER_R11, USER_R10, USER_R9, USER_R8, USER_RAX, USER_RCX)
|
||||
(USER_RDX, USER_RSI, USER_RDI, USER_RIP, USER_CS, USER_EFLAGS)
|
||||
(USER_RSP, USER_SS, USER_DS, USER_ES, USER_FS, USER_GS): Remove
|
||||
macros.
|
||||
(user_to_gdb_regmap): Remove variable.
|
||||
(amd64_linux_gregset_reg_offset): New variable.
|
||||
(amd64_core_fns): Remove variable.
|
||||
(fetch_core_registers): Remove function.
|
||||
(amd64_linux_supply_gregset, amd64_linux_fill_gregset): Remove
|
||||
functions.
|
||||
(_initialize_amd64_linux_tdep): Don't set add_core_fns.
|
||||
* amd64-linux-nat.c: Don't include "amd64-linux-tdep.h".
|
||||
* Makefile.in (amd64_linux_tdep_h): Remove.
|
||||
(amd64-linux-nat.o): Update dependencies.
|
||||
(amd64-linux-tdep.o): Update dependencies.
|
||||
|
||||
* amd64-linux-nat.c (GETFPREGS_SUPPLIES): Remove macro.
|
||||
(fetch_regs, fetch_fpregs, store_regs, store_fpregs): Remove
|
||||
functions.
|
||||
|
|
|
|||
|
|
@ -614,7 +614,6 @@ nm_h = @nm_h@
|
|||
ada_lang_h = ada-lang.h $(value_h) $(gdbtypes_h)
|
||||
alphabsd_tdep_h = alphabsd-tdep.h
|
||||
alpha_tdep_h = alpha-tdep.h
|
||||
amd64_linux_tdep_h = amd64-linux-tdep.h
|
||||
amd64_nat_h = amd64-nat.h
|
||||
amd64_tdep_h = amd64-tdep.h $(i386_tdep_h)
|
||||
annotate_h = annotate.h $(symtab_h) $(gdbtypes_h)
|
||||
|
|
@ -1529,10 +1528,10 @@ amd64fbsd-tdep.o: amd64fbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
|
|||
amd64-linux-nat.o: amd64-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \
|
||||
$(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \
|
||||
$(gdb_proc_service_h) $(gregset_h) $(amd64_tdep_h) \
|
||||
$(amd64_linux_tdep_h) $(i386_linux_tdep_h) $(amd64_nat_h)
|
||||
amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
|
||||
$(i386_linux_tdep_h) $(amd64_nat_h)
|
||||
amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
|
||||
$(regcache_h) $(osabi_h) $(gdb_string_h) $(amd64_tdep_h) \
|
||||
$(amd64_linux_tdep_h)
|
||||
$(solib_svr4_h)
|
||||
amd64-nat.o: amd64-nat.c $(defs_h) $(gdbarch_h) $(regcache_h) \
|
||||
$(gdb_assert_h) $(i386_tdep_h) $(amd64_tdep_h)
|
||||
amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(amd64_tdep_h) \
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#include "gregset.h"
|
||||
|
||||
#include "amd64-tdep.h"
|
||||
#include "amd64-linux-tdep.h"
|
||||
#include "i386-linux-tdep.h"
|
||||
#include "amd64-nat.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "defs.h"
|
||||
#include "inferior.h"
|
||||
#include "frame.h"
|
||||
#include "gdbcore.h"
|
||||
#include "regcache.h"
|
||||
#include "osabi.h"
|
||||
|
|
@ -29,117 +29,42 @@
|
|||
#include "gdb_string.h"
|
||||
|
||||
#include "amd64-tdep.h"
|
||||
#include "amd64-linux-tdep.h"
|
||||
|
||||
/* Register indexes to 'struct user' come from <sys/reg.h>. */
|
||||
|
||||
#define USER_R15 0
|
||||
#define USER_R14 1
|
||||
#define USER_R13 2
|
||||
#define USER_R12 3
|
||||
#define USER_RBP 4
|
||||
#define USER_RBX 5
|
||||
#define USER_R11 6
|
||||
#define USER_R10 7
|
||||
#define USER_R9 8
|
||||
#define USER_R8 9
|
||||
#define USER_RAX 10
|
||||
#define USER_RCX 11
|
||||
#define USER_RDX 12
|
||||
#define USER_RSI 13
|
||||
#define USER_RDI 14
|
||||
#define USER_RIP 16
|
||||
#define USER_CS 17
|
||||
#define USER_EFLAGS 18
|
||||
#define USER_RSP 19
|
||||
#define USER_SS 20
|
||||
#define USER_DS 23
|
||||
#define USER_ES 24
|
||||
#define USER_FS 25
|
||||
#define USER_GS 26
|
||||
#include "solib-svr4.h"
|
||||
|
||||
/* Mapping between the general-purpose registers in `struct user'
|
||||
format and GDB's register array layout. */
|
||||
format and GDB's register cache layout. */
|
||||
|
||||
static int user_to_gdb_regmap[] =
|
||||
/* From <sys/reg.h>. */
|
||||
static int amd64_linux_gregset_reg_offset[] =
|
||||
{
|
||||
USER_RAX, USER_RBX, USER_RCX, USER_RDX,
|
||||
USER_RSI, USER_RDI, USER_RBP, USER_RSP,
|
||||
USER_R8, USER_R9, USER_R10, USER_R11,
|
||||
USER_R12, USER_R13, USER_R14, USER_R15,
|
||||
USER_RIP, USER_EFLAGS,
|
||||
USER_CS, USER_SS,
|
||||
USER_DS, USER_ES, USER_FS, USER_GS
|
||||
10 * 8, /* %rax */
|
||||
5 * 8, /* %rbx */
|
||||
11 * 8, /* %rcx */
|
||||
12 * 8, /* %rdx */
|
||||
13 * 8, /* %rsi */
|
||||
14 * 8, /* %rdi */
|
||||
4 * 8, /* %rbp */
|
||||
19 * 8, /* %rsp */
|
||||
9 * 8, /* %r8 ... */
|
||||
8 * 8,
|
||||
7 * 8,
|
||||
6 * 8,
|
||||
3 * 8,
|
||||
2 * 8,
|
||||
1 * 8,
|
||||
0 * 8, /* ... %r15 */
|
||||
16 * 8, /* %rip */
|
||||
18 * 8, /* %eflags */
|
||||
17 * 8, /* %cs */
|
||||
20 * 8, /* %ss */
|
||||
23 * 8, /* %ds */
|
||||
24 * 8, /* %es */
|
||||
25 * 8, /* %fs */
|
||||
26 * 8 /* %gs */
|
||||
};
|
||||
|
||||
|
||||
/* Fill GDB's register array with the general-purpose register values
|
||||
in *GREGSETP. */
|
||||
|
||||
void
|
||||
amd64_linux_supply_gregset (char *regp)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < AMD64_NUM_GREGS; i++)
|
||||
supply_register (i, regp + (user_to_gdb_regmap[i] * 8));
|
||||
}
|
||||
|
||||
/* Fill register REGNO (if it is a general-purpose register) in
|
||||
*GREGSETPS with the value in GDB's register array. If REGNO is -1,
|
||||
do this for all registers. */
|
||||
|
||||
void
|
||||
amd64_linux_fill_gregset (char *regp, int regno)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < AMD64_NUM_GREGS; i++)
|
||||
if (regno == -1 || regno == i)
|
||||
regcache_collect (i, regp + (user_to_gdb_regmap[i] * 8));
|
||||
}
|
||||
|
||||
/* The register sets used in GNU/Linux ELF core-dumps are identical to
|
||||
the register sets used by `ptrace'. The corresponding types are
|
||||
`elf_gregset_t' for the general-purpose registers (with
|
||||
`elf_greg_t' the type of a single GP register) and `elf_fpregset_t'
|
||||
for the floating-point registers. */
|
||||
|
||||
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 != 216)
|
||||
warning ("Wrong size register set in core file.");
|
||||
else
|
||||
amd64_linux_supply_gregset (core_reg_sect);
|
||||
break;
|
||||
|
||||
case 2: /* Floating point registers. */
|
||||
case 3: /* "Extended" floating point registers. This is gdb-speak
|
||||
for SSE/SSE2. */
|
||||
if (core_reg_size != 512)
|
||||
warning ("Wrong size XMM register set in core file.");
|
||||
else
|
||||
amd64_supply_fxsave (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 amd64_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 /* next */
|
||||
};
|
||||
/* Support for signal handlers. */
|
||||
|
||||
#define LINUX_SIGTRAMP_INSN0 0x48 /* mov $NNNNNNNN, %rax */
|
||||
#define LINUX_SIGTRAMP_OFFSET0 0
|
||||
|
|
@ -271,13 +196,21 @@ static void
|
|||
amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
{
|
||||
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||
|
||||
tdep->gregset_reg_offset = amd64_linux_gregset_reg_offset;
|
||||
tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset);
|
||||
tdep->sizeof_gregset = 27 * 8;
|
||||
|
||||
amd64_init_abi (info, gdbarch);
|
||||
|
||||
set_gdbarch_pc_in_sigtramp (gdbarch, amd64_linux_pc_in_sigtramp);
|
||||
|
||||
tdep->sigcontext_addr = amd64_linux_sigcontext_addr;
|
||||
tdep->sc_reg_offset = amd64_linux_sc_reg_offset;
|
||||
tdep->sc_num_regs = ARRAY_SIZE (amd64_linux_sc_reg_offset);
|
||||
|
||||
/* GNU/Linux uses SVR4-style shared libraries. */
|
||||
set_solib_svr4_fetch_link_map_offsets
|
||||
(gdbarch, svr4_lp64_fetch_link_map_offsets);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -287,8 +220,6 @@ extern void _initialize_amd64_linux_tdep (void);
|
|||
void
|
||||
_initialize_amd64_linux_tdep (void)
|
||||
{
|
||||
add_core_fns (&amd64_core_fns);
|
||||
|
||||
gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
|
||||
GDB_OSABI_LINUX, amd64_linux_init_abi);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
/* Target-dependent definitions for GNU/Linux x86-64.
|
||||
|
||||
Copyright 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
Contributed by Michal Ludvig, SuSE AG.
|
||||
|
||||
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 AMD64_LINUX_TDEP_H
|
||||
#define AMD64_LINUX_TDEP_H
|
||||
|
||||
/* Fill GDB's register array with the general-purpose register values
|
||||
in *GREGSETP. */
|
||||
|
||||
void amd64_linux_supply_gregset (char *regp);
|
||||
|
||||
/* Fill register REGNO (if it is a general-purpose register) in
|
||||
*GREGSETPS with the value in GDB's register array. If REGNO is -1,
|
||||
do this for all registers. */
|
||||
|
||||
void amd64_linux_fill_gregset (char *regp, int regno);
|
||||
|
||||
#endif /* amd64-linux-tdep.h */
|
||||
Loading…
Reference in a new issue