X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386gnu-nat.c;h=f694eba91e573ec758603a5fab53d066cfe5551d;hb=655c5466129d563265e1d218865dbf2e2f067420;hp=7554d1aed2cccc0d3bde558ff603f8d079181782;hpb=fb5577443ef8662b8045032248efe280cf4fe68e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c index 7554d1aed2..f694eba91e 100644 --- a/gdb/i386gnu-nat.c +++ b/gdb/i386gnu-nat.c @@ -1,5 +1,7 @@ /* Low level interface to i386 running the GNU Hurd. - Copyright (C) 1992, 1995, 1996, 2000 Free Software Foundation, Inc. + + Copyright 1992, 1995, 1996, 1998, 2000, 2001, 2004 + Free Software Foundation, Inc. This file is part of GDB. @@ -21,42 +23,32 @@ #include "defs.h" #include "inferior.h" #include "floatformat.h" +#include "regcache.h" -#include -#include +#include "gdb_assert.h" #include +#include #include #include #include #include +#include "i386-tdep.h" + #include "gnu-nat.h" +#include "i387-tdep.h" -/* The FPU hardware state. */ -struct env387 -{ - unsigned short control; - unsigned short r0; - unsigned short status; - unsigned short r1; - unsigned short tag; - unsigned short r2; - unsigned long eip; - unsigned short code_seg; - unsigned short opcode; - unsigned long operand; - unsigned short operand_seg; - unsigned short r3; - unsigned char regs[8][10]; -}; +#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) -/* At reg_offset[i] is the offset to the thread_state_t location where - the gdb registers[i] is stored. */ +/* At REG_OFFSET[N] is the offset to the thread_state_t location where + the GDB register N is stored. */ static int reg_offset[] = { REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx), @@ -75,9 +67,7 @@ fetch_fpregs (struct proc *thread) { mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT; struct i386_float_state state; - struct env387 *ep = (struct env387 *) state.hw_state; error_t err; - int i; err = thread_get_state (thread->port, i386_FLOAT_STATE, (thread_state_t) &state, &count); @@ -88,38 +78,38 @@ fetch_fpregs (struct proc *thread) return; } - if (! state.initialized) + if (!state.initialized) /* The floating-point state isn't initialized. */ { - for (i = FP0_REGNUM; i <= FP7_REGNUM; i++) - supply_register (i, NULL); - for (i = FIRST_FPU_CTRL_REGNUM; i <= LAST_FPU_CTRL_REGNUM; i++) - supply_register (i, NULL); + int i; + + for (i = FP0_REGNUM; i <= FOP_REGNUM; i++) + regcache_raw_supply (current_regcache, i, NULL); return; } /* Supply the floating-point registers. */ - for (i = 0; i < 8; i++) - supply_register (FP0_REGNUM + i, ep->regs[i]); - - supply_register (FCTRL_REGNUM, (char *) &ep->control); - supply_register (FSTAT_REGNUM, (char *) &ep->status); - supply_register (FTAG_REGNUM, (char *) &ep->tag); - supply_register (FCOFF_REGNUM, (char *) &ep->eip); - supply_register (FDS_REGNUM, (char *) &ep->operand_seg); - supply_register (FDOFF_REGNUM, (char *) &ep->operand); - - /* Store the code segment and opcode pseudo registers. */ - { - long l; - - l = ep->code_seg; - supply_register (FCS_REGNUM, (char *) &l); - l = ep->opcode & ((1 << 11) - 1); - supply_register (FOP_REGNUM, (char *) &l); - } + 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 @@ -130,15 +120,15 @@ gnu_fetch_registers (int regno) /* Make sure we know about new threads. */ inf_update_procs (current_inferior); - thread = inf_tid_to_thread (current_inferior, inferior_pid); + thread = inf_tid_to_thread (current_inferior, PIDGET (inferior_ptid)); if (!thread) error ("Can't fetch registers from thread %d: No such thread", - inferior_pid); + PIDGET (inferior_ptid)); - if (regno < NUM_GREGS || regno == -1) + if (regno < I386_NUM_GREGS || regno == -1) { thread_state_t state; - + /* This does the dirty work for us. */ state = proc_get_state (thread, 0); if (!state) @@ -151,73 +141,36 @@ gnu_fetch_registers (int regno) if (regno == -1) { int i; - + 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"); - + fetch_fpregs (thread); } } - -/* Fill the i387 hardware state EP with selected data from the set of - (pseudo) registers specified by REGS and VALID. VALID is an array - indicating which registers in REGS are valid. If VALID is zero, - all registers are assumed to be valid. */ -static void -convert_to_env387 (struct env387 *ep, char *regs, signed char *valid) -{ - int i; - - /* Fill in the floating-point registers. */ - for (i = 0; i < 8; i++) - if (!valid || valid[i]) - memcpy (ep->regs[i], ®s[REGISTER_BYTE (FP0_REGNUM + i)], - REGISTER_RAW_SIZE (FP0_REGNUM + i)); - -#define fill(member, regno) \ - if (!valid || valid[(regno)]) \ - memcpy (&ep->member, ®s[REGISTER_BYTE (regno)], \ - sizeof (ep->member)); - - fill (control, FCTRL_REGNUM); - fill (status, FSTAT_REGNUM); - fill (tag, FTAG_REGNUM); - fill (eip, FCOFF_REGNUM); - fill (operand, FDOFF_REGNUM); - fill (operand_seg, FDS_REGNUM); - -#undef fill - - if (!valid || valid[FCS_REGNUM]) - ep->code_seg = - (* (int *) ®isters[REGISTER_BYTE (FCS_REGNUM)] & 0xffff); - - if (!valid || valid[FOP_REGNUM]) - ep->opcode = - ((* (int *) ®isters[REGISTER_BYTE (FOP_REGNUM)] & ((1 << 11) - 1))); -} /* Store the whole floating-point state into THREAD using information from the corresponding (pseudo) registers. */ static void -store_fpregs (struct proc *thread) +store_fpregs (struct proc *thread, int regno) { mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT; struct i386_float_state state; @@ -232,9 +185,10 @@ store_fpregs (struct proc *thread) return; } - convert_to_env387 ((struct env387 *) state.hw_state, - registers, register_valid); - + /* FIXME: kettenis/2001-07-15: Is this right? Should we somehow + 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, (thread_state_t) &state, i386_FLOAT_STATE_COUNT); if (err) @@ -249,17 +203,18 @@ store_fpregs (struct proc *thread) void gnu_store_registers (int regno) { + struct regcache *regcache = current_regcache; struct proc *thread; /* Make sure we know about new threads. */ inf_update_procs (current_inferior); - thread = inf_tid_to_thread (current_inferior, inferior_pid); + thread = inf_tid_to_thread (current_inferior, PIDGET (inferior_ptid)); if (!thread) error ("Couldn't store registers into thread %d: No such thread", - inferior_pid); + 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; @@ -286,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)); + /* Update GDB's copy of the register. */ + 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)); - 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. */ @@ -330,12 +282,10 @@ 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"); - - store_fpregs (thread); + + store_fpregs (thread, regno); } }