2003-03-01 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gdb / m68klinux-nat.c

diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index 756275778c911d91ca95cf8046adfec7dbd82291..0f0a7d102415f1c45401ba86b28d747997c50135 100644 (file)
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -1,5 +1,7 @@
-/* Motorola m68k native support for Linux
-   Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Motorola m68k native support for GNU/Linux.
+
+   Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation,
+   Inc.
 
    This file is part of GDB.
 
@@ -23,8 +25,11 @@
 #include "inferior.h"
 #include "language.h"
 #include "gdbcore.h"
+#include "gdb_string.h"
 #include "regcache.h"
 
+#include "m68k-tdep.h"
+
 #ifdef USG
 #include <sys/types.h>
 #endif
@@ -49,7 +54,6 @@
 
 #include "target.h"
 \f
-
 /* This table must line up with REGISTER_NAMES in tm-m68k.h */
 static const int regmap[] =
 {
@@ -76,7 +80,7 @@ getregs_supplies (int regno)
 int
 getfpregs_supplies (int regno)
 {
-  return FP0_REGNUM <= regno && regno <= FPI_REGNUM;
+  return FP0_REGNUM <= regno && regno <= M68K_FPI_REGNUM;
 }
 
 /* Does the current host support the GETREGS request?  */
@@ -131,7 +135,7 @@ fetch_register (int regno)
   char mess[128];              /* For messages */
   register int i;
   unsigned int offset;         /* Offset of registers within the u area.  */
-  char buf[MAX_REGISTER_RAW_SIZE];
+  char *buf = alloca (max_register_size (current_gdbarch));
   int tid;
 
   if (CANNOT_FETCH_REGISTER (regno))
@@ -195,6 +199,7 @@ store_register (int regno)
   register int i;
   unsigned int offset;         /* Offset of registers within the u area.  */
   int tid;
+  char *buf = alloca (MAX_REGISTER_RAW_SIZE);
 
   if (CANNOT_STORE_REGISTER (regno))
     {
@@ -208,11 +213,16 @@ store_register (int regno)
   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);
+
+  /* Put the contents of regno into a local buffer */
+  regcache_collect (regno, buf);
+
+  /* Store the local buffer into the inferior a chunk at the time. */
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
       ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
-             *(PTRACE_XFER_TYPE *) & registers[REGISTER_BYTE (regno) + i]);
+             *(PTRACE_XFER_TYPE *) (buf + i));
       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
        {
@@ -267,7 +277,7 @@ supply_gregset (elf_gregset_t *gregsetp)
   elf_greg_t *regp = (elf_greg_t *) gregsetp;
   int regi;
 
-  for (regi = D0_REGNUM; regi <= SP_REGNUM; regi++)
+  for (regi = M68K_D0_REGNUM; regi <= SP_REGNUM; regi++)
     supply_register (regi, (char *) &regp[regmap[regi]]);
   supply_register (PS_REGNUM, (char *) &regp[PT_SR]);
   supply_register (PC_REGNUM, (char *) &regp[PT_PC]);
@@ -351,11 +361,11 @@ supply_fpregset (elf_fpregset_t *fpregsetp)
 {
   int regi;
 
-  for (regi = FP0_REGNUM; regi < FPC_REGNUM; regi++)
+  for (regi = FP0_REGNUM; regi < FP0_REGNUM + 8; regi++)
     supply_register (regi, FPREG_ADDR (fpregsetp, regi - FP0_REGNUM));
-  supply_register (FPC_REGNUM, (char *) &fpregsetp->fpcntl[0]);
-  supply_register (FPS_REGNUM, (char *) &fpregsetp->fpcntl[1]);
-  supply_register (FPI_REGNUM, (char *) &fpregsetp->fpcntl[2]);
+  supply_register (M68K_FPC_REGNUM, (char *) &fpregsetp->fpcntl[0]);
+  supply_register (M68K_FPS_REGNUM, (char *) &fpregsetp->fpcntl[1]);
+  supply_register (M68K_FPI_REGNUM, (char *) &fpregsetp->fpcntl[2]);
 }
 
 /* Fill register REGNO (if it is a floating-point register) in
@@ -370,15 +380,12 @@ fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
   /* Fill in the floating-point registers.  */
   for (i = FP0_REGNUM; i < FP0_REGNUM + 8; i++)
     if (regno == -1 || regno == i)
-      memcpy (FPREG_ADDR (fpregsetp, regno - FP0_REGNUM),
-             &registers[REGISTER_BYTE (regno)],
-             REGISTER_RAW_SIZE(regno));
+      regcache_collect (regno, FPREG_ADDR (fpregsetp, regno - FP0_REGNUM));
 
   /* Fill in the floating-point control registers.  */
-  for (i = FPC_REGNUM; i <= FPI_REGNUM; i++)
+  for (i = M68K_FPC_REGNUM; i <= M68K_FPI_REGNUM; i++)
     if (regno == -1 || regno == i)
-      fpregsetp->fpcntl[regno - FPC_REGNUM]
-       = *(int *) &registers[REGISTER_BYTE (regno)];
+      regcache_collect (regno, (char *) &fpregsetp->fpcntl[regno - M68K_FPC_REGNUM]);
 }
 
 #ifdef HAVE_PTRACE_GETREGS
@@ -442,7 +449,7 @@ fetch_inferior_registers (int regno)
       return;
     }
 
-  /* Linux LWP ID's are process ID's.  */
+  /* GNU/Linux LWP ID's are process ID's.  */
   if ((tid = TIDGET (inferior_ptid)) == 0)
     tid = PIDGET (inferior_ptid);              /* Not a threaded program.  */
 
@@ -497,7 +504,7 @@ store_inferior_registers (int regno)
       return;
     }
 
-  /* Linux LWP ID's are process ID's.  */
+  /* GNU/Linux LWP ID's are process ID's.  */
   if ((tid = TIDGET (inferior_ptid)) == 0)
     tid = PIDGET (inferior_ptid);      /* Not a threaded program.  */
 
@@ -543,7 +550,7 @@ store_inferior_registers (int regno)
      0 --- the general-purpose register set, in elf_gregset_t format
      2 --- the floating-point register set, in elf_fpregset_t format
 
-   REG_ADDR isn't used on Linux.  */
+   REG_ADDR isn't used on GNU/Linux.  */
 
 static void
 fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
@@ -589,42 +596,8 @@ kernel_u_size (void)
   return (sizeof (struct user));
 }
 \f
-/* Return non-zero if PC points into the signal trampoline.  */
-
-int
-in_sigtramp (CORE_ADDR pc)
-{
-  CORE_ADDR sp;
-  char buf[TARGET_SHORT_BIT / TARGET_CHAR_BIT];
-  int insn;
-
-  sp = read_register (SP_REGNUM);
-  if (pc - 2 < sp)
-    return 0;
-
-  if (read_memory_nobpt (pc, buf, sizeof (buf)))
-    return 0;
-  insn = extract_unsigned_integer (buf, sizeof (buf));
-  if (insn == 0xdefc           /* addaw #,sp */
-      || insn == 0x7077                /* moveq #119,d0 */
-      || insn == 0x4e40                /* trap #0 */
-      || insn == 0x203c /* movel #,d0 */ )
-    return 1;
-
-  if (read_memory_nobpt (pc - 2, buf, sizeof (buf)))
-    return 0;
-  insn = extract_unsigned_integer (buf, sizeof (buf));
-  if (insn == 0xdefc           /* addaw #,sp */
-      || insn == 0x7077                /* moveq #119,d0 */
-      || insn == 0x4e40                /* trap #0 */
-      || insn == 0x203c /* movel #,d0 */ )
-    return 1;
-
-  return 0;
-}
-
-\f
-/* Register that we are able to handle Linux ELF core file formats.  */
+/* Register that we are able to handle GNU/Linux ELF core file
+   formats.  */
 
 static struct core_fns linux_elf_core_fns =
 {
@@ -636,7 +609,7 @@ static struct core_fns linux_elf_core_fns =
 };
 
 void
-_initialize_m68k_linux_nat ()
+_initialize_m68k_linux_nat (void)
 {
   add_core_fns (&linux_elf_core_fns);
 }