* alpha-linux-tdep.c: Include "gdb_string.h", "regset.h",
and "regcache.h". (alpha_linux_supply_gregset, alpha_linux_supply_fpregset): New. (alpha_linux_gregset, alpha_linux_fpregset): New variables. (alpha_linux_regset_from_core_section): New function. (alpha_linux_init_abi): Install it. * alpha-linux-nat.c: Do not include "gdbcore.h". Include "alpha-tdep.h", <sys/ptrace.h>, <alpha/ptrace.h>, <sys/procfs.h>, and "gregset.h". (ALPHA_REGSET_BASE, ALPHA_REGSET_UNIQUE, ALPHA_UNIQUE_PTRACE_ADDR): Move from config/alpha/nm-linux.h. (supply_gregset, fill_gregset, supply_fpregset, fill_fpregset): Copy from alpha-nat.c. (alpha_linux_register_u_offset): Inline register_addr from alpha-nat.c. * alpha-nat.c: Remove #ifdef __linux__ section. (fetch_elf_core_registers, alpha_elf_core_fns): Remove. (_initialize_core_alpha): Do not register alpha_elf_core_fns. (ALPHA_UNIQUE_PTRACE_ADDR, ALPHA_REGSET_UNIQUE): Define unconditionally. (ALPHA_REGSET_BASE): Move from config/alpha/nm-osf.h. * config/alpha/alpha-linux.mh (NAT_FILE): Set to config/nm-linux.h. (NATDEPFILES): Remove alpha-nat.o. * config/alpha/nm-linux.h: Delete file. * config/alpha/nm-osf.h (ALPHA_REGSET_BASE): Move to alpha-nat.c. * Makefile.in (alpha-linux-nat.o): Update dependencies. (alpha-linux-tdep.o): Likewise.
This commit is contained in:
Ulrich Weigand
parent
4aee063404
commit
b02f9d5732
8 changed files with 196 additions and 102 deletions
|
|
@ -1,3 +1,31 @@
|
|||
2007-04-25 Ulrich Weigand <uweigand@de.ibm.com>
|
||||
|
||||
* alpha-linux-tdep.c: Include "gdb_string.h", "regset.h",
|
||||
and "regcache.h".
|
||||
(alpha_linux_supply_gregset, alpha_linux_supply_fpregset): New.
|
||||
(alpha_linux_gregset, alpha_linux_fpregset): New variables.
|
||||
(alpha_linux_regset_from_core_section): New function.
|
||||
(alpha_linux_init_abi): Install it.
|
||||
* alpha-linux-nat.c: Do not include "gdbcore.h". Include
|
||||
"alpha-tdep.h", <sys/ptrace.h>, <alpha/ptrace.h>,
|
||||
<sys/procfs.h>, and "gregset.h".
|
||||
(ALPHA_REGSET_BASE, ALPHA_REGSET_UNIQUE, ALPHA_UNIQUE_PTRACE_ADDR):
|
||||
Move from config/alpha/nm-linux.h.
|
||||
(supply_gregset, fill_gregset, supply_fpregset, fill_fpregset): Copy
|
||||
from alpha-nat.c.
|
||||
(alpha_linux_register_u_offset): Inline register_addr from alpha-nat.c.
|
||||
* alpha-nat.c: Remove #ifdef __linux__ section.
|
||||
(fetch_elf_core_registers, alpha_elf_core_fns): Remove.
|
||||
(_initialize_core_alpha): Do not register alpha_elf_core_fns.
|
||||
(ALPHA_UNIQUE_PTRACE_ADDR, ALPHA_REGSET_UNIQUE): Define unconditionally.
|
||||
(ALPHA_REGSET_BASE): Move from config/alpha/nm-osf.h.
|
||||
* config/alpha/alpha-linux.mh (NAT_FILE): Set to config/nm-linux.h.
|
||||
(NATDEPFILES): Remove alpha-nat.o.
|
||||
* config/alpha/nm-linux.h: Delete file.
|
||||
* config/alpha/nm-osf.h (ALPHA_REGSET_BASE): Move to alpha-nat.c.
|
||||
* Makefile.in (alpha-linux-nat.o): Update dependencies.
|
||||
(alpha-linux-tdep.o): Likewise.
|
||||
|
||||
2007-04-25 Ulrich Weigand <uweigand@de.ibm.com>
|
||||
|
||||
* mips-linux-nat.c: No longer include "gdbcore.h".
|
||||
|
|
|
|||
|
|
@ -1717,9 +1717,10 @@ alphabsd-tdep.o: alphabsd-tdep.c $(defs_h) $(alpha_tdep_h) \
|
|||
alphafbsd-tdep.o: alphafbsd-tdep.c $(defs_h) $(value_h) $(osabi_h) \
|
||||
$(alpha_tdep_h) $(solib_svr4_h)
|
||||
alpha-linux-nat.o: alpha-linux-nat.c $(defs_h) $(target_h) $(linux_nat_h) \
|
||||
$(gdbcore_h)
|
||||
$(alpha_tdep_h) $(gregset_h)
|
||||
alpha-linux-tdep.o: alpha-linux-tdep.c $(defs_h) $(frame_h) $(gdb_assert_h) \
|
||||
$(osabi_h) $(solib_svr4_h) $(symtab_h) $(alpha_tdep_h)
|
||||
$(gdb_string_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) $(regset_h) \
|
||||
$(regcache_h) $(alpha_tdep_h)
|
||||
alpha-mdebug-tdep.o: alpha-mdebug-tdep.c $(defs_h) $(frame_h) \
|
||||
$(frame_unwind_h) $(frame_base_h) $(symtab_h) $(gdbcore_h) \
|
||||
$(block_h) $(gdb_assert_h) $(alpha_tdep_h) $(mdebugread_h)
|
||||
|
|
|
|||
|
|
@ -21,15 +21,85 @@
|
|||
#include "defs.h"
|
||||
#include "target.h"
|
||||
#include "linux-nat.h"
|
||||
#include "gdbcore.h"
|
||||
|
||||
#include "alpha-tdep.h"
|
||||
|
||||
#include <sys/ptrace.h>
|
||||
#include <alpha/ptrace.h>
|
||||
|
||||
#include <sys/procfs.h>
|
||||
#include "gregset.h"
|
||||
|
||||
/* Given a pointer to either a gregset_t or fpregset_t, return a
|
||||
pointer to the first register. */
|
||||
#define ALPHA_REGSET_BASE(regsetp) ((long *) (regsetp))
|
||||
|
||||
/* Given a pointer to a gregset_t, locate the UNIQUE value. */
|
||||
#define ALPHA_REGSET_UNIQUE(regsetp) ((long *)(regsetp) + 32)
|
||||
|
||||
/* The address of UNIQUE for ptrace. */
|
||||
#define ALPHA_UNIQUE_PTRACE_ADDR 65
|
||||
|
||||
|
||||
/*
|
||||
* See the comment in m68k-tdep.c regarding the utility of these functions.
|
||||
*/
|
||||
|
||||
void
|
||||
supply_gregset (gdb_gregset_t *gregsetp)
|
||||
{
|
||||
long *regp = ALPHA_REGSET_BASE (gregsetp);
|
||||
void *unique = ALPHA_REGSET_UNIQUE (gregsetp);
|
||||
|
||||
/* PC is in slot 32. */
|
||||
alpha_supply_int_regs (-1, regp, regp + 31, unique);
|
||||
}
|
||||
|
||||
void
|
||||
fill_gregset (gdb_gregset_t *gregsetp, int regno)
|
||||
{
|
||||
long *regp = ALPHA_REGSET_BASE (gregsetp);
|
||||
void *unique = ALPHA_REGSET_UNIQUE (gregsetp);
|
||||
|
||||
/* PC is in slot 32. */
|
||||
alpha_fill_int_regs (regno, regp, regp + 31, unique);
|
||||
}
|
||||
|
||||
/*
|
||||
* Now we do the same thing for floating-point registers.
|
||||
* Again, see the comments in m68k-tdep.c.
|
||||
*/
|
||||
|
||||
void
|
||||
supply_fpregset (gdb_fpregset_t *fpregsetp)
|
||||
{
|
||||
long *regp = ALPHA_REGSET_BASE (fpregsetp);
|
||||
|
||||
/* FPCR is in slot 32. */
|
||||
alpha_supply_fp_regs (-1, regp, regp + 31);
|
||||
}
|
||||
|
||||
void
|
||||
fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
|
||||
{
|
||||
long *regp = ALPHA_REGSET_BASE (fpregsetp);
|
||||
|
||||
/* FPCR is in slot 32. */
|
||||
alpha_fill_fp_regs (regno, regp, regp + 31);
|
||||
}
|
||||
|
||||
|
||||
static CORE_ADDR
|
||||
alpha_linux_register_u_offset (int regno)
|
||||
{
|
||||
/* FIXME drow/2005-09-04: The hardcoded use of register_addr should go
|
||||
away. This requires disentangling the various definitions of it
|
||||
(particularly alpha-nat.c's). */
|
||||
return register_addr (regno, 0);
|
||||
if (regno == PC_REGNUM)
|
||||
return PC;
|
||||
if (regno == ALPHA_UNIQUE_REGNUM)
|
||||
return ALPHA_UNIQUE_PTRACE_ADDR;
|
||||
if (regno < FP0_REGNUM)
|
||||
return GPR_BASE + regno;
|
||||
else
|
||||
return FPR_BASE + regno - FP0_REGNUM;
|
||||
}
|
||||
|
||||
void _initialialize_alpha_linux_nat (void);
|
||||
|
|
|
|||
|
|
@ -21,9 +21,12 @@
|
|||
#include "defs.h"
|
||||
#include "frame.h"
|
||||
#include "gdb_assert.h"
|
||||
#include "gdb_string.h"
|
||||
#include "osabi.h"
|
||||
#include "solib-svr4.h"
|
||||
#include "symtab.h"
|
||||
#include "regset.h"
|
||||
#include "regcache.h"
|
||||
|
||||
#include "alpha-tdep.h"
|
||||
|
||||
|
|
@ -125,6 +128,84 @@ alpha_linux_sigcontext_addr (struct frame_info *next_frame)
|
|||
return sp;
|
||||
}
|
||||
|
||||
/* Supply register REGNUM from the buffer specified by GREGS and LEN
|
||||
in the general-purpose register set REGSET to register cache
|
||||
REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
|
||||
|
||||
static void
|
||||
alpha_linux_supply_gregset (const struct regset *regset,
|
||||
struct regcache *regcache,
|
||||
int regnum, const void *gregs, size_t len)
|
||||
{
|
||||
const gdb_byte *regs = gregs;
|
||||
int i;
|
||||
gdb_assert (len >= 32 * 8);
|
||||
|
||||
for (i = 0; i < ALPHA_ZERO_REGNUM; i++)
|
||||
{
|
||||
if (regnum == i || regnum == -1)
|
||||
regcache_raw_supply (regcache, i, regs + i * 8);
|
||||
}
|
||||
|
||||
if (regnum == ALPHA_PC_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, ALPHA_PC_REGNUM, regs + 31 * 8);
|
||||
|
||||
if (regnum == ALPHA_UNIQUE_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, ALPHA_UNIQUE_REGNUM,
|
||||
len >= 33 * 8 ? regs + 32 * 8 : NULL);
|
||||
}
|
||||
|
||||
/* Supply register REGNUM from the buffer specified by FPREGS and LEN
|
||||
in the floating-point register set REGSET to register cache
|
||||
REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
|
||||
|
||||
static void
|
||||
alpha_linux_supply_fpregset (const struct regset *regset,
|
||||
struct regcache *regcache,
|
||||
int regnum, const void *fpregs, size_t len)
|
||||
{
|
||||
const gdb_byte *regs = fpregs;
|
||||
int i;
|
||||
gdb_assert (len >= 32 * 8);
|
||||
|
||||
for (i = ALPHA_FP0_REGNUM; i < ALPHA_FP0_REGNUM + 31; i++)
|
||||
{
|
||||
if (regnum == i || regnum == -1)
|
||||
regcache_raw_supply (regcache, i, regs + (i - ALPHA_FP0_REGNUM) * 8);
|
||||
}
|
||||
|
||||
if (regnum == ALPHA_FPCR_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, ALPHA_FPCR_REGNUM, regs + 32 * 8);
|
||||
}
|
||||
|
||||
static struct regset alpha_linux_gregset =
|
||||
{
|
||||
NULL,
|
||||
alpha_linux_supply_gregset
|
||||
};
|
||||
|
||||
static struct regset alpha_linux_fpregset =
|
||||
{
|
||||
NULL,
|
||||
alpha_linux_supply_fpregset
|
||||
};
|
||||
|
||||
/* Return the appropriate register set for the core section identified
|
||||
by SECT_NAME and SECT_SIZE. */
|
||||
|
||||
const struct regset *
|
||||
alpha_linux_regset_from_core_section (struct gdbarch *gdbarch,
|
||||
const char *sect_name, size_t sect_size)
|
||||
{
|
||||
if (strcmp (sect_name, ".reg") == 0 && sect_size >= 32 * 8)
|
||||
return &alpha_linux_gregset;
|
||||
|
||||
if (strcmp (sect_name, ".reg2") == 0 && sect_size >= 32 * 8)
|
||||
return &alpha_linux_fpregset;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
alpha_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
{
|
||||
|
|
@ -148,6 +229,9 @@ alpha_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|||
/* Enable TLS support. */
|
||||
set_gdbarch_fetch_tls_load_module_address (gdbarch,
|
||||
svr4_fetch_objfile_link_map);
|
||||
|
||||
set_gdbarch_regset_from_core_section
|
||||
(gdbarch, alpha_linux_regset_from_core_section);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -29,18 +29,9 @@
|
|||
#include "alpha-tdep.h"
|
||||
|
||||
#include <sys/ptrace.h>
|
||||
#ifdef __linux__
|
||||
#include <asm/reg.h>
|
||||
#include <alpha/ptrace.h>
|
||||
#else
|
||||
#include <alpha/coreregs.h>
|
||||
#endif
|
||||
#include <sys/user.h>
|
||||
|
||||
/* Prototypes for local functions. */
|
||||
|
||||
static void fetch_osf_core_registers (char *, unsigned, int, CORE_ADDR);
|
||||
static void fetch_elf_core_registers (char *, unsigned, int, CORE_ADDR);
|
||||
|
||||
/* Extract the register values out of the core file and store
|
||||
them where `read_register' will find them.
|
||||
|
|
@ -125,43 +116,12 @@ fetch_osf_core_registers (char *core_reg_sect, unsigned core_reg_size,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
fetch_elf_core_registers (char *core_reg_sect, unsigned core_reg_size,
|
||||
int which, CORE_ADDR reg_addr)
|
||||
{
|
||||
if (core_reg_size < 32 * 8)
|
||||
{
|
||||
error (_("Core file register section too small (%u bytes)."), core_reg_size);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (which)
|
||||
{
|
||||
case 0: /* integer registers */
|
||||
/* PC is in slot 32; UNIQUE is in slot 33, if present. */
|
||||
alpha_supply_int_regs (-1, core_reg_sect, core_reg_sect + 31*8,
|
||||
(core_reg_size >= 33 * 8
|
||||
? core_reg_sect + 32*8 : NULL));
|
||||
break;
|
||||
|
||||
case 2: /* floating-point registers */
|
||||
/* FPCR is in slot 32. */
|
||||
alpha_supply_fp_regs (-1, core_reg_sect, core_reg_sect + 31*8);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Map gdb internal register number to a ptrace ``address''.
|
||||
These ``addresses'' are defined in <sys/ptrace.h>, with
|
||||
the exception of ALPHA_UNIQUE_PTRACE_ADDR. */
|
||||
|
||||
#ifndef ALPHA_UNIQUE_PTRACE_ADDR
|
||||
#define ALPHA_UNIQUE_PTRACE_ADDR 0
|
||||
#endif
|
||||
|
||||
CORE_ADDR
|
||||
register_addr (int regno, CORE_ADDR blockend)
|
||||
|
|
@ -188,10 +148,12 @@ kernel_u_size (void)
|
|||
/* Prototypes for supply_gregset etc. */
|
||||
#include "gregset.h"
|
||||
|
||||
/* Given a pointer to either a gregset_t or fpregset_t, return a
|
||||
pointer to the first register. */
|
||||
#define ALPHA_REGSET_BASE(regsetp) ((regsetp)->regs)
|
||||
|
||||
/* Locate the UNIQUE value within the gregset_t. */
|
||||
#ifndef ALPHA_REGSET_UNIQUE
|
||||
#define ALPHA_REGSET_UNIQUE(ptr) NULL
|
||||
#endif
|
||||
|
||||
/*
|
||||
* See the comment in m68k-tdep.c regarding the utility of these functions.
|
||||
|
|
@ -255,18 +217,8 @@ static struct core_fns alpha_osf_core_fns =
|
|||
NULL /* next */
|
||||
};
|
||||
|
||||
static struct core_fns alpha_elf_core_fns =
|
||||
{
|
||||
bfd_target_elf_flavour, /* core_flavour */
|
||||
default_check_format, /* check_format */
|
||||
default_core_sniffer, /* core_sniffer */
|
||||
fetch_elf_core_registers, /* core_read_registers */
|
||||
NULL /* next */
|
||||
};
|
||||
|
||||
void
|
||||
_initialize_core_alpha (void)
|
||||
{
|
||||
deprecated_add_core_fns (&alpha_osf_core_fns);
|
||||
deprecated_add_core_fns (&alpha_elf_core_fns);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Host: Little-endian Alpha running Linux
|
||||
NAT_FILE= nm-linux.h
|
||||
NATDEPFILES= inf-ptrace.o corelow.o alpha-nat.o alpha-linux-nat.o \
|
||||
NAT_FILE= config/nm-linux.h
|
||||
NATDEPFILES= inf-ptrace.o corelow.o alpha-linux-nat.o \
|
||||
fork-child.o proc-service.o linux-thread-db.o gcore.o \
|
||||
linux-nat.o linux-fork.o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
/* Native definitions for alpha running GNU/Linux.
|
||||
|
||||
Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2007
|
||||
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_LINUX_H
|
||||
#define NM_LINUX_H
|
||||
|
||||
#include "config/nm-linux.h"
|
||||
|
||||
/* Given a pointer to either a gregset_t or fpregset_t, return a
|
||||
pointer to the first register. */
|
||||
#define ALPHA_REGSET_BASE(regsetp) ((long *) (regsetp))
|
||||
|
||||
/* Given a pointer to a gregset_t, locate the UNIQUE value. */
|
||||
#define ALPHA_REGSET_UNIQUE(regsetp) ((long *)(regsetp) + 32)
|
||||
|
||||
/* The address of UNIQUE for ptrace. */
|
||||
#define ALPHA_UNIQUE_PTRACE_ADDR 65
|
||||
|
||||
#endif /* NM_LINUX_H */
|
||||
|
|
@ -29,6 +29,3 @@
|
|||
|
||||
#define U_REGS_OFFSET 0
|
||||
|
||||
/* Given a pointer to either a gregset_t or fpregset_t, return a
|
||||
pointer to the first register. */
|
||||
#define ALPHA_REGSET_BASE(regsetp) ((regsetp)->regs)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue