* gdb/defs.h: unconditionally include <fcntl.h>, and

[deliverable/binutils-gdb.git] / gdb / hpux-thread.c

diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c
index 93259b99e98341405138ceae519c93a72ab398eb..39d27c59f73ff8d1b381844b8076081414186378 100644 (file)
--- a/gdb/hpux-thread.c
+++ b/gdb/hpux-thread.c
@@ -1,7 +1,7 @@
 /* Low level interface for debugging HPUX/DCE threads for GDB, the GNU
    debugger.
 
-   Copyright 1996, 1998, 1999, 2000, 2001, 2004 Free Software
+   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2004 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
@@ -18,8 +18,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* This module implements a sort of half target that sits between the
    machine-independent parts of GDB and the ptrace interface (infptrace.c) to
@@ -44,8 +44,10 @@
 #include "inferior.h"
 #include "regcache.h"
 #include <fcntl.h>
+#include <string.h>
 #include "gdb_stat.h"
 #include "gdbcore.h"
+#include "hppa-tdep.h"
 
 extern int child_suppress_run;
 
@@ -126,7 +128,7 @@ find_tcb (ptid_t ptid)
          }
     }
 
-  error ("Can't find TCB %d", thread);
+  error (_("Can't find TCB %d"), thread);
   return NULL;
 }
 \f
@@ -184,7 +186,7 @@ hpux_thread_resume (ptid_t ptid, int step, enum target_signal signo)
     {
       pid = thread_to_lwp (pid, -2);
       if (pid == -2)           /* Inactive thread */
-       error ("This version of Solaris can't start inactive threads.");
+       error (_("This version of Solaris can't start inactive threads."));
     }
 #endif
 
@@ -220,7 +222,7 @@ hpux_thread_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
   return rtnval;
 }
 
-static char regmap[NUM_REGS] =
+static char regmap[] =
 {
   -2, -1, -1, 0, 4, 8, 12, 16, 20, 24, /* flags, r1 -> r9 */
   28, 32, 36, 40, 44, 48, 52, 56, 60, -1,      /* r10 -> r19 */
@@ -291,12 +293,12 @@ hpux_thread_fetch_registers (int regno)
 
          sp = (CORE_ADDR) tcb_ptr->static_ctx.sp - 160;
 
-         if (regno == FLAGS_REGNUM)
+         if (regno == HPPA_FLAGS_REGNUM)
            /* Flags must be 0 to avoid bogus value for SS_INSYSCALL */
            memset (buf, '\000', register_size (current_gdbarch, regno));
-         else if (regno == SP_REGNUM)
+         else if (regno == HPPA_SP_REGNUM)
            store_unsigned_integer (buf, sizeof sp, sp);
-         else if (regno == PC_REGNUM)
+         else if (regno == HPPA_PCOQ_HEAD_REGNUM)
            read_memory (sp - 20, buf, register_size (current_gdbarch, regno));
          else
            read_memory (sp + regmap[regno], buf, register_size (current_gdbarch, regno));
@@ -353,25 +355,28 @@ hpux_thread_store_registers (int regno)
 
          sp = (CORE_ADDR) tcb_ptr->static_ctx.sp - 160;
 
-         if (regno == FLAGS_REGNUM)
+         if (regno == HPPA_FLAGS_REGNUM)
            deprecated_child_ops.to_store_registers (regno);    /* Let lower layer handle this... */
-         else if (regno == SP_REGNUM)
+         else if (regno == HPPA_SP_REGNUM)
            {
-             write_memory ((CORE_ADDR) & tcb_ptr->static_ctx.sp,
-                           &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)],
+             regcache_raw_read (current_regcache, regno, buf);
+             write_memory ((CORE_ADDR) &tcb_ptr->static_ctx.sp, buf,
+                           register_size (current_gdbarch, regno));
+             tcb_ptr->static_ctx.sp
+               = (cma__t_hppa_regs *) ((CORE_ADDR) buf + 160);
+           }
+         else if (regno == HPPA_PCOQ_HEAD_REGNUM)
+           {
+             regcache_raw_read (current_regcache, regno, buf);
+             write_memory (sp - 20, buf,
                            register_size (current_gdbarch, regno));
-             tcb_ptr->static_ctx.sp = (cma__t_hppa_regs *)
-               (extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)],
-                                          register_size (current_gdbarch, regno)) + 160);
            }
-         else if (regno == PC_REGNUM)
-           write_memory (sp - 20,
-                         &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)],
-                         register_size (current_gdbarch, regno));
          else
-           write_memory (sp + regmap[regno],
-                         &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)],
-                         register_size (current_gdbarch, regno));
+           {
+             regcache_raw_read (current_regcache, regno, buf);
+             write_memory (sp + regmap[regno], buf,
+                           register_size (current_gdbarch, regno));
+           }
        }
     }
 
@@ -403,7 +408,7 @@ hpux_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
   inferior_ptid = main_ptid;
 
   retval = 
-    deprecated_child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, attribs, target);
+    deprecated_child_ops.deprecated_xfer_memory (memaddr, myaddr, len, dowrite, attribs, target);
 
   do_cleanups (old_chain);
 
@@ -550,7 +555,7 @@ init_hpux_thread_ops (void)
   hpux_thread_ops.to_fetch_registers = hpux_thread_fetch_registers;
   hpux_thread_ops.to_store_registers = hpux_thread_store_registers;
   hpux_thread_ops.to_prepare_to_store = hpux_thread_prepare_to_store;
-  hpux_thread_ops.to_xfer_memory = hpux_thread_xfer_memory;
+  hpux_thread_ops.deprecated_xfer_memory = hpux_thread_xfer_memory;
   hpux_thread_ops.to_files_info = hpux_thread_files_info;
   hpux_thread_ops.to_insert_breakpoint = memory_insert_breakpoint;
   hpux_thread_ops.to_remove_breakpoint = memory_remove_breakpoint;
@@ -583,7 +588,7 @@ _initialize_hpux_thread (void)
   add_target (&hpux_thread_ops);
 
   child_suppress_run = 1;
-  /* Hook into new_objfile notification. */
+  /* Hook into new_objfile notification.  */
   target_new_objfile_chain = deprecated_target_new_objfile_hook;
   deprecated_target_new_objfile_hook  = hpux_thread_new_objfile;
 }