patch-2.2.0-pre8 linux/arch/i386/lib/checksum.S

• Lines: 83
• Date: Fri Jan 15 14:36:20 1999
• Orig file: v2.2.0-pre7/linux/arch/i386/lib/checksum.S
• Orig date: Mon Dec 28 15:00:52 1998

diff -u --recursive --new-file v2.2.0-pre7/linux/arch/i386/lib/checksum.S linux/arch/i386/lib/checksum.S
@@ -299,8 +299,8 @@
 	adcl %edx, %eax
 DST(	movl %edx, 28(%edi)	)
 
-SRC(	lea 32(%esi), %esi	)
-DST(	lea 32(%edi), %edi	)
+	lea 32(%esi), %esi
+	lea 32(%edi), %edi
 	dec %ecx
 	jne 1b
 	adcl $0, %eax
@@ -312,8 +312,8 @@
 SRC(3:	movl (%esi), %ebx	)
 	adcl %ebx, %eax
 DST(	movl %ebx, (%edi)	)
-SRC(	lea 4(%esi), %esi	)
-DST(	lea 4(%edi), %edi	)
+	lea 4(%esi), %esi
+	lea 4(%edi), %edi
 	dec %edx
 	jne 3b
 	adcl $0, %eax
@@ -322,9 +322,9 @@
 	cmpl $2, %ecx
 	jb 5f
 SRC(	movw (%esi), %cx	)
-SRC(	leal 2(%esi), %esi	)
+	leal 2(%esi), %esi
 DST(	movw %cx, (%edi)	)
-DST(	leal 2(%edi), %edi	)
+	leal 2(%edi), %edi
 	je 6f
 	shll $16,%ecx
 SRC(5:	movb (%esi), %cl	)
@@ -337,8 +337,8 @@
 # Exception handler:
 .section .fixup, "ax"							
 
-6000:
-
+6001:
+	movl ARGBASE+20(%esp), %ebx	# src_err_ptr
 	movl $-EFAULT, (%ebx)
 
 	# zero the complete destination - computing the rest
@@ -350,13 +350,10 @@
 
 	jmp 5000b
 
-6001:
-	movl ARGBASE+20(%esp), %ebx	# src_err_ptr
-	jmp 6000b
-
 6002:
 	movl ARGBASE+24(%esp), %ebx	# dst_err_ptr
-	jmp 6000b
+	movl $-EFAULT,(%ebx)
+	jmp 5000b
 
 .previous
 
@@ -426,17 +423,17 @@
 	adcl $0, %eax
 7:
 .section .fixup, "ax"
-6000:	movl $-EFAULT, (%ebx)
+6001:	movl	ARGBASE+20(%esp), %ebx	# src_err_ptr	
+	movl $-EFAULT, (%ebx)
 	# zero the complete destination (computing the rest is too much work)
 	movl ARGBASE+8(%esp),%edi	# dst
 	movl ARGBASE+12(%esp),%ecx	# len
 	xorl %eax,%eax
 	rep; stosb
 	jmp 7b
-6001:	movl ARGBASE+20(%esp), %ebx	# src_err_ptr
-	jmp 6000b	
 6002:	movl ARGBASE+24(%esp), %ebx	# dst_err_ptr
-	jmp 6000b
+	movl $-EFAULT, (%ebx)
+	jmp  7b			
 .previous				
 
 	popl %esi