PERFORCE change 31754 for review

[Peter Wemm]

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

Change 31754 by peter at 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 at 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