From owner-svn-src-user@FreeBSD.ORG  Tue Mar 26 16:38:04 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7BC59130;
 Tue, 26 Mar 2013 16:38:04 +0000 (UTC)
 (envelope-from dchagin@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 6D477A5B;
 Tue, 26 Mar 2013 16:38:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QGc4Ks027710;
 Tue, 26 Mar 2013 16:38:04 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QGc4ID027708;
 Tue, 26 Mar 2013 16:38:04 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201303261638.r2QGc4ID027708@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Tue, 26 Mar 2013 16:38:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248727 - in user/dchagin/lemul/sys: amd64/linux32
 i386/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 26 Mar 2013 16:38:04 -0000

Author: dchagin
Date: Tue Mar 26 16:38:03 2013
New Revision: 248727
URL: http://svnweb.freebsd.org/changeset/base/248727

Log:
  Calculate the %rip value rather than hard coding numbers.

Modified:
  user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s
  user/dchagin/lemul/sys/i386/linux/linux_locore.s

Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s	Tue Mar 26 14:36:11 2013	(r248726)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_locore.s	Tue Mar 26 16:38:03 2013	(r248727)
@@ -17,7 +17,7 @@ NON_GPROF_ENTRY(linux32_sigcode)
 	call .getip0
 .getip0:
 	popl	%eax
-	add	$11, %eax
+	add	$.startsigcode-.getip0, %eax	/* ret address */
 	push	%eax
 	jmp	*LINUX_SIGF_HANDLER(%ebx)
 .startsigcode:
@@ -34,7 +34,7 @@ NON_GPROF_ENTRY(linux32_rt_sigcode)
 	call	.getip1
 .getip1:
 	popl	%eax
-	add	$11, %eax
+	add	$.startrtsigcode-.getip1, %eax	/* ret address */
 	push	%eax
 	jmp	*LINUX_RT_SIGF_HANDLER(%edi)
 .startrtsigcode:

Modified: user/dchagin/lemul/sys/i386/linux/linux_locore.s
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_locore.s	Tue Mar 26 14:36:11 2013	(r248726)
+++ user/dchagin/lemul/sys/i386/linux/linux_locore.s	Tue Mar 26 16:38:03 2013	(r248727)
@@ -16,7 +16,7 @@ NON_GPROF_ENTRY(linux_sigcode)
 	call .getip0
 .getip0:
 	popl	%eax
-	add	$11, %eax
+	add	$.startsigcode-.getip0, %eax	/* ret address */
 	push	%eax
 	jmp	*LINUX_SIGF_HANDLER(%ebx)
 .startsigcode:
@@ -33,7 +33,7 @@ NON_GPROF_ENTRY(linux_rt_sigcode)
 	call	.getip1
 .getip1:
 	popl	%eax
-	add	$11, %eax
+	add	$.startrtsigcode-.getip1, %eax	/* ret address */
 	push	%eax
 	jmp	*LINUX_RT_SIGF_HANDLER(%edi)
 .startrtsigcode: