2004-05-07 Randolph Chung <tausq@debian.org>

* Makefile.in (ALLDEPFILES): Add hppa-linux-tdep.c and
	hppa-linux-nat.c.
	(hppa-linux-tdep.o, hppa-linux-nat.o): Define rules.
	* hppa-linux-nat.c (fetch_register, store_register): Define.
	(fetch_inferior_registers, store_inferior_registers): Define.
	(supply_gregset): Add comment and clean up some unneeded code.
	(fill_gregset): Add comment and fix so that it saves registers in
	the right place in the gregset.
	(fill_fpregset): Fix buffer overrun problem.
	* config/pa/nm-linux.h (FETCH_INFERIOR_REGISTERS): Define.
This commit is contained in:
Randolph Chung 2004-05-08 03:27:24 +00:00
parent 0da28f8a58
commit 959464ff2c
4 changed files with 134 additions and 21 deletions

View File

@ -1,3 +1,16 @@
2004-05-07 Randolph Chung <tausq@debian.org>
* Makefile.in (ALLDEPFILES): Add hppa-linux-tdep.c and
hppa-linux-nat.c.
(hppa-linux-tdep.o, hppa-linux-nat.o): Define rules.
* hppa-linux-nat.c (fetch_register, store_register): Define.
(fetch_inferior_registers, store_inferior_registers): Define.
(supply_gregset): Add comment and clean up some unneeded code.
(fill_gregset): Add comment and fix so that it saves registers in
the right place in the gregset.
(fill_fpregset): Fix buffer overrun problem.
* config/pa/nm-linux.h (FETCH_INFERIOR_REGISTERS): Define.
2004-05-07 Randolph Chung <tausq@debian.org>
* hppa-tdep.c (hppa_frame_prev_register_helper): New function to

View File

@ -1329,6 +1329,7 @@ ALLDEPFILES = \
go32-nat.c h8300-tdep.c \
hppa-tdep.c hppa-hpux-tdep.c \
hppah-nat.c hpread.c \
hppa-linux-tdep.c hppa-linux-nat.c \
i386-tdep.c i386v-nat.c i386-linux-nat.c \
i386v4-nat.c i386ly-tdep.c i386-cygwin-tdep.c \
i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \
@ -1837,6 +1838,12 @@ hppa-tdep.o: hppa-tdep.c $(defs_h) $(frame_h) $(bfd_h) $(inferior_h) \
$(frame_base_h) $(a_out_encap_h) $(gdb_stat_h) $(gdb_wait_h) \
$(gdbcore_h) $(gdbcmd_h) $(target_h) $(symfile_h) $(objfiles_h) \
$(hppa_tdep_h)
hppa-linux-tdep.o: hppa-linux-tdep.c $(defs_h) $(gdbcore_h) $(osabi_h) \
$(target_h) $(objfiles_h) $(solib_svr4_h) $(glibc_tdep_h) \
$(frame_unwind_h) $(trad_frame_h) $(dwarf2_frame_h) $(hppa_tdep_h) \
$(elf_common_h)
hppa-linux-nat.o: hppa-linux-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \
$(gdb_string_h) $(inferior_h)
hpread.o: hpread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(hp_symtab_h) \
$(syms_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \
$(complaints_h) $(gdb_stabs_h) $(gdbtypes_h) $(demangle_h) \

View File

@ -25,5 +25,8 @@
#define U_REGS_OFFSET 0
/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */
#define FETCH_INFERIOR_REGISTERS
#endif

View File

@ -22,8 +22,10 @@
#include "gdbcore.h"
#include "regcache.h"
#include "gdb_string.h"
#include "inferior.h"
#include <sys/procfs.h>
#include <sys/ptrace.h>
#include <string.h>
#include <asm/offsets.h>
@ -201,6 +203,99 @@ static const int greg_map[] =
HPPA_CCR_REGNUM, HPPA_EIEM_REGNUM,
};
/* Fetch one register. */
static void
fetch_register (int regno)
{
int tid;
int val;
if (CANNOT_FETCH_REGISTER (regno))
{
supply_register (regno, NULL);
return;
}
/* GNU/Linux LWP ID's are process ID's. */
tid = TIDGET (inferior_ptid);
if (tid == 0)
tid = PIDGET (inferior_ptid); /* Not a threaded program. */
errno = 0;
val = ptrace (PTRACE_PEEKUSER, tid, register_addr (regno, 0), 0);
if (errno != 0)
error ("Couldn't read register %s (#%d): %s.", REGISTER_NAME (regno),
regno, safe_strerror (errno));
regcache_raw_supply (current_regcache, regno, &val);
}
/* Store one register. */
static void
store_register (int regno)
{
int tid;
int val;
if (CANNOT_STORE_REGISTER (regno))
return;
/* GNU/Linux LWP ID's are process ID's. */
tid = TIDGET (inferior_ptid);
if (tid == 0)
tid = PIDGET (inferior_ptid); /* Not a threaded program. */
errno = 0;
regcache_raw_collect (current_regcache, regno, &val);
ptrace (PTRACE_POKEUSER, tid, register_addr (regno, 0), val);
if (errno != 0)
error ("Couldn't write register %s (#%d): %s.", REGISTER_NAME (regno),
regno, safe_strerror (errno));
}
/* Fetch registers from the child process. Fetch all registers if
regno == -1, otherwise fetch all general registers or all floating
point registers depending upon the value of regno. */
void
fetch_inferior_registers (int regno)
{
if (-1 == regno)
{
for (regno = 0; regno < NUM_REGS; regno++)
fetch_register (regno);
}
else
{
fetch_register (regno);
}
}
/* Store registers back into the inferior. Store all registers if
regno == -1, otherwise store all general registers or all floating
point registers depending upon the value of regno. */
void
store_inferior_registers (int regno)
{
if (-1 == regno)
{
for (regno = 0; regno < NUM_REGS; regno++)
store_register (regno);
}
else
{
store_register (regno);
}
}
/* Fill GDB's register array with the general-purpose register values
in *gregsetp. */
void
supply_gregset (gdb_gregset_t *gregsetp)
{
@ -210,28 +305,26 @@ supply_gregset (gdb_gregset_t *gregsetp)
for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++)
{
int regno = greg_map[i];
int size = register_size (current_gdbarch, regno);
/* When running a 64 bit kernel, a greg_t may be larger than the
actual register, so just pick off the LS bits of big-endian word. */
supply_register (regno, ((char *) (regp + 1)) - size);
supply_register (regno, regp);
}
}
/* Fill register regno (if it is a general-purpose register) in
*gregsetp with the appropriate value from GDB's register array.
If regno is -1, do this for all registers. */
void
fill_gregset (gdb_gregset_t *gregsetp, int regno)
{
int i;
greg_t *regp = (greg_t *) gregsetp;
memset (gregsetp, 0, sizeof (*gregsetp));
for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++)
for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++)
{
int regi = greg_map[i];
int mregno = greg_map[i];
if (regno == -1 || regi == regno)
if (regno == -1 || regno == mregno)
{
int rawsize = register_size (current_gdbarch, regi);
regcache_collect (regi, ((char *) (regp + 1)) - rawsize);
regcache_collect(mregno, &(*gregsetp)[i]);
}
}
}
@ -264,16 +357,13 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
{
int i;
for (i = 0; i < NUM_REGS; i++)
for (i = HPPA_FP0_REGNUM; i < HPPA_FP0_REGNUM + 32 * 2; i++)
{
if (regno == -1 || regno == i)
{
/* Gross. fpregset_t is double, registers[x] has single
precision reg. */
char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]);
if ((i - HPPA_FP0_REGNUM) & 1)
to += 4;
regcache_collect (i, to);
}
/* Gross. fpregset_t is double, registers[x] has single
precision reg. */
char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]);
if ((i - HPPA_FP0_REGNUM) & 1)
to += 4;
regcache_collect (i, to);
}
}