X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386bsd-nat.c;h=349112a4ad0cfd18721fe2678603f3104855c308;hb=b1acf338d3974d99af32899092989edeee7fbef4;hp=9827afcaebd5e0516b5559e6b6bb3118fb563041;hpb=256304449f3723704990160e7fa4496c02b92b2f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c index 9827afcaeb..349112a4ad 100644 --- a/gdb/i386bsd-nat.c +++ b/gdb/i386bsd-nat.c @@ -1,5 +1,6 @@ /* Native-dependent code for modern i386 BSD's. - Copyright 2000, 2001 Free Software Foundation, Inc. + + Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -30,19 +31,10 @@ #include #include -#ifdef HAVE_SYS_PROCFS_H -#include -#endif - -#ifndef HAVE_GREGSET_T -typedef struct reg gregset_t; -#endif - -#ifndef HAVE_FPREGSET_T -typedef struct fpreg fpregset_t; -#endif - -#include "gregset.h" +#include "i386-tdep.h" +#include "i387-tdep.h" +#include "i386bsd-nat.h" +#include "inf-ptrace.h" /* In older BSD versions we cannot get at some of the segment @@ -50,28 +42,18 @@ typedef struct fpreg fpregset_t; registers until the 3.0 release. We have autoconf checks for their presence, and deal gracefully with their absence. */ -/* Registers we shouldn't try to fetch. */ -#if !defined (CANNOT_FETCH_REGISTER) -#define CANNOT_FETCH_REGISTER(regno) cannot_fetch_register (regno) -#endif - -/* Registers we shouldn't try to store. */ -#if !defined (CANNOT_STORE_REGISTER) -#define CANNOT_STORE_REGISTER(regno) cannot_fetch_register (regno) -#endif - -/* Offset to the gregset_t location where REG is stored. */ -#define REG_OFFSET(reg) offsetof (gregset_t, reg) +/* Offset in `struct reg' where MEMBER is stored. */ +#define REG_OFFSET(member) offsetof (struct reg, member) -/* At reg_offset[REGNO] you'll find the offset to the gregset_t - location where the GDB register REGNO is stored. Unsupported +/* At i386bsd_reg_offset[REGNUM] you'll find the offset in `struct + reg' where the GDB register REGNUM is stored. Unsupported registers are marked with `-1'. */ -static int reg_offset[] = +static int i386bsd_r_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), @@ -94,131 +76,181 @@ static int reg_offset[] = #endif }; -#define REG_ADDR(regset, regno) ((char *) (regset) + reg_offset[regno]) - -/* Return nonzero if we shouldn't try to fetch register REGNO. */ +/* Macro to determine if a register is fetched with PT_GETREGS. */ +#define GETREGS_SUPPLIES(regnum) \ + ((0 <= (regnum) && (regnum) <= 15)) -static int -cannot_fetch_register (int regno) -{ - return (reg_offset[regno] == -1); -} +#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 -/* Transfering the registers between GDB, inferiors and core files. */ +/* Supply the general-purpose registers in GREGS, to REGCACHE. */ -/* Fill GDB's register array with the general-purpose register values - in *GREGSETP. */ - -void -supply_gregset (gregset_t *gregsetp) +static void +i386bsd_supply_gregset (struct regcache *regcache, const void *gregs) { - int i; + const char *regs = gregs; + int regnum; - for (i = 0; i < NUM_GREGS; i++) + for (regnum = 0; regnum < ARRAY_SIZE (i386bsd_r_reg_offset); regnum++) { - if (CANNOT_FETCH_REGISTER (i)) - supply_register (i, NULL); - else - supply_register (i, REG_ADDR (gregsetp, i)); + int offset = i386bsd_r_reg_offset[regnum]; + + if (offset != -1) + regcache_raw_supply (regcache, regnum, regs + offset); } } -/* 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. */ +/* Collect register REGNUM from REGCACHE and store its contents in + GREGS. If REGNUM is -1, collect and store all appropriate + registers. */ -void -fill_gregset (gregset_t *gregsetp, int regno) +static void +i386bsd_collect_gregset (const struct regcache *regcache, + void *gregs, int regnum) { + char *regs = gregs; int i; - for (i = 0; i < NUM_GREGS; i++) - if ((regno == -1 || regno == i) && ! CANNOT_STORE_REGISTER (i)) - memcpy (REG_ADDR (gregsetp, i), ®isters[REGISTER_BYTE (i)], - REGISTER_RAW_SIZE (i)); -} - -#include "i387-nat.h" - -/* Fill GDB's register array with the floating-point register values - in *FPREGSETP. */ - -void -supply_fpregset (fpregset_t *fpregsetp) -{ - i387_supply_fsave ((char *) fpregsetp); -} - -/* Fill register REGNO (if it is a floating-point register) in - *FPREGSETP with the value in GDB's register array. If REGNO is -1, - do this for all registers. */ + for (i = 0; i < ARRAY_SIZE (i386bsd_r_reg_offset); i++) + { + if (regnum == -1 || regnum == i) + { + int offset = i386bsd_r_reg_offset[i]; -void -fill_fpregset (fpregset_t *fpregsetp, int regno) -{ - i387_fill_fsave ((char *) fpregsetp, regno); + if (offset != -1) + regcache_raw_collect (regcache, i, regs + offset); + } + } } -/* Fetch register REGNO from the inferior. If REGNO is -1, do this +/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this for all registers (including the floating point registers). */ -void -fetch_inferior_registers (int regno) +static void +i386bsd_fetch_inferior_registers (int regnum) { - gregset_t gregs; + if (regnum == -1 || GETREGS_SUPPLIES (regnum)) + { + struct reg regs; - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); - supply_gregset (&gregs); + i386bsd_supply_gregset (current_regcache, ®s); + if (regnum != -1) + return; + } - if (regno == -1 || regno >= FP0_REGNUM) + if (regnum == -1 || regnum >= I386_ST0_REGNUM) { - fpregset_t fpregs; + struct fpreg fpregs; +#ifdef HAVE_PT_GETXMMREGS + char xmmregs[512]; + + if (have_ptrace_xmmregs != 0 + && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) xmmregs, 0) == 0) + { + have_ptrace_xmmregs = 1; + i387_supply_fxsave (current_regcache, -1, xmmregs); + } + else + { + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + i387_supply_fsave (current_regcache, -1, &fpregs); + } +#else if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name ("Couldn't get floating point status"); - supply_fpregset (&fpregs); + i387_supply_fsave (current_regcache, -1, &fpregs); +#endif } } -/* Store register REGNO back into the inferior. If REGNO is -1, do +/* Store register REGNUM back into the inferior. If REGNUM is -1, do this for all registers (including the floating point registers). */ -void -store_inferior_registers (int regno) +static void +i386bsd_store_inferior_registers (int regnum) { - gregset_t gregs; + if (regnum == -1 || GETREGS_SUPPLIES (regnum)) + { + struct reg regs; - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); - fill_gregset (&gregs, regno); + i386bsd_collect_gregset (current_regcache, ®s, regnum); - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name ("Couldn't write registers"); - if (regno == -1 || regno >= FP0_REGNUM) + if (regnum != -1) + return; + } + + if (regnum == -1 || regnum >= I386_ST0_REGNUM) { - fpregset_t fpregs; + struct fpreg fpregs; +#ifdef HAVE_PT_GETXMMREGS + char xmmregs[512]; + + if (have_ptrace_xmmregs != 0 + && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) xmmregs, 0) == 0) + { + have_ptrace_xmmregs = 1; + + i387_collect_fxsave (current_regcache, regnum, xmmregs); + + if (ptrace (PT_SETXMMREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) 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_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + i387_collect_fsave (current_regcache, regnum, &fpregs); - fill_fpregset (&fpregs, regno); - - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating point status"); +#ifdef HAVE_PT_GETXMMREGS + } +#endif } } + +/* Create a prototype *BSD/i386 target. The client can override it + with local methods. */ + +struct target_ops * +i386bsd_target (void) +{ + struct target_ops *t; + + t = inf_ptrace_target (); + t->to_fetch_registers = i386bsd_fetch_inferior_registers; + t->to_store_registers = i386bsd_store_inferior_registers; + return t; +} /* Support for debug registers. */ @@ -237,18 +269,18 @@ i386bsd_dr_set (int regnum, unsigned int value) struct dbreg dbregs; if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &dbregs, 0) == -1) + (PTRACE_TYPE_ARG3) &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. */ - dbregs.dr7 &= ~(0x0000fc00); + DBREG_DRX ((&dbregs), 7) &= ~(0x0000fc00); DBREG_DRX ((&dbregs), regnum) = value; if (ptrace (PT_SETDBREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &dbregs, 0) == -1) + (PTRACE_TYPE_ARG3) &dbregs, 0) == -1) perror_with_name ("Couldn't write debug registers"); } @@ -285,14 +317,14 @@ i386bsd_dr_get_status (void) 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) + (PTRACE_TYPE_ARG3) &dbregs, 0) == -1) #if 0 perror_with_name ("Couldn't read debug registers"); #else return 0; #endif - return dbregs.dr6; + return DBREG_DRX ((&dbregs), 6); } #endif /* PT_GETDBREGS */ @@ -300,13 +332,15 @@ i386bsd_dr_get_status (void) /* Support for the user struct. */ -/* Return the address register REGNO. BLOCKEND is the value of +/* Return the address register REGNUM. BLOCKEND is the value of u.u_ar0, which should point to the registers. */ CORE_ADDR -register_u_addr (CORE_ADDR blockend, int regno) +register_u_addr (CORE_ADDR blockend, int regnum) { - return (CORE_ADDR) REG_ADDR (blockend, regno); + gdb_assert (regnum >= 0 && regnum < ARRAY_SIZE (i386bsd_r_reg_offset)); + + return blockend + i386bsd_r_reg_offset[regnum]; } #include @@ -320,19 +354,78 @@ kernel_u_size (void) return (sizeof (struct user)); } -/* See i386bsd-tdep.c. */ -extern int i386bsd_sigcontext_pc_offset; - void _initialize_i386bsd_nat (void) { + int 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 +#define SC_REG_OFFSET i386fbsd4_sc_reg_offset +#elif defined (__FreeBSD_version) && __FreeBSD_version >= 300005 +#define SC_REG_OFFSET i386fbsd_sc_reg_offset +#elif defined (NetBSD) || defined (__NetBSD_Version__) +#define SC_REG_OFFSET i386nbsd_sc_reg_offset +#elif defined (OpenBSD) +#define SC_REG_OFFSET i386obsd_sc_reg_offset +#endif + +#ifdef SC_REG_OFFSET + + /* We only check the program counter, stack pointer and frame + pointer since these members of `struct sigcontext' are essential + for providing backtraces. More checks could be added, but would + involve adding configure checks for the appropriate structure + members, since older BSD's don't provide all of them. */ + +#define SC_PC_OFFSET SC_REG_OFFSET[I386_EIP_REGNUM] +#define SC_SP_OFFSET SC_REG_OFFSET[I386_ESP_REGNUM] +#define SC_FP_OFFSET SC_REG_OFFSET[I386_EBP_REGNUM] + /* Override the default value for the offset of the program counter in the sigcontext structure. */ - i386bsd_sigcontext_pc_offset = offsetof (struct sigcontext, sc_pc); + offset = offsetof (struct sigcontext, sc_pc); + + if (SC_PC_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n\ +Please report this to .", + offset, SC_PC_OFFSET); + } + + SC_PC_OFFSET = offset; + + /* Likewise for the stack pointer. */ + offset = offsetof (struct sigcontext, sc_sp); + + if (SC_SP_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n\ +Please report this to .", + offset, SC_SP_OFFSET); + } + + SC_SP_OFFSET = offset; + + /* And the frame pointer. */ + offset = offsetof (struct sigcontext, sc_fp); + + if (SC_FP_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n\ +Please report this to .", + offset, SC_FP_OFFSET); + } + + SC_FP_OFFSET = offset; + +#endif /* SC_REG_OFFSET */ }