Merge GDB 7.5.1

gdb/ppc-linux-nat.c

 /* PPC GNU/Linux native support.
 
    Copyright (C) 1988-1989, 1991-1992, 1994, 1996, 2000-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 3 of the License, or
@@ skipping 575 matching lines @@
       return;
     }
 
   /* Read the raw register using sizeof(long) sized chunks.  On a
      32-bit platform, 64-bit floating-point registers will require two
      transfers.  */
   for (bytes_transferred = 0;
        bytes_transferred < register_size (gdbarch, regno);
        bytes_transferred += sizeof (long))
     {
+      long l;
+
       errno = 0;
-      *(long *) &buf[bytes_transferred]
-        = ptrace (PTRACE_PEEKUSER, tid, (PTRACE_TYPE_ARG3) regaddr, 0);
+      l = ptrace (PTRACE_PEEKUSER, tid, (PTRACE_TYPE_ARG3) regaddr, 0);
       regaddr += sizeof (long);
       if (errno != 0)
         {
           char message[128];
           sprintf (message, "reading register %s (#%d)", 
                    gdbarch_register_name (gdbarch, regno), regno);
           perror_with_name (message);
         }
+      memcpy (&buf[bytes_transferred], &l, sizeof (l));
     }
 
   /* Now supply the register.  Keep in mind that the regcache's idea
      of the register's size may not be a multiple of sizeof
      (long).  */
   if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
     {
       /* Little-endian values are always found at the left end of the
          bytes transferred.  */
       regcache_raw_supply (regcache, regno, buf);
@@ skipping 449 matching lines @@
     }
   else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
     {
       /* Big-endian values sit at the right end of the buffer.  */
       size_t padding = (bytes_to_transfer - register_size (gdbarch, regno));
       regcache_raw_collect (regcache, regno, buf + padding);
     }
 
   for (i = 0; i < bytes_to_transfer; i += sizeof (long))
     {
+      long l;
+
+      memcpy (&l, &buf[i], sizeof (l));
       errno = 0;
-      ptrace (PTRACE_POKEUSER, tid, (PTRACE_TYPE_ARG3) regaddr,
-              *(long *) &buf[i]);
+      ptrace (PTRACE_POKEUSER, tid, (PTRACE_TYPE_ARG3) regaddr, l);
       regaddr += sizeof (long);
 
       if (errno == EIO 
           && (regno == tdep->ppc_fpscr_regnum
               || regno == PPC_ORIG_R3_REGNUM
               || regno == PPC_TRAP_REGNUM))
         {
           /* Some older kernel versions don't allow fpscr, orig_r3
              or trap to be written.  */
           continue;
@@ skipping 251 matching lines @@
     if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
       store_altivec_registers (regcache, tid);
   if (have_ptrace_getsetvsxregs)
     if (tdep->ppc_vsr0_upper_regnum != -1)
       store_vsx_registers (regcache, tid);
   if (tdep->ppc_ev0_upper_regnum >= 0)
     store_spe_register (regcache, tid, -1);
 }
 
 /* Fetch the AT_HWCAP entry from the aux vector.  */
-unsigned long ppc_linux_get_hwcap (void)
+static unsigned long
+ppc_linux_get_hwcap (void)
 {
   CORE_ADDR field;
 
   if (target_auxv_search (&current_target, AT_HWCAP, &field))
     return (unsigned long) field;
 
   return 0;
 }
 
 /* The cached DABR value, to install in new threads.
@@ skipping 48 matching lines @@
     {
       int tid;
 
       tid = TIDGET (inferior_ptid);
       if (tid == 0)
         tid = PIDGET (inferior_ptid);
 
       /* Check for kernel support for BOOKE debug registers.  */
       if (ptrace (PPC_PTRACE_GETHWDBGINFO, tid, 0, &booke_debug_info) >= 0)
         {
-          have_ptrace_booke_interface = 1;
-          max_slots_number = booke_debug_info.num_instruction_bps
-            + booke_debug_info.num_data_bps
-            + booke_debug_info.num_condition_regs;
+          /* Check whether ptrace BOOKE interface is functional and
+             provides any supported feature.  */
+          if (booke_debug_info.features != 0)
+            {
+              have_ptrace_booke_interface = 1;
+              max_slots_number = booke_debug_info.num_instruction_bps
+                + booke_debug_info.num_data_bps
+                + booke_debug_info.num_condition_regs;
+              return have_ptrace_booke_interface;
+            }
         }
-      else
-        {
-          /* Old school interface and no BOOKE debug registers support.  */
-          have_ptrace_booke_interface = 0;
-          memset (&booke_debug_info, 0, sizeof (struct ppc_debug_info));
-        }
+      /* Old school interface and no BOOKE debug registers support.  */
+      have_ptrace_booke_interface = 0;
+      memset (&booke_debug_info, 0, sizeof (struct ppc_debug_info));
     }
 
   return have_ptrace_booke_interface;
 }
 
 static int
 ppc_linux_can_use_hw_breakpoint (int type, int cnt, int ot)
 {
   int total_hw_wp, total_hw_bp;
 
   if (have_ptrace_booke_interface ())
     {
       /* For PPC BookE processors, the number of available hardware
          watchpoints and breakpoints is stored at the booke_debug_info
          struct.  */
       total_hw_bp = booke_debug_info.num_instruction_bps;
       total_hw_wp = booke_debug_info.num_data_bps;
     }
   else
     {
       /* For PPC server processors, we accept 1 hardware watchpoint and 0
          hardware breakpoints.  */
       total_hw_bp = 0;
       total_hw_wp = 1;
     }
 
   if (type == bp_hardware_watchpoint || type == bp_read_watchpoint
       || type == bp_access_watchpoint || type == bp_watchpoint)
     {
-      if (cnt > total_hw_wp)
+      if (cnt + ot > total_hw_wp)
         return -1;
     }
   else if (type == bp_hardware_breakpoint)
     {
       if (cnt > total_hw_bp)
         return -1;
     }
 
   if (!have_ptrace_booke_interface ())
     {
@@ skipping 674 matching lines @@
                     saved_dabr_value) < 0)
           return -1;
 
       ret = 0;
     }
 
   return ret;
 }
 
 static void
-ppc_linux_new_thread (ptid_t ptid)
+ppc_linux_new_thread (struct lwp_info *lp)
 {
-  int tid = TIDGET (ptid);
+  int tid = TIDGET (lp->ptid);
 
   if (have_ptrace_booke_interface ())
     {
       int i;
       struct thread_points *p;
       struct hw_break_tuple *hw_breaks;
 
       if (VEC_empty (thread_points_p, ppc_threads))
         return;
 
@@ skipping 39 matching lines @@
     if (hw_breaks[i].hw_break)
       xfree (hw_breaks[i].hw_break);
 
   xfree (t->hw_breaks);
   xfree (t);
 }
 
 static int
 ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
 {
-  struct siginfo *siginfo_p;
+  siginfo_t siginfo;
 
-  siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+  if (!linux_nat_get_siginfo (inferior_ptid, &siginfo))
+    return 0;
 
-  if (siginfo_p->si_signo != SIGTRAP
-      || (siginfo_p->si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */)
+  if (siginfo.si_signo != SIGTRAP
+      || (siginfo.si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */)
     return 0;
 
   if (have_ptrace_booke_interface ())
     {
       int i;
       struct thread_points *t;
       struct hw_break_tuple *hw_breaks;
       /* The index (or slot) of the *point is passed in the si_errno field.  */
-      int slot = siginfo_p->si_errno;
+      int slot = siginfo.si_errno;
 
       t = booke_find_thread_points_by_tid (TIDGET (inferior_ptid), 0);
 
       /* Find out if this *point is a hardware breakpoint.
          If so, we should return 0.  */
       if (t)
         {
           hw_breaks = t->hw_breaks;
           for (i = 0; i < max_slots_number; i++)
            if (hw_breaks[i].hw_break && hw_breaks[i].slot == slot
                && hw_breaks[i].hw_break->trigger_type
                     == PPC_BREAKPOINT_TRIGGER_EXECUTE)
              return 0;
         }
     }
 
-  *addr_p = (CORE_ADDR) (uintptr_t) siginfo_p->si_addr;
+  *addr_p = (CORE_ADDR) (uintptr_t) siginfo.si_addr;
   return 1;
 }
 
 static int
 ppc_linux_stopped_by_watchpoint (void)
 {
   CORE_ADDR addr;
   return ppc_linux_stopped_data_address (&current_target, &addr);
 }
 
@@ skipping 264 matching lines @@
 
   t->to_read_description = ppc_linux_read_description;
   t->to_auxv_parse = ppc_linux_auxv_parse;
 
   observer_attach_thread_exit (ppc_linux_thread_exit);
 
   /* Register the target.  */
   linux_nat_add_target (t);
   linux_nat_set_new_thread (t, ppc_linux_new_thread);
 }