From owner-p4-projects@FreeBSD.ORG  Fri May 23 19:22:25 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75FBB37B404; Fri, 23 May 2003 19:22:24 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 43F1537B401
	for <perforce@freebsd.org>; Fri, 23 May 2003 19:22:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E101F43F75
	for <perforce@freebsd.org>; Fri, 23 May 2003 19:22:23 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4O2MN0U012251
	for <perforce@freebsd.org>; Fri, 23 May 2003 19:22:23 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4O2MNu2012248
	for perforce@freebsd.org; Fri, 23 May 2003 19:22:23 -0700 (PDT)
Date: Fri, 23 May 2003 19:22:23 -0700 (PDT)
Message-Id: <200305240222.h4O2MNu2012248@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 May 2003 02:22:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=31754

Change 31754 by peter@peter_hammer on 2003/05/23 19:21:28

	it seems I cannot count today.

Affected files ...

.. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#9 edit

Differences ...

==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#9 (text+ko) ====

@@ -62,13 +62,13 @@
  * assembly-language code that is not ABI-compliant.
  *
  * Stack map:
- * obj          0x58
- * reloff       0x50
- * return addr  0x48
- * rflags       0x40
- * rax          0x38
- * rdx          0x30
- * rcx          0x28
+ * reloff       0x58
+ * obj          0x50
+ * rflags       0x48
+ * rax          0x40
+ * rdx          0x38
+ * rcx          0x30
+ * rsi          0x28
  * rdi          0x20
  * r8           0x18
  * r9           0x10
@@ -90,13 +90,13 @@
 	pushq	%r10			# Save %r10
 	pushq	%r11			# Save %r11
 
-	movq	0x58(%rsp),%rdi		# Fetch obj argument
-	movq	0x50(%rsp),%rsi		# Fetch reloff argument
+	movq	0x50(%rsp),%rdi		# Fetch obj argument
+	movq	0x58(%rsp),%rsi		# Fetch reloff argument
 
 	call	_rtld_bind@PLT		# Transfer control to the binder
 	/* Now %rax contains the entry point of the function being called. */
 
-	movq	%rax,0x58(%rsp)		# Store target over obj argument
+	movq	%rax,0x58(%rsp)		# Store target over reloff argument
 	popq	%r11			# Restore %r11
 	popq	%r10			# Restore %r10
 	popq	%r9			# Restore %r9
@@ -107,5 +107,5 @@
 	popq	%rdx			# Restore %rdx
 	popq	%rax			# Restore %rax
 	popfq				# Restore rflags
-	leaq	8(%rsp),%rsp		# Discard reloff, do not change rflags
+	leaq	8(%rsp),%rsp		# Discard obj, do not change rflags
 	ret				# "Return" to target address