X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386v4-nat.c;h=c21b9ea1d5598d5689ea6dbb27f38d97826c6fa9;hb=384e1a6106a6de8ed9e5df2cab4e90b62420902e;hp=10802cb730b8d88183b33711f799916b5351ab75;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386v4-nat.c b/gdb/i386v4-nat.c index 10802cb730..c21b9ea1d5 100644 --- a/gdb/i386v4-nat.c +++ b/gdb/i386v4-nat.c @@ -1,5 +1,8 @@ -/* Native-dependent code for SVR4 Unix running on i386's, for GDB. - Copyright 1988, 1989, 1991, 1992, 1996, 1998 Free Software Foundation, Inc. +/* Native-dependent code for Unix SVR4 running on i386's. + + Copyright 1988, 1989, 1991, 1992, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2004 + Free Software Foundation, Inc. This file is part of GDB. @@ -21,25 +24,34 @@ #include "defs.h" #include "value.h" #include "inferior.h" +#include "regcache.h" #ifdef HAVE_SYS_REG_H #include #endif +#include "i386-tdep.h" +#include "i387-tdep.h" #ifdef HAVE_SYS_PROCFS_H #include -/* The /proc interface divides the target machine's register set up into - two different sets, the general register set (gregset) and the floating - point register set (fpregset). For each set, there is an ioctl to get - the current register set and another ioctl to set the current values. +/* We must not compile this code for 64-bit Solaris x86. */ +#if !defined (PR_MODEL_NATIVE) || (PR_MODEL_NATIVE == PR_MODEL_ILP32) + +#include "gregset.h" + +/* The `/proc' interface divides the target machine's register set up + into two different sets, the general purpose register set (gregset) + and the floating-point register set (fpregset). For each set, + there is an ioctl to get the current register set and another ioctl + to set the current values. - The actual structure passed through the ioctl interface is, of course, - naturally machine dependent, and is different for each set of registers. - For the i386 for example, the general register set is typically defined - by: + The actual structure passed through the ioctl interface is, of + course, naturally machine dependent, and is different for each set + of registers. For the i386 for example, the general-purpose + register set is typically defined by: typedef int gregset_t[19]; (in ) @@ -49,125 +61,105 @@ #define UESP 17 #define SS 18 - and the floating point set by: - - typedef struct fpregset - { - union - { - struct fpchip_state // fp extension state // - { - int state[27]; // 287/387 saved state // - int status; // status word saved at exception // - } fpchip_state; - struct fp_emul_space // for emulators // - { - char fp_emul[246]; - char fp_epad[2]; - } fp_emul_space; - int f_fpregs[62]; // union of the above // - } fp_reg_set; - long f_wregs[33]; // saved weitek state // + and the floating-point set by: + + typedef struct fpregset { + union { + struct fpchip_state // fp extension state // + { + int state[27]; // 287/387 saved state // + int status; // status word saved at // + // exception // + } fpchip_state; + struct fp_emul_space // for emulators // + { + char fp_emul[246]; + char fp_epad[2]; + } fp_emul_space; + int f_fpregs[62]; // union of the above // + } fp_reg_set; + long f_wregs[33]; // saved weitek state // } fpregset_t; - These routines provide the packing and unpacking of gregset_t and - fpregset_t formatted data. + Incidentally fpchip_state contains the FPU state in the same format + as used by the "fsave" instruction, and that's the only thing we + support here. I don't know how the emulator stores it state. The + Weitek stuff definitely isn't supported. - */ + The routines defined here, provide the packing and unpacking of + gregset_t and fpregset_t formatted data. */ #ifdef HAVE_GREGSET_T -/* This is a duplicate of the table in i386-xdep.c. */ - +/* Mapping between the general-purpose registers in `/proc' + format and GDB's register array layout. */ static int regmap[] = { EAX, ECX, EDX, EBX, UESP, EBP, ESI, EDI, EIP, EFL, CS, SS, - DS, ES, FS, GS, + DS, ES, FS, GS }; -/* Prototypes for local functions */ - -void fill_gregset PARAMS ((gregset_t *, int)); - -void supply_gregset PARAMS ((gregset_t *)); - -void supply_fpregset PARAMS ((fpregset_t *)); - -void fill_fpregset PARAMS ((fpregset_t *, int)); - - -/* FIXME: These routine absolutely depends upon (NUM_REGS - NUM_FREGS) - being less than or equal to the number of registers that can be stored - in a gregset_t. Note that with the current scheme there will typically - be more registers actually stored in a gregset_t that what we know - about. This is bogus and should be fixed. */ - -/* Given a pointer to a general register set in /proc format (gregset_t *), - unpack the register contents and supply them as gdb's idea of the current - register values. */ +/* Fill GDB's register array with the general-purpose register values + in *GREGSETP. */ void -supply_gregset (gregsetp) - gregset_t *gregsetp; +supply_gregset (gregset_t *gregsetp) { - register int regi; - register greg_t *regp = (greg_t *) gregsetp; - extern int regmap[]; - - for (regi = 0; regi < (NUM_REGS - NUM_FREGS); regi++) - { - supply_register (regi, (char *) (regp + regmap[regi])); - } + greg_t *regp = (greg_t *) gregsetp; + int regnum; + + for (regnum = 0; regnum < I386_NUM_GREGS; regnum++) + regcache_raw_supply (current_regcache, regnum, regp + regmap[regnum]); } +/* Fill register REGNUM (if it is a general-purpose register) in + *GREGSETPS with the value in GDB's register array. If REGNUM is -1, + do this for all registers. */ + void -fill_gregset (gregsetp, regno) - gregset_t *gregsetp; - int regno; +fill_gregset (gregset_t *gregsetp, int regnum) { - int regi; - register greg_t *regp = (greg_t *) gregsetp; - extern int regmap[]; - - for (regi = 0; regi < (NUM_REGS - NUM_FREGS); regi++) - { - if ((regno == -1) || (regno == regi)) - { - *(regp + regmap[regi]) = *(int *) ®isters[REGISTER_BYTE (regi)]; - } - } + greg_t *regp = (greg_t *) gregsetp; + int i; + + for (i = 0; i < I386_NUM_GREGS; i++) + if (regnum == -1 || regnum == i) + regcache_raw_collect (current_regcache, i, regp + regmap[i]); } #endif /* HAVE_GREGSET_T */ -#if defined (FP0_REGNUM) && defined (HAVE_FPREGSET_T) +#ifdef HAVE_FPREGSET_T -/* Given a pointer to a floating point register set in /proc format - (fpregset_t *), unpack the register contents and supply them as gdb's - idea of the current floating point register values. */ +/* Fill GDB's register array with the floating-point register values in + *FPREGSETP. */ void -supply_fpregset (fpregsetp) - fpregset_t *fpregsetp; +supply_fpregset (fpregset_t *fpregsetp) { - /* FIXME: see m68k-tdep.c for an example, for the m68k. */ + if (FP0_REGNUM == 0) + return; + + i387_supply_fsave (current_regcache, -1, fpregsetp); } -/* Given a pointer to a floating point register set in /proc format - (fpregset_t *), update the register specified by REGNO from gdb's idea - of the current floating point register set. If REGNO is -1, update - them all. */ +/* 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. */ void -fill_fpregset (fpregsetp, regno) - fpregset_t *fpregsetp; - int regno; +fill_fpregset (fpregset_t *fpregsetp, int regno) { - /* FIXME: see m68k-tdep.c for an example, for the m68k. */ + if (FP0_REGNUM == 0) + return; + + i387_fill_fsave ((char *) fpregsetp, regno); } -#endif /* defined (FP0_REGNUM) && defined (HAVE_FPREGSET_T) */ +#endif /* HAVE_FPREGSET_T */ + +#endif /* not 64-bit. */ #endif /* HAVE_SYS_PROCFS_H */