From owner-svn-src-projects@FreeBSD.ORG  Sun Dec  8 11:03:30 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 32CAE21F;
 Sun,  8 Dec 2013 11:03:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F4B31AE2;
 Sun,  8 Dec 2013 11:03:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8B3Txw027604;
 Sun, 8 Dec 2013 11:03:29 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8B3T3k027603;
 Sun, 8 Dec 2013 11:03:29 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201312081103.rB8B3T3k027603@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Sun, 8 Dec 2013 11:03:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r259097 - 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.17
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: Sun, 08 Dec 2013 11:03:30 -0000

Author: cherry
Date: Sun Dec  8 11:03:29 2013
New Revision: 259097
URL: http://svnweb.freebsd.org/changeset/base/259097

Log:
  - Zero out the MSW of %rsi "just in case".
  - Cleanup ABI translation for syscall -> cpu_fetch_syscall_args()
  
  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	Sun Dec  8 09:34:56 2013	(r259096)
+++ projects/amd64_xen_pv/sys/amd64/xen/exception.S	Sun Dec  8 11:03:29 2013	(r259097)
@@ -220,7 +220,7 @@
 	movq	PCPU(CURTHREAD),%rdi ;\
 	movq	%rsp, TD_FRAME(%rdi) ;\
 	movl	TF_RFLAGS(%rsp),%esi ;\
-	andl	$PSL_T,%esi	     ;\
+	andq	$PSL_T, %rsi	     ;\
 	call	amd64_syscall
 
 #define SYSRET \
@@ -564,8 +564,7 @@ IDTVEC(syscall_callback)
 	SAVE_SEGMENT_REGS	;
 	SAVE_GENERAL_REGS	;
 	movq	%r11, TF_RFLAGS(%rsp) ; /* Tweak for INTR_EXIT */
-	movq	%r10, %rcx	; /* Translate to C abi */
-	movq	%rcx, TF_RCX(%rsp) ; /* Cosmetic. XXX: discard */
+	movq	%r10, TF_RCX(%rsp) ; /* Translate to C abi. see trap.c:cpu_fetch_syscall_args() */
 	DO_STI_MAYBE		; /* Clobbers %rdi */
 	movq	TF_RDI(%rsp), %rdi ;
 	CALLSYSCALL		;