X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386gnu-nat.c;h=f694eba91e573ec758603a5fab53d066cfe5551d;hb=655c5466129d563265e1d218865dbf2e2f067420;hp=cc7d6e5ffc7828c8cf73b976dcecd7d6e9c518f5;hpb=383d750bf39bdc06b42c50c854285345f6d2a848;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c index cc7d6e5ffc..f694eba91e 100644 --- a/gdb/i386gnu-nat.c +++ b/gdb/i386gnu-nat.c @@ -1,5 +1,6 @@ /* Low level interface to i386 running the GNU Hurd. - Copyright 1992, 1995, 1996, 1998, 2000, 2001 + + Copyright 1992, 1995, 1996, 1998, 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -33,9 +34,15 @@ #include #include +#include "i386-tdep.h" + #include "gnu-nat.h" -#include "i387-nat.h" +#include "i387-tdep.h" +#ifdef HAVE_SYS_PROCFS_H +# include +# include "gregset.h" +#endif /* Offset to the thread_state_t location where REG is stored. */ #define REG_OFFSET(reg) offsetof (struct i386_thread_state, reg) @@ -76,18 +83,34 @@ fetch_fpregs (struct proc *thread) { int i; - for (i = FP0_REGNUM; i <= FP7_REGNUM; i++) - supply_register (i, NULL); - for (i = FCTRL_REGNUM; i <= FOP_REGNUM; i++) - supply_register (i, NULL); + for (i = FP0_REGNUM; i <= FOP_REGNUM; i++) + regcache_raw_supply (current_regcache, i, NULL); return; } /* Supply the floating-point registers. */ - i387_supply_fsave (state.hw_state); + i387_supply_fsave (current_regcache, -1, state.hw_state); +} + +#ifdef HAVE_SYS_PROCFS_H +/* These two calls are used by the core-regset.c code for + reading ELF core files. */ +void +supply_gregset (gdb_gregset_t *gregs) +{ + int i; + for (i = 0; i < I386_NUM_GREGS; i++) + regcache_raw_supply (current_regcache, i, REG_ADDR (gregs, i)); } +void +supply_fpregset (gdb_fpregset_t *fpregs) +{ + i387_supply_fsave (current_regcache, -1, fpregs); +} +#endif + /* Fetch register REGNO, or all regs if REGNO is -1. */ void gnu_fetch_registers (int regno) @@ -102,7 +125,7 @@ gnu_fetch_registers (int regno) error ("Can't fetch registers from thread %d: No such thread", PIDGET (inferior_ptid)); - if (regno < NUM_GREGS || regno == -1) + if (regno < I386_NUM_GREGS || regno == -1) { thread_state_t state; @@ -121,20 +144,21 @@ gnu_fetch_registers (int regno) proc_debug (thread, "fetching all register"); - for (i = 0; i < NUM_GREGS; i++) - supply_register (i, REG_ADDR (state, i)); + for (i = 0; i < I386_NUM_GREGS; i++) + regcache_raw_supply (current_regcache, i, REG_ADDR (state, i)); thread->fetched_regs = ~0; } else { proc_debug (thread, "fetching register %s", REGISTER_NAME (regno)); - supply_register (regno, REG_ADDR (state, regno)); + regcache_raw_supply (current_regcache, regno, + REG_ADDR (state, regno)); thread->fetched_regs |= (1 << regno); } } - if (regno >= NUM_GREGS || regno == -1) + if (regno >= I386_NUM_GREGS || regno == -1) { proc_debug (thread, "fetching floating-point registers"); @@ -162,7 +186,7 @@ store_fpregs (struct proc *thread, int regno) } /* FIXME: kettenis/2001-07-15: Is this right? Should we somehow - take into account REGISTER_VALID like the old code did? */ + take into account DEPRECATED_REGISTER_VALID like the old code did? */ i387_fill_fsave (state.hw_state, regno); err = thread_set_state (thread->port, i386_FLOAT_STATE, @@ -179,6 +203,7 @@ store_fpregs (struct proc *thread, int regno) void gnu_store_registers (int regno) { + struct regcache *regcache = current_regcache; struct proc *thread; /* Make sure we know about new threads. */ @@ -189,7 +214,7 @@ gnu_store_registers (int regno) error ("Couldn't store registers into thread %d: No such thread", PIDGET (inferior_ptid)); - if (regno < NUM_GREGS || regno == -1) + if (regno < I386_NUM_GREGS || regno == -1) { thread_state_t state; thread_state_data_t old_state; @@ -216,43 +241,40 @@ gnu_store_registers (int regno) { int check_regno; - for (check_regno = 0; check_regno < NUM_GREGS; check_regno++) + for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++) if ((thread->fetched_regs & (1 << check_regno)) && memcpy (REG_ADDR (&old_state, check_regno), REG_ADDR (state, check_regno), - REGISTER_RAW_SIZE (check_regno))) + register_size (current_gdbarch, check_regno))) /* Register CHECK_REGNO has changed! Ack! */ { warning ("Register %s changed after the thread was aborted", REGISTER_NAME (check_regno)); if (regno >= 0 && regno != check_regno) /* Update GDB's copy of the register. */ - supply_register (check_regno, REG_ADDR (state, check_regno)); + regcache_raw_supply (regcache, check_regno, + REG_ADDR (state, check_regno)); else warning ("... also writing this register! Suspicious..."); } } -#define fill(state, regno) \ - memcpy (REG_ADDR(state, regno), ®isters[REGISTER_BYTE (regno)], \ - REGISTER_RAW_SIZE (regno)) - if (regno == -1) { int i; proc_debug (thread, "storing all registers"); - for (i = 0; i < NUM_GREGS; i++) - if (register_valid[i]) - fill (state, i); + for (i = 0; i < I386_NUM_GREGS; i++) + if (regcache_valid_p (regcache, i)) + regcache_raw_collect (regcache, i, REG_ADDR (state, i)); } else { proc_debug (thread, "storing register %s", REGISTER_NAME (regno)); - gdb_assert (register_valid[regno]); - fill (state, regno); + gdb_assert (regcache_valid_p (regcache, regno)); + regcache_raw_collect (regcache, regno, REG_ADDR (state, regno)); } /* Restore the T bit. */ @@ -260,9 +282,7 @@ gnu_store_registers (int regno) ((struct i386_thread_state *)state)->efl |= trace; } -#undef fill - - if (regno >= NUM_GREGS || regno == -1) + if (regno >= I386_NUM_GREGS || regno == -1) { proc_debug (thread, "storing floating-point registers");