X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fi386gnu-nat.c;h=9317d29af81a1d4ea831522cbb7ec61b1a0acd60;hb=a0f8cd12efd921e4471afaf3e53c2b984ecf850a;hp=e50bb175c542202003e489c2352f4da7af0b6af1;hpb=f6052080a07e54ac5772bb32b0f1f00f89e9ae9a;p=platform%2Fupstream%2Fbinutils.git
diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index e50bb17..9317d29 100644
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -1,13 +1,12 @@
/* Low level interface to i386 running the GNU Hurd.
- Copyright 1992, 1995, 1996, 1998, 2000, 2001, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1992-2014 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,
@@ -16,19 +15,14 @@
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 "x86-nat.h"
#include "inferior.h"
#include "floatformat.h"
#include "regcache.h"
-#include "gdb_assert.h"
-#include
-#include
-
#include
#include
#include
@@ -37,6 +31,7 @@
#include "i386-tdep.h"
#include "gnu-nat.h"
+#include "inf-child.h"
#include "i387-tdep.h"
#ifdef HAVE_SYS_PROCFS_H
@@ -57,13 +52,28 @@ static int reg_offset[] =
REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs)
};
+/* Offset to the greg_t location where REG is stored. */
+#define CREG_OFFSET(reg) (REG_##reg * 4)
+
+/* At CREG_OFFSET[N] is the offset to the greg_t location where
+ the GDB register N is stored. */
+static int creg_offset[] =
+{
+ CREG_OFFSET (EAX), CREG_OFFSET (ECX), CREG_OFFSET (EDX), CREG_OFFSET (EBX),
+ CREG_OFFSET (UESP), CREG_OFFSET (EBP), CREG_OFFSET (ESI), CREG_OFFSET (EDI),
+ CREG_OFFSET (EIP), CREG_OFFSET (EFL), CREG_OFFSET (CS), CREG_OFFSET (SS),
+ CREG_OFFSET (DS), CREG_OFFSET (ES), CREG_OFFSET (FS), CREG_OFFSET (GS)
+};
+
#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
+#define CREG_ADDR(state, regnum) ((const char *)(state) + creg_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;
@@ -73,57 +83,56 @@ fetch_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;
}
if (!state.initialized)
- /* The floating-point state isn't initialized. */
{
- int i;
-
- for (i = FP0_REGNUM; i <= FOP_REGNUM; i++)
- regcache_raw_supply (current_regcache, 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. */
- 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)
+supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregs)
{
int i;
for (i = 0; i < I386_NUM_GREGS; i++)
- regcache_raw_supply (current_regcache, i, REG_ADDR (gregs, i));
+ regcache_raw_supply (regcache, i, CREG_ADDR (gregs, i));
}
void
-supply_fpregset (gdb_fpregset_t *fpregs)
+supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregs)
{
- i387_supply_fsave (current_regcache, -1, fpregs);
+ i387_supply_fsave (regcache, -1, fpregs);
}
#endif
/* Fetch register REGNO, or all regs if REGNO is -1. */
-void
-gnu_fetch_registers (int regno)
+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, PIDGET (inferior_ptid));
+ thread = inf_tid_to_thread (gnu_current_inf,
+ ptid_get_lwp (inferior_ptid));
if (!thread)
- error ("Can't fetch registers from thread %d: No such thread",
- PIDGET (inferior_ptid));
+ error (_("Can't fetch registers from thread %s: No such thread"),
+ target_pid_to_str (inferior_ptid));
if (regno < I386_NUM_GREGS || regno == -1)
{
@@ -133,7 +142,7 @@ gnu_fetch_registers (int regno)
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;
}
@@ -145,14 +154,16 @@ gnu_fetch_registers (int regno)
proc_debug (thread, "fetching all register");
for (i = 0; i < I386_NUM_GREGS; i++)
- regcache_raw_supply (current_regcache, i, REG_ADDR (state, i));
+ regcache_raw_supply (regcache, i, REG_ADDR (state, i));
thread->fetched_regs = ~0;
}
else
{
- proc_debug (thread, "fetching register %s", REGISTER_NAME (regno));
+ proc_debug (thread, "fetching register %s",
+ gdbarch_register_name (get_regcache_arch (regcache),
+ regno));
- regcache_raw_supply (current_regcache, regno,
+ regcache_raw_supply (regcache, regno,
REG_ADDR (state, regno));
thread->fetched_regs |= (1 << regno);
}
@@ -162,7 +173,7 @@ gnu_fetch_registers (int regno)
{
proc_debug (thread, "fetching floating-point registers");
- fetch_fpregs (thread);
+ fetch_fpregs (regcache, thread);
}
}
@@ -170,7 +181,7 @@ gnu_fetch_registers (int regno)
/* Store the whole floating-point state into THREAD using information
from the corresponding (pseudo) registers. */
static void
-store_fpregs (struct proc *thread, int regno)
+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;
@@ -180,39 +191,41 @@ store_fpregs (struct proc *thread, int regno)
(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;
}
/* 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);
+ 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 regcache *regcache = current_regcache;
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, PIDGET (inferior_ptid));
+ thread = inf_tid_to_thread (gnu_current_inf,
+ ptid_get_lwp (inferior_ptid));
if (!thread)
- error ("Couldn't store registers into thread %d: No such thread",
- PIDGET (inferior_ptid));
+ error (_("Couldn't store registers into thread %s: No such thread"),
+ target_pid_to_str (inferior_ptid));
if (regno < I386_NUM_GREGS || regno == -1)
{
@@ -228,7 +241,8 @@ 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;
}
@@ -245,17 +259,18 @@ gnu_store_registers (int regno)
if ((thread->fetched_regs & (1 << check_regno))
&& memcpy (REG_ADDR (&old_state, check_regno),
REG_ADDR (state, check_regno),
- register_size (current_gdbarch, 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. */
regcache_raw_supply (regcache, check_regno,
REG_ADDR (state, check_regno));
else
- warning ("... also writing this register! Suspicious...");
+ warning (_("... also writing this register! "
+ "Suspicious..."));
}
}
@@ -266,15 +281,16 @@ gnu_store_registers (int regno)
proc_debug (thread, "storing all registers");
for (i = 0; i < I386_NUM_GREGS; i++)
- if (regcache_valid_p (regcache, i))
- regcache_raw_supply (regcache, i, REG_ADDR (state, 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));
- gdb_assert (regcache_valid_p (regcache, regno));
- regcache_raw_supply (regcache, regno, REG_ADDR (state, regno));
+ gdb_assert (REG_VALID == regcache_register_status (regcache, regno));
+ regcache_raw_collect (regcache, regno, REG_ADDR (state, regno));
}
/* Restore the T bit. */
@@ -286,6 +302,172 @@ gnu_store_registers (int regno)
{
proc_debug (thread, "storing floating-point registers");
- store_fpregs (thread, regno);
+ store_fpregs (regcache, thread, regno);
}
}
+
+
+/* Support for debug registers. */
+
+#ifdef i386_DEBUG_STATE
+/* Get debug registers for thread THREAD. */
+
+static void
+i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread)
+{
+ mach_msg_type_number_t count = i386_DEBUG_STATE_COUNT;
+ error_t err;
+
+ err = thread_get_state (thread->port, i386_DEBUG_STATE,
+ (thread_state_t) regs, &count);
+ if (err != 0 || count != i386_DEBUG_STATE_COUNT)
+ warning (_("Couldn't fetch debug state from %s"),
+ proc_string (thread));
+}
+
+/* Set debug registers for thread THREAD. */
+
+static void
+i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread)
+{
+ error_t err;
+
+ err = thread_set_state (thread->port, i386_DEBUG_STATE,
+ (thread_state_t) regs, i386_DEBUG_STATE_COUNT);
+ if (err != 0)
+ warning (_("Couldn't store debug state into %s"),
+ proc_string (thread));
+}
+
+/* Set DR_CONTROL in THREAD. */
+
+static void
+i386_gnu_dr_set_control_one (struct proc *thread, void *arg)
+{
+ unsigned long *control = arg;
+ struct i386_debug_state regs;
+
+ i386_gnu_dr_get (®s, thread);
+ regs.dr[DR_CONTROL] = *control;
+ i386_gnu_dr_set (®s, thread);
+}
+
+/* Set DR_CONTROL to CONTROL in all threads. */
+
+static void
+i386_gnu_dr_set_control (unsigned long control)
+{
+ inf_update_procs (gnu_current_inf);
+ inf_threads (gnu_current_inf, i386_gnu_dr_set_control_one, &control);
+}
+
+/* Parameters to set a debugging address. */
+
+struct reg_addr
+{
+ int regnum; /* Register number (zero based). */
+ CORE_ADDR addr; /* Address. */
+};
+
+/* Set address REGNUM (zero based) to ADDR in THREAD. */
+
+static void
+i386_gnu_dr_set_addr_one (struct proc *thread, void *arg)
+{
+ struct reg_addr *reg_addr = arg;
+ struct i386_debug_state regs;
+
+ i386_gnu_dr_get (®s, thread);
+ regs.dr[reg_addr->regnum] = reg_addr->addr;
+ i386_gnu_dr_set (®s, thread);
+}
+
+/* Set address REGNUM (zero based) to ADDR in all threads. */
+
+static void
+i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr)
+{
+ struct reg_addr reg_addr;
+
+ gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
+
+ reg_addr.regnum = regnum;
+ reg_addr.addr = addr;
+
+ inf_update_procs (gnu_current_inf);
+ inf_threads (gnu_current_inf, i386_gnu_dr_set_addr_one, ®_addr);
+}
+
+/* Get debug register REGNUM value from only the one LWP of PTID. */
+
+static unsigned long
+i386_gnu_dr_get_reg (ptid_t ptid, int regnum)
+{
+ struct i386_debug_state regs;
+ struct proc *thread;
+
+ /* Make sure we know about new threads. */
+ inf_update_procs (gnu_current_inf);
+
+ thread = inf_tid_to_thread (gnu_current_inf, ptid_get_lwp (ptid));
+ i386_gnu_dr_get (®s, thread);
+
+ return regs.dr[regnum];
+}
+
+/* Return the inferior's debug register REGNUM. */
+
+static CORE_ADDR
+i386_gnu_dr_get_addr (int regnum)
+{
+ gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
+
+ return i386_gnu_dr_get_reg (inferior_ptid, regnum);
+}
+
+/* Get DR_STATUS from only the one thread of INFERIOR_PTID. */
+
+static unsigned long
+i386_gnu_dr_get_status (void)
+{
+ return i386_gnu_dr_get_reg (inferior_ptid, DR_STATUS);
+}
+
+/* Return the inferior's DR7 debug control register. */
+
+static unsigned long
+i386_gnu_dr_get_control (void)
+{
+ return i386_gnu_dr_get_reg (inferior_ptid, DR_CONTROL);
+}
+#endif /* i386_DEBUG_STATE */
+
+/* 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 ();
+
+#ifdef i386_DEBUG_STATE
+ x86_use_watchpoints (t);
+
+ x86_dr_low.set_control = i386_gnu_dr_set_control;
+ gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT);
+ x86_dr_low.set_addr = i386_gnu_dr_set_addr;
+ x86_dr_low.get_addr = i386_gnu_dr_get_addr;
+ x86_dr_low.get_status = i386_gnu_dr_get_status;
+ x86_dr_low.get_control = i386_gnu_dr_get_control;
+ x86_set_debug_register_length (4);
+#endif /* i386_DEBUG_STATE */
+
+ t->to_fetch_registers = gnu_fetch_registers;
+ t->to_store_registers = gnu_store_registers;
+
+ /* Register the target. */
+ add_target (t);
+}