X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386bsd-nat.c;h=ec38e135717919c1bb396d4b650088c290a46fb9;hb=3c23e6fb7e41ca97c5e25921080f61b1be84d461;hp=c4def7e568f6d2a624eba4e4bf37b29cf7acabb9;hpb=e6031aeb52be6c31dc1c7cbd7c74de76a114ad02;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c index c4def7e568..ec38e13571 100644 --- a/gdb/i386bsd-nat.c +++ b/gdb/i386bsd-nat.c @@ -1,5 +1,5 @@ /* Native-dependent code for modern i386 BSD's. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GDB. @@ -20,7 +20,11 @@ #include "defs.h" #include "inferior.h" +#include "regcache.h" +#include "gdb_assert.h" +#include +#include #include #include #include @@ -38,6 +42,10 @@ typedef struct reg gregset_t; typedef struct fpreg fpregset_t; #endif +#include "gregset.h" +#include "i386-tdep.h" + + /* In older BSD versions we cannot get at some of the segment registers. FreeBSD for example didn't support the %fs and %gs registers until the 3.0 release. We have autoconf checks for their @@ -50,7 +58,7 @@ typedef struct fpreg fpregset_t; /* Registers we shouldn't try to store. */ #if !defined (CANNOT_STORE_REGISTER) -#define CANNOT_STORE_REGISTER(regno) CANNOT_FETCH_REGISTER (regno) +#define CANNOT_STORE_REGISTER(regno) cannot_fetch_register (regno) #endif /* Offset to the gregset_t location where REG is stored. */ @@ -64,7 +72,7 @@ static int reg_offset[] = REG_OFFSET (r_eax), REG_OFFSET (r_ecx), REG_OFFSET (r_edx), - REG_OFFSET (r_edx), + REG_OFFSET (r_ebx), REG_OFFSET (r_esp), REG_OFFSET (r_ebp), REG_OFFSET (r_esi), @@ -75,12 +83,12 @@ static int reg_offset[] = REG_OFFSET (r_ss), REG_OFFSET (r_ds), REG_OFFSET (r_es), -#ifdef HAVE_R_FS +#ifdef HAVE_STRUCT_REG_R_FS REG_OFFSET (r_fs), #else -1, #endif -#ifdef HAVE_R_GS +#ifdef HAVE_STRUCT_REG_R_GS REG_OFFSET (r_gs) #else -1 @@ -89,6 +97,16 @@ static int reg_offset[] = #define REG_ADDR(regset, regno) ((char *) (regset) + reg_offset[regno]) +/* Macro to determine if a register is fetched with PT_GETREGS. */ +#define GETREGS_SUPPLIES(regno) \ + ((0 <= (regno) && (regno) <= 15)) + +#ifdef HAVE_PT_GETXMMREGS +/* Set to 1 if the kernel supports PT_GETXMMREGS. Initialized to -1 + so that we try PT_GETXMMREGS the first time around. */ +static int have_ptrace_xmmregs = -1; +#endif + /* Return nonzero if we shouldn't try to fetch register REGNO. */ static int @@ -100,22 +118,18 @@ cannot_fetch_register (int regno) /* Transfering the registers between GDB, inferiors and core files. */ -/* Fill GDB's register array with the genereal-purpose register values +/* Fill GDB's register array with the general-purpose register values in *GREGSETP. */ void supply_gregset (gregset_t *gregsetp) { - char buf[MAX_REGISTER_RAW_SIZE]; int i; - for (i = 0; i < NUM_GREGS; i++) + for (i = 0; i < I386_NUM_GREGS; i++) { if (CANNOT_FETCH_REGISTER (i)) - { - memset (buf, 0, REGISTER_RAW_SIZE (i)); - supply_register (i, buf); - } + supply_register (i, NULL); else supply_register (i, REG_ADDR (gregsetp, i)); } @@ -130,13 +144,12 @@ fill_gregset (gregset_t *gregsetp, int regno) { int i; - for (i = 0; i < NUM_GREGS; i++) + for (i = 0; i < I386_NUM_GREGS; i++) if ((regno == -1 || regno == i) && ! CANNOT_STORE_REGISTER (i)) - memcpy (REG_ADDR (gregsetp, i), ®isters[REGISTER_BYTE (regno)], - REGISTER_RAW_SIZE (i)); + regcache_collect (i, REG_ADDR (gregsetp, i)); } -#include "i387-nat.h" +#include "i387-tdep.h" /* Fill GDB's register array with the floating-point register values in *FPREGSETP. */ @@ -163,24 +176,50 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) void fetch_inferior_registers (int regno) { - gregset_t gregs; - if (ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (regno == -1 || GETREGS_SUPPLIES (regno)) + { + gregset_t gregs; - supply_gregset (&gregs); + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't get registers"); + + supply_gregset (&gregs); + if (regno != -1) + return; + } if (regno == -1 || regno >= FP0_REGNUM) { fpregset_t fpregs; +#ifdef HAVE_PT_GETXMMREGS + char xmmregs[512]; - if (ptrace (PT_GETFPREGS, inferior_pid, + if (have_ptrace_xmmregs != 0 && + ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) xmmregs, 0) == 0) + { + have_ptrace_xmmregs = 1; + i387_supply_fxsave (xmmregs); + } + else + { + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + supply_fpregset (&fpregs); + } +#else + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) perror_with_name ("Couldn't get floating point status"); supply_fpregset (&fpregs); +#endif } -} +} /* Store register REGNO back into the inferior. If REGNO is -1, do this for all registers (including the floating point registers). */ @@ -188,33 +227,140 @@ fetch_inferior_registers (int regno) void store_inferior_registers (int regno) { - gregset_t gregs; - if (ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (regno == -1 || GETREGS_SUPPLIES (regno)) + { + gregset_t gregs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't get registers"); + + fill_gregset (&gregs, regno); - fill_gregset (&gregs, regno); + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't write registers"); - if (ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + if (regno != -1) + return; + } if (regno == -1 || regno >= FP0_REGNUM) { fpregset_t fpregs; +#ifdef HAVE_PT_GETXMMREGS + char xmmregs[512]; - if (ptrace (PT_GETFPREGS, inferior_pid, - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + if (have_ptrace_xmmregs != 0 && + ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) xmmregs, 0) == 0) + { + have_ptrace_xmmregs = 1; - fill_fpregset (&fpregs, regno); + i387_fill_fxsave (xmmregs, regno); + + if (ptrace (PT_SETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) xmmregs, 0) == -1) + perror_with_name ("Couldn't write XMM registers"); + } + else + { + have_ptrace_xmmregs = 0; +#endif + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + fill_fpregset (&fpregs, regno); - if (ptrace (PT_SETFPREGS, inferior_pid, - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating point status"); +#ifdef HAVE_PT_GETXMMREGS + } +#endif } } +/* Support for debug registers. */ + +#ifdef HAVE_PT_GETDBREGS + +/* Not all versions of FreeBSD/i386 that support the debug registers + have this macro. */ +#ifndef DBREG_DRX +#define DBREG_DRX(d, x) ((&d->dr0)[x]) +#endif + +static void +i386bsd_dr_set (int regnum, unsigned int value) +{ + struct dbreg dbregs; + + if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &dbregs, 0) == -1) + perror_with_name ("Couldn't get debug registers"); + + /* For some mysterious reason, some of the reserved bits in the + debug control register get set. Mask these off, otherwise the + ptrace call below will fail. */ + DBREG_DRX ((&dbregs), 7) &= ~(0x0000fc00); + + DBREG_DRX ((&dbregs), regnum) = value; + + if (ptrace (PT_SETDBREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &dbregs, 0) == -1) + perror_with_name ("Couldn't write debug registers"); +} + +void +i386bsd_dr_set_control (unsigned long control) +{ + i386bsd_dr_set (7, control); +} + +void +i386bsd_dr_set_addr (int regnum, CORE_ADDR addr) +{ + gdb_assert (regnum >= 0 && regnum <= 4); + + i386bsd_dr_set (regnum, addr); +} + +void +i386bsd_dr_reset_addr (int regnum) +{ + gdb_assert (regnum >= 0 && regnum <= 4); + + i386bsd_dr_set (regnum, 0); +} + +unsigned long +i386bsd_dr_get_status (void) +{ + struct dbreg dbregs; + + /* FIXME: kettenis/2001-03-31: Calling perror_with_name if the + ptrace call fails breaks debugging remote targets. The correct + way to fix this is to add the hardware breakpoint and watchpoint + stuff to the target vector. For now, just return zero if the + ptrace call fails. */ + if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) & dbregs, 0) == -1) +#if 0 + perror_with_name ("Couldn't read debug registers"); +#else + return 0; +#endif + + return DBREG_DRX ((&dbregs), 6); +} + +#endif /* PT_GETDBREGS */ + + /* Support for the user struct. */ /* Return the address register REGNO. BLOCKEND is the value of @@ -236,3 +382,65 @@ kernel_u_size (void) { return (sizeof (struct user)); } + +void +_initialize_i386bsd_nat (void) +{ + int sc_pc_offset; + int sc_sp_offset; + + /* To support the recognition of signal handlers, i386bsd-tdep.c + hardcodes some constants. Inclusion of this file means that we + are compiling a native debugger, which means that we can use the + system header files and sysctl(3) to get at the relevant + information. */ + +#if defined (__FreeBSD_version) && __FreeBSD_version >= 400011 + extern int i386fbsd4_sc_pc_offset; + extern int i386fbsd4_sc_sp_offset; +#define SC_PC_OFFSET i386fbsd4_sc_pc_offset +#define SC_SP_OFFSET i386fbsd4_sc_sp_offset +#elif defined (NetBSD) || defined (__NetBSD_Version__) + extern int i386nbsd_sc_pc_offset; + extern int i386nbsd_sc_sp_offset; +#define SC_PC_OFFSET i386nbsd_sc_pc_offset +#define SC_SP_OFFSET i386nbsd_sc_sp_offset +#elif defined (OpenBSD) + extern int i386obsd_sc_pc_offset; + extern int i386obsd_sc_sp_offset; +#define SC_PC_OFFSET i386obsd_sc_pc_offset +#define SC_SP_OFFSET i386obsd_sc_sp_offset +#else + extern int i386bsd_sc_pc_offset; + extern int i386bsd_sc_sp_offset; +#define SC_PC_OFFSET i386bsd_sc_pc_offset +#define SC_SP_OFFSET i386bsd_sc_sp_offset +#endif + + /* Override the default value for the offset of the program counter + in the sigcontext structure. */ + sc_pc_offset = offsetof (struct sigcontext, sc_pc); + + if (SC_PC_OFFSET != sc_pc_offset) + { + warning ("\ +offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n\ +Please report this to .", + sc_pc_offset, SC_PC_OFFSET); + } + + SC_PC_OFFSET = sc_pc_offset; + + /* Likewise for the stack pointer. */ + sc_sp_offset = offsetof (struct sigcontext, sc_sp); + + if (SC_SP_OFFSET != sc_sp_offset) + { + warning ("\ +offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n\ +Please report this to .", + sc_sp_offset, SC_SP_OFFSET); + } + + SC_SP_OFFSET = sc_sp_offset; +}