X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386gnu-nat.c;h=f15cf0c994d7f2ba4348d73c5e1d3202f40717cd;hb=4493bd46ff225c5d2081f535f22793ef7a5fcf4f;hp=bc13229d9909eca32105a2d5c1c86ed33b045813;hpb=72ec28b8afa357cdde70c612b4e0e9f37a34f8e4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c index bc13229d99..f15cf0c994 100644 --- a/gdb/i386gnu-nat.c +++ b/gdb/i386gnu-nat.c @@ -1,11 +1,13 @@ /* Low level interface to i386 running the GNU Hurd. - Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc. + + Copyright (C) 1992, 1995-1996, 1998, 2000-2001, 2004, 2007-2012 Free + Software Foundation, Inc. This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,49 +16,38 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "inferior.h" #include "floatformat.h" +#include "regcache.h" -#include -#include +#include "gdb_assert.h" #include +#include +#include "gdb_string.h" #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), @@ -66,84 +57,83 @@ static int reg_offset[] = }; #define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum]) +#define CREG_ADDR(state, regnum) ((const char *)(state) + reg_offset[regnum]) -/* Get the whole floating-point state of THREAD and record the - values of the corresponding (pseudo) registers. */ +/* Get the whole floating-point state of THREAD and record the values + of the corresponding (pseudo) registers. */ + static void -fetch_fpregs (struct proc *thread) +fetch_fpregs (struct regcache *regcache, 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); if (err) { - warning ("Couldn't fetch floating-point state from %s", + warning (_("Couldn't fetch floating-point state from %s"), proc_string (thread)); return; } - if (! state.initialized) - /* The floating-point state isn't initialized. */ + if (!state.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); - - return; + /* The floating-point state isn't initialized. */ + i387_supply_fsave (regcache, -1, NULL); + } + else + { + /* Supply the floating-point registers. */ + i387_supply_fsave (regcache, -1, state.hw_state); } +} - /* 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); - } +#ifdef HAVE_SYS_PROCFS_H +/* These two calls are used by the core-regset.c code for + reading ELF core files. */ +void +supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregs) +{ + int i; + for (i = 0; i < I386_NUM_GREGS; i++) + regcache_raw_supply (regcache, i, CREG_ADDR (gregs, i)); } -/* Fetch register REGNO, or all regs if REGNO is -1. */ void -gnu_fetch_registers (int regno) +supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregs) +{ + i387_supply_fsave (regcache, -1, fpregs); +} +#endif + +/* Fetch register REGNO, or all regs if REGNO is -1. */ +static void +gnu_fetch_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { struct proc *thread; /* Make sure we know about new threads. */ - inf_update_procs (current_inferior); + inf_update_procs (gnu_current_inf); - thread = inf_tid_to_thread (current_inferior, inferior_pid); + thread = inf_tid_to_thread (gnu_current_inf, + ptid_get_tid (inferior_ptid)); if (!thread) - error ("Can't fetch registers from thread %d: No such thread", - inferior_pid); + error (_("Can't fetch registers from thread %s: No such thread"), + target_pid_to_str (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) { - warning ("Couldn't fetch registers from %s", + warning (_("Couldn't fetch registers from %s"), proc_string (thread)); return; } @@ -151,73 +141,38 @@ 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 (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)); + proc_debug (thread, "fetching register %s", + gdbarch_register_name (get_regcache_arch (regcache), + regno)); + + regcache_raw_supply (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); + + fetch_fpregs (regcache, 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 (const struct regcache *regcache, struct proc *thread, int regno) { mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT; struct i386_float_state state; @@ -227,44 +182,49 @@ store_fpregs (struct proc *thread) (thread_state_t) &state, &count); if (err) { - warning ("Couldn't fetch floating-point state from %s", + warning (_("Couldn't fetch floating-point state from %s"), proc_string (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_collect_fsave (regcache, regno, state.hw_state); + err = thread_set_state (thread->port, i386_FLOAT_STATE, (thread_state_t) &state, i386_FLOAT_STATE_COUNT); if (err) { - warning ("Couldn't store floating-point state into %s", + warning (_("Couldn't store floating-point state into %s"), proc_string (thread)); return; } } /* Store at least register REGNO, or all regs if REGNO == -1. */ -void -gnu_store_registers (int regno) +static void +gnu_store_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { struct proc *thread; + struct gdbarch *gdbarch = get_regcache_arch (regcache); /* Make sure we know about new threads. */ - inf_update_procs (current_inferior); + inf_update_procs (gnu_current_inf); - thread = inf_tid_to_thread (current_inferior, inferior_pid); + thread = inf_tid_to_thread (gnu_current_inf, + ptid_get_tid (inferior_ptid)); if (!thread) - error ("Couldn't store registers into thread %d: No such thread", - inferior_pid); + error (_("Couldn't store registers into thread %s: No such thread"), + target_pid_to_str (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; int was_aborted = thread->aborted; int was_valid = thread->state_valid; + int trace; if (!was_aborted && was_valid) memcpy (&old_state, &thread->state, sizeof (old_state)); @@ -272,61 +232,85 @@ gnu_store_registers (int regno) state = proc_get_state (thread, 1); if (!state) { - warning ("Couldn't store registers into %s", proc_string (thread)); + warning (_("Couldn't store registers into %s"), + proc_string (thread)); return; } + /* Save the T bit. We might try to restore the %eflags register + below, but changing the T bit would seriously confuse GDB. */ + trace = ((struct i386_thread_state *)state)->efl & 0x100; + if (!was_aborted && was_valid) /* See which registers have changed after aborting the thread. */ { 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 (gdbarch, check_regno))) /* Register CHECK_REGNO has changed! Ack! */ { - warning ("Register %s changed after the thread was aborted", - REGISTER_NAME (check_regno)); + warning (_("Register %s changed after the thread was aborted"), + gdbarch_register_name (gdbarch, 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..."); + 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 (REG_VALID == regcache_register_status (regcache, i)) + regcache_raw_collect (regcache, i, REG_ADDR (state, i)); } else { - proc_debug (thread, "storing register %s", REGISTER_NAME (regno)); + proc_debug (thread, "storing register %s", + gdbarch_register_name (gdbarch, regno)); - assert (register_valid[regno]); - fill (state, regno); + gdb_assert (REG_VALID == regcache_register_status (regcache, regno)); + regcache_raw_collect (regcache, regno, REG_ADDR (state, regno)); } - } -#undef fill + /* Restore the T bit. */ + ((struct i386_thread_state *)state)->efl &= ~0x100; + ((struct i386_thread_state *)state)->efl |= trace; + } - 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 (regcache, thread, regno); } } + +/* Provide a prototype to silence -Wmissing-prototypes. */ +extern initialize_file_ftype _initialize_i386gnu_nat; + +void +_initialize_i386gnu_nat (void) +{ + struct target_ops *t; + + /* Fill in the generic GNU/Hurd methods. */ + t = gnu_target (); + + t->to_fetch_registers = gnu_fetch_registers; + t->to_store_registers = gnu_store_registers; + + /* Register the target. */ + add_target (t); +}