From owner-svn-src-user@FreeBSD.ORG  Mon Jul  5 01:11:42 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 263D7106564A;
	Mon,  5 Jul 2010 01:11:42 +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 168698FC08;
	Mon,  5 Jul 2010 01:11:42 +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 o651BfDL099535;
	Mon, 5 Jul 2010 01:11:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o651Bfpo099533;
	Mon, 5 Jul 2010 01:11:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007050111.o651Bfpo099533@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 5 Jul 2010 01:11:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209706 - user/nwhitehorn/ps3/powerpc/ps3
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2010 01:11:42 -0000

Author: nwhitehorn
Date: Mon Jul  5 01:11:41 2010
New Revision: 209706
URL: http://svn.freebsd.org/changeset/base/209706

Log:
  Missed some slots in the parameter save area, which caused hypercall stubs
  to trample over memory when given more than 8 arguments. While here,
  remove the comment pass-through for the ASM file. It caused problems,
  and isn't necessary.

Modified:
  user/nwhitehorn/ps3/powerpc/ps3/ps3-hv-asm.awk

Modified: user/nwhitehorn/ps3/powerpc/ps3/ps3-hv-asm.awk
==============================================================================
--- user/nwhitehorn/ps3/powerpc/ps3/ps3-hv-asm.awk	Mon Jul  5 01:09:59 2010	(r209705)
+++ user/nwhitehorn/ps3/powerpc/ps3/ps3-hv-asm.awk	Mon Jul  5 01:11:41 2010	(r209706)
@@ -13,10 +13,6 @@ BEGIN {
 	printf("#define hc .long 0x44000022\n\n");
 }
 
-/[ \/]\*.*/ {
-	print($0);
-}
-
 /HVCALL.*/ {
 	code = $2;
 	ins = split($4, a, ",")
@@ -33,7 +29,7 @@ BEGIN {
 	# Save output reg addresses to the stack
 	for (i = 0; i < outs; i++) {
 		if (ins+i >= 8) {
-		   printf("\tld	%%r11,%d(%%r1)\n", 48+8*outs + 48 + 8*i);
+		   printf("\tld	%%r11,%d(%%r1)\n", 48+8*outs + 48 + 8*(i+ins));
 		   printf("\tstd	%%r11,%d(%%r1)\n", 48+8*i);
 		} else {
 		   printf("\tstd	%%r%d,%d(%%r1)\n", 3+ins+i, 48+8*i);