* configure.srv [powerpc64-*-linux*]: Use linux-ppc-low.o
instead of linux-ppc64-low.o. * linux-ppc64-low.c: Remove file. * Makefile.in (SFILES): Remove linux-ppc64-low.c. (linux-ppc64-low.o): Remove rule. * linux-ppc-low.c (init_registers_ppc64): Add prototype. (init_registers_powerpc_64): Likewise. (ppc_regmap): Conditionally define depending on __powerpc64__. (ppc_cannot_store_register): Do not special-case "fpscr" when compiled on __powerpc64__. (ppc_collect_ptrace_register): New function. (ppc_supply_ptrace_register): New function. (ppc_breakpoint): Change type to "unsigned int". (ppc_breakpoint_at): Change type of "insn" to "unsigned int". (the_low_target): Conditionally provide initializers for the arch_setup member depending on __powerpc64__. Install collect_ptrace_register and supply_ptrace_register members.
This commit is contained in:
Ulrich Weigand
parent
9b4b61c8db
commit
5b0a002e22
|
|
@ -1,3 +1,24 @@
|
|||
2008-02-28 Ulrich Weigand <uweigand@de.ibm.com>
|
||||
|
||||
* configure.srv [powerpc64-*-linux*]: Use linux-ppc-low.o
|
||||
instead of linux-ppc64-low.o.
|
||||
* linux-ppc64-low.c: Remove file.
|
||||
* Makefile.in (SFILES): Remove linux-ppc64-low.c.
|
||||
(linux-ppc64-low.o): Remove rule.
|
||||
|
||||
* linux-ppc-low.c (init_registers_ppc64): Add prototype.
|
||||
(init_registers_powerpc_64): Likewise.
|
||||
(ppc_regmap): Conditionally define depending on __powerpc64__.
|
||||
(ppc_cannot_store_register): Do not special-case "fpscr" when
|
||||
compiled on __powerpc64__.
|
||||
(ppc_collect_ptrace_register): New function.
|
||||
(ppc_supply_ptrace_register): New function.
|
||||
(ppc_breakpoint): Change type to "unsigned int".
|
||||
(ppc_breakpoint_at): Change type of "insn" to "unsigned int".
|
||||
(the_low_target): Conditionally provide initializers for the
|
||||
arch_setup member depending on __powerpc64__. Install
|
||||
collect_ptrace_register and supply_ptrace_register members.
|
||||
|
||||
2008-02-28 Ulrich Weigand <uweigand@de.ibm.com>
|
||||
|
||||
* regcache.h (gdbserver_xmltarget): Add extern declaration.
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c \
|
|||
$(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \
|
||||
$(srcdir)/linux-m32r-low.c \
|
||||
$(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \
|
||||
$(srcdir)/linux-ppc-low.c $(srcdir)/linux-ppc64-low.c \
|
||||
$(srcdir)/linux-ppc-low.c \
|
||||
$(srcdir)/linux-s390-low.c \
|
||||
$(srcdir)/linux-sh-low.c $(srcdir)/linux-x86-64-low.c \
|
||||
$(srcdir)/linux-xtensa-low.c \
|
||||
|
|
@ -307,7 +307,6 @@ linux-m32r-low.o: linux-m32r-low.c $(linux_low_h) $(server_h)
|
|||
linux-mips-low.o: linux-mips-low.c $(linux_low_h) $(server_h) \
|
||||
$(gdb_proc_service_h)
|
||||
linux-ppc-low.o: linux-ppc-low.c $(linux_low_h) $(server_h)
|
||||
linux-ppc64-low.o: linux-ppc64-low.c $(linux_low_h) $(server_h)
|
||||
linux-s390-low.o: linux-s390-low.c $(linux_low_h) $(server_h)
|
||||
linux-sh-low.o: linux-sh-low.c $(linux_low_h) $(server_h)
|
||||
linux-x86-64-low.o: linux-x86-64-low.c $(linux_low_h) $(server_h) \
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ case "${target}" in
|
|||
srv_linux_thread_db=yes
|
||||
;;
|
||||
powerpc64-*-linux*) srv_regobj="reg-ppc64.o powerpc-64.o"
|
||||
srv_tgtobj="linux-low.o linux-ppc64-low.o"
|
||||
srv_tgtobj="linux-low.o linux-ppc-low.o"
|
||||
srv_xmlfiles="rs6000/powerpc-64.xml"
|
||||
srv_xmlfiles="${srv_xmlfiles} rs6000/power-altivec.xml"
|
||||
srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
|
||||
|
|
|
|||
|
|
@ -29,9 +29,36 @@ void init_registers_ppc (void);
|
|||
void init_registers_powerpc_32 (void);
|
||||
/* Defined in auto-generated file powerpc-e500.c. */
|
||||
void init_registers_powerpc_e500 (void);
|
||||
/* Defined in auto-generated file reg-ppc64.c. */
|
||||
void init_registers_ppc64 (void);
|
||||
/* Defined in auto-generated file powerpc-64.c. */
|
||||
void init_registers_powerpc_64 (void);
|
||||
|
||||
#define ppc_num_regs 71
|
||||
|
||||
#ifdef __powerpc64__
|
||||
/* We use a constant for FPSCR instead of PT_FPSCR, because
|
||||
many shipped PPC64 kernels had the wrong value in ptrace.h. */
|
||||
static int ppc_regmap[] =
|
||||
{PT_R0 * 8, PT_R1 * 8, PT_R2 * 8, PT_R3 * 8,
|
||||
PT_R4 * 8, PT_R5 * 8, PT_R6 * 8, PT_R7 * 8,
|
||||
PT_R8 * 8, PT_R9 * 8, PT_R10 * 8, PT_R11 * 8,
|
||||
PT_R12 * 8, PT_R13 * 8, PT_R14 * 8, PT_R15 * 8,
|
||||
PT_R16 * 8, PT_R17 * 8, PT_R18 * 8, PT_R19 * 8,
|
||||
PT_R20 * 8, PT_R21 * 8, PT_R22 * 8, PT_R23 * 8,
|
||||
PT_R24 * 8, PT_R25 * 8, PT_R26 * 8, PT_R27 * 8,
|
||||
PT_R28 * 8, PT_R29 * 8, PT_R30 * 8, PT_R31 * 8,
|
||||
PT_FPR0*8, PT_FPR0*8 + 8, PT_FPR0*8+16, PT_FPR0*8+24,
|
||||
PT_FPR0*8+32, PT_FPR0*8+40, PT_FPR0*8+48, PT_FPR0*8+56,
|
||||
PT_FPR0*8+64, PT_FPR0*8+72, PT_FPR0*8+80, PT_FPR0*8+88,
|
||||
PT_FPR0*8+96, PT_FPR0*8+104, PT_FPR0*8+112, PT_FPR0*8+120,
|
||||
PT_FPR0*8+128, PT_FPR0*8+136, PT_FPR0*8+144, PT_FPR0*8+152,
|
||||
PT_FPR0*8+160, PT_FPR0*8+168, PT_FPR0*8+176, PT_FPR0*8+184,
|
||||
PT_FPR0*8+192, PT_FPR0*8+200, PT_FPR0*8+208, PT_FPR0*8+216,
|
||||
PT_FPR0*8+224, PT_FPR0*8+232, PT_FPR0*8+240, PT_FPR0*8+248,
|
||||
PT_NIP * 8, PT_MSR * 8, PT_CCR * 8, PT_LNK * 8,
|
||||
PT_CTR * 8, PT_XER * 8, PT_FPR0*8 + 256 };
|
||||
#else
|
||||
/* Currently, don't check/send MQ. */
|
||||
static int ppc_regmap[] =
|
||||
{PT_R0 * 4, PT_R1 * 4, PT_R2 * 4, PT_R3 * 4,
|
||||
|
|
@ -68,11 +95,12 @@ static int ppc_regmap[] =
|
|||
PT_CTR * 4, PT_XER * 4, PT_FPSCR * 4
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
static int
|
||||
ppc_cannot_store_register (int regno)
|
||||
{
|
||||
#ifndef __SPE__
|
||||
#if !defined (__powerpc64__) && !defined (__SPE__)
|
||||
/* Some kernels do not allow us to store fpscr. */
|
||||
if (regno == find_regno ("fpscr"))
|
||||
return 2;
|
||||
|
|
@ -87,6 +115,26 @@ ppc_cannot_fetch_register (int regno)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_collect_ptrace_register (int regno, char *buf)
|
||||
{
|
||||
int size = register_size (regno);
|
||||
if (size < sizeof (long))
|
||||
collect_register (regno, buf + sizeof (long) - size);
|
||||
else
|
||||
collect_register (regno, buf);
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_supply_ptrace_register (int regno, const char *buf)
|
||||
{
|
||||
int size = register_size (regno);
|
||||
if (size < sizeof (long))
|
||||
supply_register (regno, buf + sizeof (long) - size);
|
||||
else
|
||||
supply_register (regno, buf);
|
||||
}
|
||||
|
||||
static CORE_ADDR
|
||||
ppc_get_pc (void)
|
||||
{
|
||||
|
|
@ -104,17 +152,16 @@ ppc_set_pc (CORE_ADDR pc)
|
|||
supply_register_by_name ("pc", &newpc);
|
||||
}
|
||||
|
||||
/* Correct in either endianness. Note that this file is
|
||||
for PowerPC only, not PowerPC64.
|
||||
/* Correct in either endianness.
|
||||
This instruction is "twge r2, r2", which GDB uses as a software
|
||||
breakpoint. */
|
||||
static const unsigned long ppc_breakpoint = 0x7d821008;
|
||||
static const unsigned int ppc_breakpoint = 0x7d821008;
|
||||
#define ppc_breakpoint_len 4
|
||||
|
||||
static int
|
||||
ppc_breakpoint_at (CORE_ADDR where)
|
||||
{
|
||||
unsigned long insn;
|
||||
unsigned int insn;
|
||||
|
||||
(*the_target->read_memory) (where, (unsigned char *) &insn, 4);
|
||||
if (insn == ppc_breakpoint)
|
||||
|
|
@ -238,6 +285,13 @@ struct regset_info target_regsets[] = {
|
|||
};
|
||||
|
||||
struct linux_target_ops the_low_target = {
|
||||
#ifdef __powerpc64__
|
||||
#ifdef __ALTIVEC__
|
||||
init_registers_powerpc_64,
|
||||
#else
|
||||
init_registers_ppc64,
|
||||
#endif
|
||||
#else
|
||||
#ifdef __ALTIVEC__
|
||||
init_registers_powerpc_32,
|
||||
#else
|
||||
|
|
@ -246,6 +300,7 @@ struct linux_target_ops the_low_target = {
|
|||
#else
|
||||
init_registers_ppc,
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
ppc_num_regs,
|
||||
ppc_regmap,
|
||||
|
|
@ -258,4 +313,10 @@ struct linux_target_ops the_low_target = {
|
|||
NULL,
|
||||
0,
|
||||
ppc_breakpoint_at,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
ppc_collect_ptrace_register,
|
||||
ppc_supply_ptrace_register,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,212 +0,0 @@
|
|||
/* GNU/Linux/PowerPC64 specific low level interface, for the remote server for
|
||||
GDB.
|
||||
Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008
|
||||
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 3 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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include "server.h"
|
||||
#include "linux-low.h"
|
||||
|
||||
/* Defined in auto-generated file reg-ppc64.c. */
|
||||
void init_registers_ppc64 (void);
|
||||
/* Defined in auto-generated file powerpc-64.c. */
|
||||
void init_registers_powerpc_64 (void);
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
#define ppc_num_regs 71
|
||||
|
||||
/* We use a constant for FPSCR instead of PT_FPSCR, because
|
||||
many shipped PPC64 kernels had the wrong value in ptrace.h. */
|
||||
static int ppc_regmap[] =
|
||||
{PT_R0 * 8, PT_R1 * 8, PT_R2 * 8, PT_R3 * 8,
|
||||
PT_R4 * 8, PT_R5 * 8, PT_R6 * 8, PT_R7 * 8,
|
||||
PT_R8 * 8, PT_R9 * 8, PT_R10 * 8, PT_R11 * 8,
|
||||
PT_R12 * 8, PT_R13 * 8, PT_R14 * 8, PT_R15 * 8,
|
||||
PT_R16 * 8, PT_R17 * 8, PT_R18 * 8, PT_R19 * 8,
|
||||
PT_R20 * 8, PT_R21 * 8, PT_R22 * 8, PT_R23 * 8,
|
||||
PT_R24 * 8, PT_R25 * 8, PT_R26 * 8, PT_R27 * 8,
|
||||
PT_R28 * 8, PT_R29 * 8, PT_R30 * 8, PT_R31 * 8,
|
||||
PT_FPR0*8, PT_FPR0*8 + 8, PT_FPR0*8+16, PT_FPR0*8+24,
|
||||
PT_FPR0*8+32, PT_FPR0*8+40, PT_FPR0*8+48, PT_FPR0*8+56,
|
||||
PT_FPR0*8+64, PT_FPR0*8+72, PT_FPR0*8+80, PT_FPR0*8+88,
|
||||
PT_FPR0*8+96, PT_FPR0*8+104, PT_FPR0*8+112, PT_FPR0*8+120,
|
||||
PT_FPR0*8+128, PT_FPR0*8+136, PT_FPR0*8+144, PT_FPR0*8+152,
|
||||
PT_FPR0*8+160, PT_FPR0*8+168, PT_FPR0*8+176, PT_FPR0*8+184,
|
||||
PT_FPR0*8+192, PT_FPR0*8+200, PT_FPR0*8+208, PT_FPR0*8+216,
|
||||
PT_FPR0*8+224, PT_FPR0*8+232, PT_FPR0*8+240, PT_FPR0*8+248,
|
||||
PT_NIP * 8, PT_MSR * 8, PT_CCR * 8, PT_LNK * 8,
|
||||
PT_CTR * 8, PT_XER * 8, PT_FPR0*8 + 256 };
|
||||
|
||||
static int
|
||||
ppc_cannot_store_register (int regno)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
ppc_cannot_fetch_register (int regno)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_collect_ptrace_register (int regno, char *buf)
|
||||
{
|
||||
int size = register_size (regno);
|
||||
if (size < sizeof (long))
|
||||
collect_register (regno, buf + sizeof (long) - size);
|
||||
else
|
||||
collect_register (regno, buf);
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_supply_ptrace_register (int regno, const char *buf)
|
||||
{
|
||||
int size = register_size (regno);
|
||||
if (size < sizeof (long))
|
||||
supply_register (regno, buf + sizeof (long) - size);
|
||||
else
|
||||
supply_register (regno, buf);
|
||||
}
|
||||
|
||||
static CORE_ADDR
|
||||
ppc_get_pc (void)
|
||||
{
|
||||
unsigned long pc;
|
||||
|
||||
collect_register_by_name ("pc", &pc);
|
||||
return (CORE_ADDR) pc;
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_set_pc (CORE_ADDR pc)
|
||||
{
|
||||
unsigned long newpc = pc;
|
||||
|
||||
supply_register_by_name ("pc", &newpc);
|
||||
}
|
||||
|
||||
/* Correct in either endianness.
|
||||
This instruction is "twge r2, r2", which GDB uses as a software
|
||||
breakpoint. */
|
||||
static const unsigned int ppc_breakpoint = 0x7d821008;
|
||||
#define ppc_breakpoint_len 4
|
||||
|
||||
static int
|
||||
ppc_breakpoint_at (CORE_ADDR where)
|
||||
{
|
||||
unsigned int insn;
|
||||
|
||||
(*the_target->read_memory) (where, (unsigned char *) &insn, 4);
|
||||
if (insn == ppc_breakpoint)
|
||||
return 1;
|
||||
/* If necessary, recognize more trap instructions here. GDB only uses the
|
||||
one. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Provide only a fill function for the general register set. ps_lgetregs
|
||||
will use this for NPTL support. */
|
||||
|
||||
static void ppc_fill_gregset (void *buf)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 32; i++)
|
||||
collect_register (i, (char *) buf + ppc_regmap[i]);
|
||||
|
||||
for (i = 64; i < 70; i++)
|
||||
collect_register (i, (char *) buf + ppc_regmap[i]);
|
||||
}
|
||||
|
||||
#ifdef __ALTIVEC__
|
||||
|
||||
#ifndef PTRACE_GETVRREGS
|
||||
#define PTRACE_GETVRREGS 18
|
||||
#define PTRACE_SETVRREGS 19
|
||||
#endif
|
||||
|
||||
#define SIZEOF_VRREGS 33*16+4
|
||||
|
||||
static void
|
||||
ppc_fill_vrregset (void *buf)
|
||||
{
|
||||
int i, base;
|
||||
char *regset = buf;
|
||||
|
||||
base = find_regno ("vr0");
|
||||
for (i = 0; i < 32; i++)
|
||||
collect_register (base + i, ®set[i * 16]);
|
||||
|
||||
collect_register_by_name ("vscr", ®set[32 * 16 + 12]);
|
||||
collect_register_by_name ("vrsave", ®set[33 * 16]);
|
||||
}
|
||||
|
||||
static void
|
||||
ppc_store_vrregset (const void *buf)
|
||||
{
|
||||
int i, base;
|
||||
const char *regset = buf;
|
||||
|
||||
base = find_regno ("vr0");
|
||||
for (i = 0; i < 32; i++)
|
||||
supply_register (base + i, ®set[i * 16]);
|
||||
|
||||
supply_register_by_name ("vscr", ®set[32 * 16 + 12]);
|
||||
supply_register_by_name ("vrsave", ®set[33 * 16]);
|
||||
}
|
||||
|
||||
#endif /* __ALTIVEC__ */
|
||||
|
||||
struct regset_info target_regsets[] = {
|
||||
/* List the extra register sets before GENERAL_REGS. That way we will
|
||||
fetch them every time, but still fall back to PTRACE_PEEKUSER for the
|
||||
general registers. Some kernels support these, but not the newer
|
||||
PPC_PTRACE_GETREGS. */
|
||||
#ifdef __ALTIVEC__
|
||||
{ PTRACE_GETVRREGS, PTRACE_SETVRREGS, SIZEOF_VRREGS, EXTENDED_REGS,
|
||||
ppc_fill_vrregset, ppc_store_vrregset },
|
||||
#endif
|
||||
{ 0, 0, 0, GENERAL_REGS, ppc_fill_gregset, NULL },
|
||||
{ 0, 0, -1, -1, NULL, NULL }
|
||||
};
|
||||
|
||||
struct linux_target_ops the_low_target = {
|
||||
#ifdef __ALTIVEC__
|
||||
init_registers_powerpc_64,
|
||||
#else
|
||||
init_registers_ppc64,
|
||||
#endif
|
||||
ppc_num_regs,
|
||||
ppc_regmap,
|
||||
ppc_cannot_fetch_register,
|
||||
ppc_cannot_store_register,
|
||||
ppc_get_pc,
|
||||
ppc_set_pc,
|
||||
(const unsigned char *) &ppc_breakpoint,
|
||||
ppc_breakpoint_len,
|
||||
NULL,
|
||||
0,
|
||||
ppc_breakpoint_at,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
ppc_collect_ptrace_register,
|
||||
ppc_supply_ptrace_register,
|
||||
};
|
||||
Loading…
Reference in New Issue