From owner-svn-src-all@FreeBSD.ORG  Tue May 21 18:00:48 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 631F9A80;
 Tue, 21 May 2013 18:00:48 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 562611D6;
 Tue, 21 May 2013 18:00:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LI0lwK093765;
 Tue, 21 May 2013 18:00:47 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LI0lKh093764;
 Tue, 21 May 2013 18:00:47 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201305211800.r4LI0lKh093764@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 21 May 2013 18:00:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250864 - head/sys/powerpc/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 18:00:48 -0000

Author: marcel
Date: Tue May 21 18:00:47 2013
New Revision: 250864
URL: http://svnweb.freebsd.org/changeset/base/250864

Log:
  Fix the PowerPC Book-E register definitions used by the remote GDB
  protocol.
  
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/sys/powerpc/include/gdb_machdep.h

Modified: head/sys/powerpc/include/gdb_machdep.h
==============================================================================
--- head/sys/powerpc/include/gdb_machdep.h	Tue May 21 17:47:53 2013	(r250863)
+++ head/sys/powerpc/include/gdb_machdep.h	Tue May 21 18:00:47 2013	(r250864)
@@ -29,11 +29,20 @@
 #ifndef _MACHINE_GDB_MACHDEP_H_
 #define	_MACHINE_GDB_MACHDEP_H_
 
+#ifdef BOOKE
+#define	PPC_GDB_NREGS0	1
+#define	PPC_GDB_NREGS4	(70 + 1)
+#define	PPC_GDB_NREGS8	(1 + 32)
+#define	PPC_GDB_NREGS16	0
+#else
+#define	PPC_GDB_NREGS0	0
 #define	PPC_GDB_NREGS4	(32 + 7 + 2)
 #define	PPC_GDB_NREGS8	32
 #define	PPC_GDB_NREGS16	32
+#endif
 
-#define GDB_NREGS	(PPC_GDB_NREGS4 + PPC_GDB_NREGS8 + PPC_GDB_NREGS16)
+#define GDB_NREGS	(PPC_GDB_NREGS0 + PPC_GDB_NREGS4 + \
+			 PPC_GDB_NREGS8 + PPC_GDB_NREGS16)
 #define	GDB_REG_PC	64
 
 #define	GDB_BUFSZ	(PPC_GDB_NREGS4 * 8 +	\
@@ -44,10 +53,17 @@ static __inline size_t
 gdb_cpu_regsz(int regnum)
 {
 
+#ifdef BOOKE
+	if (regnum == 70)
+		return (0);
+	if (regnum == 71 || regnum >= 73)
+		return (8);
+#else
 	if (regnum >= 32 && regnum <= 63)
 		return (8);
 	if (regnum >= 71 && regnum <= 102)
 		return (16);
+#endif
 	return (4);
 }