From owner-svn-src-all@FreeBSD.ORG  Sat Nov  8 11:56:27 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9F93A321;
 Sat,  8 Nov 2014 11:56:27 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8C5C07F1;
 Sat,  8 Nov 2014 11:56:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8BuRRl073367;
 Sat, 8 Nov 2014 11:56:27 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8BuRJM073366;
 Sat, 8 Nov 2014 11:56:27 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201411081156.sA8BuRJM073366@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 8 Nov 2014 11:56:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274279 - head/sys/amd64/amd64
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.18-1
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: Sat, 08 Nov 2014 11:56:27 -0000

Author: kib
Date: Sat Nov  8 11:56:26 2014
New Revision: 274279
URL: https://svnweb.freebsd.org/changeset/base/274279

Log:
  MFi386 r253328:
  Create a proper stack frame for amd64 version of bcopy().  Note that
  this also makes the stack properly aligned in the function, despite it
  is not strictly needed.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/support.S

Modified: head/sys/amd64/amd64/support.S
==============================================================================
--- head/sys/amd64/amd64/support.S	Sat Nov  8 07:54:34 2014	(r274278)
+++ head/sys/amd64/amd64/support.S	Sat Nov  8 11:56:26 2014	(r274279)
@@ -100,6 +100,8 @@ END(bcmp)
  *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
  */
 ENTRY(bcopy)
+	pushq	%rbp
+	movq	%rsp,%rbp
 	xchgq	%rsi,%rdi
 	movq	%rdx,%rcx
 
@@ -116,6 +118,7 @@ ENTRY(bcopy)
 	andq	$7,%rcx				/* any bytes left? */
 	rep
 	movsb
+	popq	%rbp
 	ret
 
 	/* ALIGN_TEXT */
@@ -135,6 +138,7 @@ ENTRY(bcopy)
 	rep
 	movsq
 	cld
+	popq	%rbp
 	ret
 END(bcopy)