6 files changed, 30 insertions, 30 deletions
diff --git a/sysdeps/i386/i586/addmul_1.S b/sysdeps/i386/i586/addmul_1.S
index 18955e36d9..1890c5dfa1 100644
--- a/sysdeps/i386/i586/addmul_1.S
+++ b/sysdeps/i386/i586/addmul_1.S
@@ -38,13 +38,13 @@
 ENTRY (BP_SYM (__mpn_addmul_1))
 	ENTER
 
-	pushl	%edi
+	pushl	%res_ptr
 	cfi_adjust_cfa_offset (4)
-	pushl	%esi
+	pushl	%s1_ptr
 	cfi_adjust_cfa_offset (4)
 	pushl	%ebp
 	cfi_adjust_cfa_offset (4)
-	pushl	%ebx
+	pushl	%s2_limb
 	cfi_adjust_cfa_offset (4)
 
 	movl	RES(%esp), %res_ptr
@@ -86,18 +86,18 @@ L(oop):	adcl	$0, %ebp
 
 	adcl	$0, %ebp
 	movl	%ebp, %eax
-	popl	%ebx
+	popl	%s2_limb
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (ebx)
+	cfi_restore (s2_limb)
 	popl	%ebp
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (ebp)
-	popl	%esi
+	popl	%s1_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (esi)
-	popl	%edi
+	cfi_restore (s1_ptr)
+	popl	%res_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (edi)
+	cfi_restore (res_ptr)
 
 	LEAVE
 	ret
diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
index 1fa267ef50..6ab457fc55 100644
--- a/sysdeps/i386/i586/memcpy.S
+++ b/sysdeps/i386/i586/memcpy.S
@@ -46,7 +46,7 @@ ENTRY (BP_SYM (memcpy))
 	movl	DEST(%esp), %edi
 	cfi_rel_offset (edi, 4)
 	movl	SRC(%esp), %esi
-	cfi_rel_offset (esi, 4)
+	cfi_rel_offset (esi, 0)
 	movl	LEN(%esp), %ecx
 	CHECK_BOUNDS_BOTH_WIDE (%edi, DEST(%esp), %ecx)
 	CHECK_BOUNDS_BOTH_WIDE (%esi, SRC(%esp), %ecx)
diff --git a/sysdeps/i386/i586/mul_1.S b/sysdeps/i386/i586/mul_1.S
index b537c709a3..15765d758f 100644
--- a/sysdeps/i386/i586/mul_1.S
+++ b/sysdeps/i386/i586/mul_1.S
@@ -38,13 +38,13 @@
 ENTRY (BP_SYM (__mpn_mul_1))
 	ENTER
 
-	pushl	%edi
+	pushl	%res_ptr
 	cfi_adjust_cfa_offset (4)
-	pushl	%esi
+	pushl	%s1_ptr
 	cfi_adjust_cfa_offset (4)
 	pushl	%ebp
 	cfi_adjust_cfa_offset (4)
-	pushl	%ebx
+	pushl	%s2_limb
 	cfi_adjust_cfa_offset (4)
 
 	movl	RES(%esp), %res_ptr
@@ -82,18 +82,18 @@ L(oop):	adcl	$0, %ebp
 
 	adcl	$0, %ebp
 	movl	%ebp, %eax
-	popl	%ebx
+	popl	%s2_limb
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (ebx)
+	cfi_restore (s2_limb)
 	popl	%ebp
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (ebp)
-	popl	%esi
+	popl	%s1_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (esi)
-	popl	%edi
+	cfi_restore (s1_ptr)
+	popl	%res_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (edi)
+	cfi_restore (res_ptr)
 
 	LEAVE
 	ret
diff --git a/sysdeps/i386/i586/rshift.S b/sysdeps/i386/i586/rshift.S
index 29eded369b..7b88289d3e 100644
--- a/sysdeps/i386/i586/rshift.S
+++ b/sysdeps/i386/i586/rshift.S
@@ -165,7 +165,7 @@ L(end2):
 	cfi_rel_offset (edi, 12)
 	cfi_rel_offset (esi, 8)
 	cfi_rel_offset (ebp, 4)
-	cfi_rel_offset (ebx, 3)
+	cfi_rel_offset (ebx, 0)
 L(special):
 	leal	-4(%edi,%ebx,4),%edi
 	leal	-4(%esi,%ebx,4),%esi
diff --git a/sysdeps/i386/i586/sub_n.S b/sysdeps/i386/i586/sub_n.S
index 1c40a80082..7c32c1adb6 100644
--- a/sysdeps/i386/i586/sub_n.S
+++ b/sysdeps/i386/i586/sub_n.S
@@ -56,8 +56,8 @@ ENTRY (BP_SYM (__mpn_sub_n))
 	CHECK_BOUNDS_BOTH_WIDE (%ebx, S2(%esp), %ecx)
 	shrl	$2, %ecx
 #endif
-	cfi_rel_offset (ebp, 4)
 	movl	(%ebx),%ebp
+	cfi_rel_offset (ebp, 4)
 
 	decl	%ecx
 	movl	%ecx,%edx
diff --git a/sysdeps/i386/i586/submul_1.S b/sysdeps/i386/i586/submul_1.S
index b9e578fde4..e8bc6478c1 100644
--- a/sysdeps/i386/i586/submul_1.S
+++ b/sysdeps/i386/i586/submul_1.S
@@ -38,13 +38,13 @@
 ENTRY (BP_SYM (__mpn_submul_1))
 	ENTER
 
-	pushl	%edi
+	pushl	%res_ptr
 	cfi_adjust_cfa_offset (4)
-	pushl	%esi
+	pushl	%s1_ptr
 	cfi_adjust_cfa_offset (4)
 	pushl	%ebp
 	cfi_adjust_cfa_offset (4)
-	pushl	%ebx
+	pushl	%s2_limb
 	cfi_adjust_cfa_offset (4)
 
 	movl	RES(%esp), %res_ptr
@@ -86,18 +86,18 @@ L(oop):	adcl	$0, %ebp
 
 	adcl	$0, %ebp
 	movl	%ebp, %eax
-	popl	%ebx
+	popl	%s2_limb
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (ebx)
+	cfi_restore (s2_limb)
 	popl	%ebp
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (ebp)
-	popl	%esi
+	popl	%s1_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (esi)
-	popl	%edi
+	cfi_restore (s1_ptr)
+	popl	%res_ptr
 	cfi_adjust_cfa_offset (-4)
-	cfi_restore (edi)
+	cfi_restore (res_ptr)
 
 	LEAVE
 	ret