This is the mail archive of the gdb-patches@sourceware.cygnus.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[Conversion of the GNU Hurd to the new i386 register layout]


Last month I sent the following patch to gdb-patches.  Could somebody
please apply this?

Mark

------- Start of forwarded message -------
Date: 20 Dec 1999 23:38:24 +0100
To: gdb-patches@sourceware.cygnus.com
Subject: Conversion of the GNU Hurd to the new i386 register layout

The following patch converts the GNU Hurd to the new i386 register
layout.

Mark


1999-12-20  Mark Kettenis  <kettenis@gnu.org>

	* config/i386/tm-i386gnu.h (THREAD_STATE_FLAVOR): Define to
	i386_REGS_SEGS_STATE.
	(HAVE_I387_REGS): Define.
	(FLOAT_INFO): Remove.
	* i386gnu-nat.c: Almost completely rewritten to use new i386
	register layout and `float info' implementation.
	* gnu-nat.c (inf_update_procs, proc_get_state, proc_string):
	Move prototypes from here.
	* gnu-nat.h: To here.


Index: gdb/gdb/config/i386/tm-i386gnu.h
===================================================================
RCS file: /var/cvsroot/gdb/gdb/config/i386/tm-i386gnu.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 tm-i386gnu.h
- --- gdb/gdb/config/i386/tm-i386gnu.h	1999/07/19 17:23:27	1.1.1.2
+++ gdb/gdb/config/i386/tm-i386gnu.h	1999/12/20 21:06:55
@@ -1,4 +1,4 @@
- -/* Macro definitions for i386, GNU Hurd
+/* Macro definitions for i386 running the GNU Hurd.
    Copyright (C) 1992, 1999 Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -21,26 +21,26 @@
 #ifndef TM_I386GNU_H
 #define TM_I386GNU_H 1
 
- -/* Include common definitions for gnu systems */
+/* Include common definitions for GNU systems.
+   FIXME: This does not belong here since this is supposed to contain
+   only native-dependent information.  */
 #include "nm-gnu.h"
 
 /* Thread flavors used in re-setting the T bit.
- - * @@ this is also bad for cross debugging.
- - */
- -#define THREAD_STATE_FLAVOR		i386_THREAD_STATE
+   FIXME: This is native-dependent.  */
+#define THREAD_STATE_FLAVOR		i386_REGS_SEGS_STATE
 #define THREAD_STATE_SIZE		i386_THREAD_STATE_COUNT
 #define THREAD_STATE_SET_TRACED(state) \
   	((struct i386_thread_state *)state)->efl |= 0x100
 #define THREAD_STATE_CLEAR_TRACED(state) \
   	((((struct i386_thread_state *)state)->efl &= ~0x100), 1)
 
- -/* we can do it */
+/* We can attach and detach.
+   FIXME: This is probably native-dependent too.  */
 #define ATTACH_DETACH 1
 
+#define HAVE_I387_REGS
 #include "i386/tm-i386.h"
- -
- -#undef FLOAT_INFO
- -#define FLOAT_INFO { i386_mach3_float_info (); }
 
 /* Offset to saved PC in sigcontext.  */
 #define SIGCONTEXT_PC_OFFSET 68
Index: gdb/gdb/i386gnu-nat.c
===================================================================
RCS file: /var/cvsroot/gdb/gdb/i386gnu-nat.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 i386gnu-nat.c
- --- gdb/gdb/i386gnu-nat.c	1999/07/19 17:22:27	1.1.1.2
+++ gdb/gdb/i386gnu-nat.c	1999/12/20 20:31:13
@@ -1,4 +1,4 @@
- -/* Low level interface to I386 running the GNU Hurd
+/* Low level interface to i386 running the GNU Hurd.
    Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -22,36 +22,41 @@
 #include "inferior.h"
 #include "floatformat.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <errno.h>
 
 #include <mach.h>
+#include <mach_error.h>
 #include <mach/message.h>
 #include <mach/exception.h>
- -#include <mach_error.h>
 
 #include "gnu-nat.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];
+};
 
- -/* Hmmm... Should this not be here?
- - * Now for i386_float_info() target_has_execution
- - */
- -#include <target.h>
- -
- -/* @@@ Should move print_387_status() to i387-tdep.c */
- -extern void print_387_control_word ();	/* i387-tdep.h */
- -extern void print_387_status_word ();
 
- -/* Find offsets to thread states at compile time.
- - * If your compiler does not grok this, calculate offsets
- - * offsets yourself and use them (or get a compatible compiler :-)
- - */
- -
- -#define  REG_OFFSET(reg) (int)(&((struct i386_thread_state *)0)->reg)
- -
- -/* at reg_offset[i] is the offset to the i386_thread_state
- - * location where the gdb registers[i] is stored.
- - */
+/* 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.  */
 static int reg_offset[] =
 {
   REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx),
@@ -60,309 +65,268 @@
   REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs)
 };
 
- -#define REG_ADDR(state,regnum) ((char *)(state)+reg_offset[regnum])
+#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
 
- -/* Fetch COUNT contiguous registers from thread STATE starting from REGNUM
- - * Caller knows that the regs handled in one transaction are of same size.
- - */
- -#define FETCH_REGS(state, regnum, count) \
- -  memcpy (&registers[REGISTER_BYTE (regnum)], \
- -	  REG_ADDR (state, regnum), \
- -	  count * REGISTER_RAW_SIZE (regnum))
- -
- -/* Store COUNT contiguous registers to thread STATE starting from REGNUM */
- -#define STORE_REGS(state, regnum, count) \
- -  memcpy (REG_ADDR (state, regnum), \
- -	  &registers[REGISTER_BYTE (regnum)], \
- -	  count * REGISTER_RAW_SIZE (regnum))
 
- -/*
- - * Fetch inferiors registers for gdb.
- - * REG specifies which (as gdb views it) register, -1 for all.
- - */
- -void
- -gnu_fetch_registers (int reg)
+/* Get the whole floating-point state of THREAD and record the
+   values of the corresponding (pseudo) registers.  */
+static void
+fetch_fpregs (struct proc *thread)
 {
- -  struct proc *thread;
- -  thread_state_t state;
- -
- -  inf_update_procs (current_inferior);	/* Make sure we know about new threads.  */
- -
- -  thread = inf_tid_to_thread (current_inferior, inferior_pid);
- -  if (!thread)
- -    error ("fetch inferior registers: %d: Invalid thread", inferior_pid);
- -
- -  state = proc_get_state (thread, 0);
+  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;
 
- -  if (!state)
- -    warning ("Couldn't fetch register %s from %s (invalid thread).",
- -	     REGISTER_NAME (reg), proc_string (thread));
- -  else if (reg >= 0)
+  err = thread_get_state (thread->port, i386_FLOAT_STATE,
+			  (thread_state_t) &state, &count);
+  if (err)
     {
- -      proc_debug (thread, "fetching register: %s", REGISTER_NAME (reg));
- -      supply_register (reg, REG_ADDR (state, reg));
- -      thread->fetched_regs |= (1 << reg);
+      warning ("Couldn't fetch floating-point state from %s",
+	       proc_string (thread));
+      return;
     }
- -  else
+
+  if (! state.initialized)
+    /* The floating-point state isn't initialized.  */
     {
- -      proc_debug (thread, "fetching all registers");
- -      for (reg = 0; reg < NUM_REGS; reg++)
- -	supply_register (reg, REG_ADDR (state, reg));
- -      thread->fetched_regs = ~0;
+      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;
     }
+
+  /* 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);
+  }
 }
- -
- -/* Store our register values back into the inferior.
- - * If REG is -1, do this for all registers.
- - * Otherwise, REG specifies which register
- - *
- - * On mach3 all registers are always saved in one call.
- - */
+
+/* Fetch register REGNO, or all regs if REGNO is -1.  */
 void
- -gnu_store_registers (reg)
- -     int reg;
+gnu_fetch_registers (int regno)
 {
   struct proc *thread;
- -  int was_aborted, was_valid;
- -  thread_state_t state;
- -  thread_state_data_t old_state;
 
- -  inf_update_procs (current_inferior);	/* Make sure we know about new threads.  */
+  /* Make sure we know about new threads.  */
+  inf_update_procs (current_inferior);
 
   thread = inf_tid_to_thread (current_inferior, inferior_pid);
   if (!thread)
- -    error ("store inferior registers: %d: Invalid thread", inferior_pid);
- -
- -  proc_debug (thread, "storing register %s.", REGISTER_NAME (reg));
- -
- -  was_aborted = thread->aborted;
- -  was_valid = thread->state_valid;
- -  if (!was_aborted && was_valid)
- -    bcopy (&thread->state, &old_state, sizeof (old_state));
+    error ("Can't fetch registers from thread %d: No such thread",
+	   inferior_pid);
 
- -  state = proc_get_state (thread, 1);
- -
- -  if (!state)
- -    warning ("Couldn't store register %s from %s (invalid thread).",
- -	     REGISTER_NAME (reg), proc_string (thread));
- -  else
+  if (regno < NUM_GREGS || regno == -1)
     {
- -      if (!was_aborted && was_valid)
- -	/* See which registers have changed after aborting the thread.  */
+      thread_state_t state;
+      
+      /* This does the dirty work for us.  */
+      state = proc_get_state (thread, 0);
+      if (!state)
 	{
- -	  int check_reg;
- -	  for (check_reg = 0; check_reg < NUM_REGS; check_reg++)
- -	    if ((thread->fetched_regs & (1 << check_reg))
- -		&& bcmp (REG_ADDR (&old_state, check_reg),
- -			 REG_ADDR (state, check_reg),
- -			 REGISTER_RAW_SIZE (check_reg)))
- -	      /* Register CHECK_REG has changed!  Ack!  */
- -	      {
- -		warning ("Register %s changed after thread was aborted.",
- -			 REGISTER_NAME (check_reg));
- -		if (reg >= 0 && reg != check_reg)
- -		  /* Update gdb's copy of the register.  */
- -		  supply_register (check_reg, REG_ADDR (state, check_reg));
- -		else
- -		  warning ("... also writing this register!  Suspicious...");
- -	      }
+	  warning ("Couldn't fetch registers from %s",
+		   proc_string (thread));
+	  return;
 	}
 
- -      if (reg >= 0)
+      if (regno == -1)
 	{
- -	  proc_debug (thread, "storing register: %s", REGISTER_NAME (reg));
- -	  STORE_REGS (state, reg, 1);
+	  int i;
+	  
+	  proc_debug (thread, "fetching all register");
+	  
+	  for (i = 0; i < NUM_GREGS; i++)
+	    supply_register (i, REG_ADDR (state, i));
+	  thread->fetched_regs = ~0;
 	}
       else
 	{
- -	  proc_debug (thread, "storing all registers");
- -	  for (reg = 0; reg < NUM_REGS; reg++)
- -	    STORE_REGS (state, reg, 1);
+	  proc_debug (thread, "fetching register %s", REGISTER_NAME (regno));
+	  
+	  supply_register (regno, REG_ADDR (state, regno));
+	  thread->fetched_regs |= (1 << regno);
 	}
     }
+
+  if (regno >= NUM_GREGS || regno == -1)
+    {
+      proc_debug (thread, "fetching floating-point registers");
+      
+      fetch_fpregs (thread);
+    }
 }
+
 
- -/* jtv@hut.fi: I copied and modified this 387 code from
- - * gdb/i386-xdep.c. Modifications for Mach 3.0.
- - *
- - * i387 status dumper. See also i387-tdep.c
- - */
- -struct env387
+/* 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)
 {
- -  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];
- -};
- -/* This routine is machine independent?
- - * Should move it to i387-tdep.c but you need to export struct env387
- - */
- -static
- -print_387_status (status, ep)
- -     unsigned short status;
- -     struct env387 *ep;
- -{
   int i;
- -  int bothstatus;
- -  int top;
- -  int fpreg;
- -  unsigned char *p;
 
- -  bothstatus = ((status != 0) && (ep->status != 0));
- -  if (status != 0)
- -    {
- -      if (bothstatus)
- -	printf_unfiltered ("u: ");
- -      print_387_status_word (status);
- -    }
+  /* Fill in the floating-point registers.  */
+  for (i = 0; i < 8; i++)
+    if (!valid || valid[i])
+      memcpy (ep->regs[i], &regs[REGISTER_BYTE (FP0_REGNUM + i)],
+	      REGISTER_RAW_SIZE (FP0_REGNUM + i));
+
+#define fill(member, regno)                                              \
+  if (!valid || valid[(regno)])                                          \
+    memcpy (&ep->member, &regs[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 *) &registers[REGISTER_BYTE (FCS_REGNUM)] & 0xffff);
+  
+  if (!valid || valid[FOP_REGNUM])
+    ep->opcode =
+      ((* (int *) &registers[REGISTER_BYTE (FOP_REGNUM)] & ((1 << 11) - 1)));
+}
 
- -  if (ep->status != 0)
+/* Store the whole floating-point state into THREAD using information
+   from the corresponding (pseudo) registers.  */
+static void
+store_fpregs (struct proc *thread)
+{
+  mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
+  struct i386_float_state state;
+  error_t err;
+
+  err = thread_get_state (thread->port, i386_FLOAT_STATE,
+			  (thread_state_t) &state, &count);
+  if (err)
     {
- -      if (bothstatus)
- -	printf_unfiltered ("e: ");
- -      print_387_status_word (ep->status);
+      warning ("Couldn't fetch floating-point state from %s",
+	       proc_string (thread));
+      return;
     }
 
- -  print_387_control_word (ep->control);
- -  printf_unfiltered ("last exception: ");
- -  printf_unfiltered ("opcode %s; ", local_hex_string (ep->opcode));
- -  printf_unfiltered ("pc %s:", local_hex_string (ep->code_seg));
- -  printf_unfiltered ("%s; ", local_hex_string (ep->eip));
- -  printf_unfiltered ("operand %s", local_hex_string (ep->operand_seg));
- -  printf_unfiltered (":%s\n", local_hex_string (ep->operand));
- -
- -  top = (ep->status >> 11) & 7;
- -
- -  printf_unfiltered ("regno  tag  msb              lsb  value\n");
- -  for (fpreg = 7; fpreg >= 0; fpreg--)
+  convert_to_env387 ((struct env387 *) state.hw_state,
+		     registers, register_valid);
+    
+  err = thread_set_state (thread->port, i386_FLOAT_STATE,
+			  (thread_state_t) &state, i386_FLOAT_STATE_COUNT);
+  if (err)
     {
- -      double val;
- -
- -      printf_unfiltered ("%s %d: ", fpreg == top ? "=>" : "  ", fpreg);
- -
- -      switch ((ep->tag >> (fpreg * 2)) & 3)
- -	{
- -	case 0:
- -	  printf_unfiltered ("valid ");
- -	  break;
- -	case 1:
- -	  printf_unfiltered ("zero  ");
- -	  break;
- -	case 2:
- -	  printf_unfiltered ("trap  ");
- -	  break;
- -	case 3:
- -	  printf_unfiltered ("empty ");
- -	  break;
- -	}
- -      for (i = 9; i >= 0; i--)
- -	printf_unfiltered ("%02x", ep->regs[fpreg][i]);
- -
- -      floatformat_to_double (&floatformat_i387_ext, (char *) ep->regs[fpreg],
- -			     &val);
- -      printf_unfiltered ("  %g\n", val);
+      warning ("Couldn't store floating-point state into %s",
+	       proc_string (thread));
+      return;
     }
- -  if (ep->r0)
- -    printf_unfiltered ("warning: reserved0 is %s\n", local_hex_string (ep->r0));
- -  if (ep->r1)
- -    printf_unfiltered ("warning: reserved1 is %s\n", local_hex_string (ep->r1));
- -  if (ep->r2)
- -    printf_unfiltered ("warning: reserved2 is %s\n", local_hex_string (ep->r2));
- -  if (ep->r3)
- -    printf_unfiltered ("warning: reserved3 is %s\n", local_hex_string (ep->r3));
 }
- -
- -/*
- - * values that go into fp_kind (from <i386/fpreg.h>)
- - */
- -#define FP_NO   0		/* no fp chip, no emulator (no fp support)      */
- -#define FP_SW   1		/* no fp chip, using software emulator          */
- -#define FP_HW   2		/* chip present bit                             */
- -#define FP_287  2		/* 80287 chip present                           */
- -#define FP_387  3		/* 80387 chip present                           */
 
- -typedef struct fpstate
+/* Store at least register REGNO, or all regs if REGNO == -1.  */
+void
+gnu_store_registers (int regno)
 {
- -#if 1
- -  unsigned char state[FP_STATE_BYTES];	/* "hardware" state */
- -#else
- -  struct env387 state;		/* Actually this */
- -#endif
- -  int status;			/* Duplicate status */
- -}
- - *fpstate_t;
+  struct proc *thread;
 
- -/* Mach 3 specific routines.
- - */
- -static int
- -get_i387_state (fstate)
- -     struct fpstate *fstate;
- -{
- -  error_t err;
- -  thread_state_data_t state;
- -  unsigned int fsCnt = i386_FLOAT_STATE_COUNT;
- -  struct i386_float_state *fsp;
- -  struct proc *thread = inf_tid_to_thread (current_inferior, inferior_pid);
+  /* Make sure we know about new threads.  */
+  inf_update_procs (current_inferior);
 
+  thread = inf_tid_to_thread (current_inferior, inferior_pid);
   if (!thread)
- -    error ("get_i387_state: Invalid thread");
- -
- -  proc_abort (thread, 0);	/* Make sure THREAD's in a reasonable state. */
+    error ("Couldn't store registers into thread %d: No such thread",
+	   inferior_pid);
 
- -  err = thread_get_state (thread->port, i386_FLOAT_STATE, state, &fsCnt);
- -  if (err)
+  if (regno < NUM_GREGS || regno == -1)
     {
- -      warning ("Can not get live floating point state: %s",
- -	       mach_error_string (err));
- -      return 0;
- -    }
+      thread_state_t state;
+      thread_state_data_t old_state;
+      int was_aborted = thread->aborted;
+      int was_valid = thread->state_valid;
 
- -  fsp = (struct i386_float_state *) state;
- -  /* The 387 chip (also 486 counts) or a software emulator? */
- -  if (!fsp->initialized || (fsp->fpkind != FP_387 && fsp->fpkind != FP_SW))
- -    return 0;
+      if (!was_aborted && was_valid)
+	memcpy (&old_state, &thread->state, sizeof (old_state));
 
- -  /* Clear the target then copy thread's float state there.
- -     Make a copy of the status word, for some reason?
- -   */
- -  memset (fstate, 0, sizeof (struct fpstate));
+      state = proc_get_state (thread, 1);
+      if (!state)
+	{
+	  warning ("Couldn't store registers into %s", proc_string (thread));
+	  return;
+	}
 
- -  fstate->status = fsp->exc_status;
+      if (!was_aborted && was_valid)
+	/* See which registers have changed after aborting the thread.  */
+	{
+	  int check_regno;
 
- -  memcpy (fstate->state, (char *) &fsp->hw_state, FP_STATE_BYTES);
+	  for (check_regno = 0; check_regno < 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 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));
+		else
+		  warning ("... also writing this register!  Suspicious...");
+	      }
+	}
 
- -  return 1;
- -}
+#define fill(state, regno)                                               \
+  memcpy (REG_ADDR(state, regno), &registers[REGISTER_BYTE (regno)],     \
+          REGISTER_RAW_SIZE (regno))
 
- -/*
- - * This is called by "info float" command
- - */
- -void
- -i386_mach3_float_info ()
- -{
- -  char buf[sizeof (struct fpstate) + 2 * sizeof (int)];
- -  int valid = 0;
- -  fpstate_t fps;
+      if (regno == -1)
+	{
+	  int i;
+	  
+	  proc_debug (thread, "storing all registers");
 
- -  if (target_has_execution)
- -    valid = get_i387_state (buf);
+	  for (i = 0; i < NUM_GREGS; i++)
+	    if (register_valid[i])
+	      fill (state, i);
+	}
+      else
+	{
+	  proc_debug (thread, "storing register %s", REGISTER_NAME (regno));
 
- -  if (!valid)
- -    {
- -      warning ("no floating point status saved");
- -      return;
+	  assert (register_valid[regno]);
+	  fill (state, regno);
+	}
     }
 
- -  fps = (fpstate_t) buf;
+#undef fill
 
- -  print_387_status (fps->status, (struct env387 *) fps->state);
+  if (regno >= NUM_GREGS || regno == -1)
+    {
+      proc_debug (thread, "storing floating-point registers");
+      
+      store_fpregs (thread);
+    }
 }
Index: gdb/gdb/gnu-nat.c
===================================================================
RCS file: /var/cvsroot/gdb/gdb/gnu-nat.c,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 gnu-nat.c
- --- gdb/gdb/gnu-nat.c	1999/10/16 15:27:26	1.1.1.5
+++ gdb/gdb/gnu-nat.c	1999/12/20 20:43:12
@@ -1,4 +1,4 @@
- -/* Interface GDB to the GNU Hurd
+/* Interface GDB to the GNU Hurd.
    Copyright (C) 1992, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -88,7 +88,6 @@
 
 extern struct target_ops gnu_ops;
 
- -int inf_update_procs (struct inf *inf);
 struct inf *make_inf ();
 void inf_clear_wait (struct inf *inf);
 void inf_cleanup (struct inf *inf);
@@ -116,7 +115,6 @@
        debug ("{inf %d %p}: " msg, __inf->pid, __inf , ##args); } while (0)
 
 void proc_abort (struct proc *proc, int force);
- -thread_state_t proc_get_state (struct proc *proc, int force);
 struct proc *make_proc (struct inf *inf, mach_port_t port, int tid);
 struct proc *_proc_free (struct proc *proc);
 int proc_update_sc (struct proc *proc);
@@ -126,7 +124,6 @@
 void proc_steal_exc_port (struct proc *proc, mach_port_t exc_port);
 void proc_restore_exc_port (struct proc *proc);
 int proc_trace (struct proc *proc, int set);
- -char *proc_string (struct proc *proc);
 
 /* Evaluate RPC_EXPR in a scope with the variables MSGPORT and REFPORT bound
    to INF's msg port and task port respectively.  If it has no msg port,
Index: gdb/gdb/gnu-nat.h
===================================================================
RCS file: /var/cvsroot/gdb/gdb/gnu-nat.h,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 gnu-nat.h
- --- gdb/gdb/gnu-nat.h	1999/07/19 17:22:22	1.1.1.3
+++ gdb/gdb/gnu-nat.h	1999/12/20 20:38:32
@@ -31,6 +31,9 @@
 /* Converts a GDB pid to a struct proc.  */
 struct proc *inf_tid_to_thread (struct inf *inf, int tid);
 
+/* Makes sure that INF's thread list is synced with the actual process.  */
+int inf_update_procs (struct inf *inf);
+
 /* A proc is either a thread, or the task (there can only be one task proc
    because it always has the same TID, PROC_TID_TASK).  */
 struct proc
@@ -75,7 +78,14 @@
 
 extern int __proc_pid (struct proc *proc);
 
+/* Make sure that the state field in PROC is up to date, and return a
+   pointer to it, or 0 if something is wrong.  If WILL_MODIFY is true,
+   makes sure that the thread is stopped and aborted first, and sets
+   the state_changed field in PROC to true.  */
 extern thread_state_t proc_get_state (struct proc *proc, int will_modify);
+
+/* Return printable description of proc.  */
+extern char *proc_string (struct proc *proc);
 
 #define proc_debug(_proc, msg, args...) \
   do { struct proc *__proc = (_proc); \
------- End of forwarded message -------

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]