From owner-svn-src-head@FreeBSD.ORG  Mon Feb 22 14:17:23 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84FC8106566B;
	Mon, 22 Feb 2010 14:17:23 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73C768FC13;
	Mon, 22 Feb 2010 14:17:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MEHN5x067261;
	Mon, 22 Feb 2010 14:17:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1MEHNju067259;
	Mon, 22 Feb 2010 14:17:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201002221417.o1MEHNju067259@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 22 Feb 2010 14:17:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204197 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2010 14:17:23 -0000

Author: nwhitehorn
Date: Mon Feb 22 14:17:23 2010
New Revision: 204197
URL: http://svn.freebsd.org/changeset/base/204197

Log:
  Allow user programs to execute mfpvr instructions. Linux allows this, and
  some math-related software like GMP expects to be able to use it to pick
  a target appropriately.
  
  MFC after:	1 week

Modified:
  head/sys/powerpc/aim/trap.c

Modified: head/sys/powerpc/aim/trap.c
==============================================================================
--- head/sys/powerpc/aim/trap.c	Mon Feb 22 14:12:23 2010	(r204196)
+++ head/sys/powerpc/aim/trap.c	Mon Feb 22 14:17:23 2010	(r204197)
@@ -82,6 +82,7 @@ static void	printtrap(u_int vector, stru
 		    int user);
 static int	trap_pfault(struct trapframe *frame, int user);
 static int	fix_unaligned(struct thread *td, struct trapframe *frame);
+static int	ppc_instr_emulate(struct trapframe *frame);
 static int	handle_onfault(struct trapframe *frame);
 static void	syscall(struct trapframe *frame);
 
@@ -209,7 +210,9 @@ trap(struct trapframe *frame)
 			/* Identify the trap reason */
 			if (frame->srr1 & EXC_PGM_TRAP)
 				sig = SIGTRAP;
- 			else
+ 			else if (ppc_instr_emulate(frame) == 0)
+				frame->srr0 += 4;
+			else
 				sig = SIGILL;
 			break;
 
@@ -615,3 +618,21 @@ fix_unaligned(struct thread *td, struct 
 
 	return -1;
 }
+
+static int
+ppc_instr_emulate(struct trapframe *frame)
+{
+	uint32_t instr;
+	int reg;
+
+	instr = fuword32((void *)frame->srr0);
+
+	if ((instr & 0xfc1fffff) == 0x7c1f42a6) {	/* mfpvr */
+		reg = (instr & ~0xfc1fffff) >> 21;
+		frame->fixreg[reg] = mfpvr();
+		return (0);
+	}
+
+	return (-1);
+}
+