From owner-svn-src-projects@FreeBSD.ORG  Wed Apr 24 06:38:50 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7CD3DBE2;
 Wed, 24 Apr 2013 06:38:50 +0000 (UTC)
 (envelope-from cherry@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 6FD3E1193;
 Wed, 24 Apr 2013 06:38:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3O6co2N097392;
 Wed, 24 Apr 2013 06:38:50 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3O6coLS097391;
 Wed, 24 Apr 2013 06:38:50 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201304240638.r3O6coLS097391@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 24 Apr 2013 06:38:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r249832 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2013 06:38:50 -0000

Author: cherry
Date: Wed Apr 24 06:38:49 2013
New Revision: 249832
URL: http://svnweb.freebsd.org/changeset/base/249832

Log:
  Translate the calling conventions from the syscall abi to the C abi.
  Fixes bogus arguments going to syscalls.
  
  Approved by: gibbs(implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/exception.S

Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/exception.S	Wed Apr 24 06:34:56 2013	(r249831)
+++ projects/amd64_xen_pv/sys/amd64/xen/exception.S	Wed Apr 24 06:38:49 2013	(r249832)
@@ -562,7 +562,11 @@ IDTVEC(syscall_callback)
 	TRAP_PROLOGUE(T_USER)	;
 	SAVE_SEGMENT_REGS	;
 	SAVE_GENERAL_REGS	;
-	DO_STI_MAYBE		;
+	movq	%r11, TF_RFLAGS(%rsp) ; /* Tweak for INTR_EXIT */
+	movq	%r10, %rcx	; /* Translate to C abi */
+	movq	%rcx, TF_RCX(%rsp) ; /* Cosmetic. XXX: discard */
+	DO_STI_MAYBE		; /* Clobbers %rdi */
+	movq	TF_RDI(%rsp), %rdi ;
 	CALLSYSCALL		;
 	DO_AST_MAYBE		;
 	RESTORE_GENERAL_REGS	; /* XXX: optimise for SYSRET */