Use 'mov' instead of 'lea' for setting the syscall number in %eax as that

is clearer about what we are actually doing.

Requested by:	bde

13 files changed, 21 insertions, 21 deletions

diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 6ef3136..2e0f708 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -47,14 +47,14 @@
 			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b
 
 #define	RSYSCALL(x)	SYSCALL(x); ret
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			lea __CONCAT(SYS_,x), %eax; KERNCALL; ret
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; ret
 
 /* gas messes up offset -- although we don't currently need it, do for BCS */
 #define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/amd64/sys/brk.S
index 652e4b9..d9d8877 100644
--- a/lib/libc/amd64/sys/brk.S
+++ b/lib/libc/amd64/sys/brk.S
@@ -58,7 +58,7 @@ ENTRY(brk)
 	movl	(%ecx),%eax
 	movl	%eax,4(%esp)
 ok:
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	4(%esp),%eax
@@ -77,7 +77,7 @@ err:
 	movl	HIDENAME(minbrk),%eax
 	movl	%eax,4(%esp)
 ok:
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	4(%esp),%eax
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index 676b3f8..d3c8433 100644
--- a/lib/libc/amd64/sys/exect.S
+++ b/lib/libc/amd64/sys/exect.S
@@ -43,7 +43,7 @@
 #include <machine/psl.h>
 
 ENTRY(exect)
-	lea	SYS_execve,%eax
+	mov	$SYS_execve,%eax
 	pushf
 	popl	%edx
 	orl	$ PSL_T,%edx
diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/amd64/sys/ptrace.S
index 881e8a3..dc786fb 100644
--- a/lib/libc/amd64/sys/ptrace.S
+++ b/lib/libc/amd64/sys/ptrace.S
@@ -51,7 +51,7 @@ ENTRY(ptrace)
 #else
         movl    %eax,CNAME(errno)
 #endif
-	lea	SYS_ptrace,%eax
+	mov	$SYS_ptrace,%eax
 	KERNCALL
 	jb	err
 	ret
diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/amd64/sys/sbrk.S
index 8d4ca87..066535e 100644
--- a/lib/libc/amd64/sys/sbrk.S
+++ b/lib/libc/amd64/sys/sbrk.S
@@ -60,7 +60,7 @@ ENTRY(sbrk)
 	testl	%ecx,%ecx
 	jz	back
 	addl	%eax,4(%esp)
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	PIC_PROLOGUE
@@ -81,7 +81,7 @@ err:
 	testl	%ecx,%ecx
 	jz	back
 	addl	%eax,4(%esp)
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	HIDENAME(curbrk),%eax
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index 76c314c..4c3c47f 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -47,7 +47,7 @@
 	.set	vfork,__sys_vfork
 ENTRY(__sys_vfork)
 	popl	%ecx		/* my rta into ecx */
-	lea	SYS_vfork,%eax
+	mov	$SYS_vfork,%eax
 	KERNCALL
 	jb	1f
 	jmp	*%ecx
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 6ef3136..2e0f708 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -47,14 +47,14 @@
 			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b
 
 #define	RSYSCALL(x)	SYSCALL(x); ret
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			lea __CONCAT(SYS_,x), %eax; KERNCALL; ret
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; ret
 
 /* gas messes up offset -- although we don't currently need it, do for BCS */
 #define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
index 2d63b67c..9ce4a75 100644
--- a/lib/libc/i386/gen/rfork_thread.S
+++ b/lib/libc/i386/gen/rfork_thread.S
@@ -65,7 +65,7 @@ ENTRY(rfork_thread)
 	 */
 	pushl	8(%ebp)
 	pushl	$0
-	leal	SYS_rfork, %eax
+	movl	$SYS_rfork, %eax
 	KERNCALL
 	jb 	2f
 
@@ -98,9 +98,9 @@ ENTRY(rfork_thread)
 	pushl	%eax
 	pushl	$0
 #ifdef SYS_exit
-	leal	SYS_exit, %eax
+	movl	$SYS_exit, %eax
 #else
-	leal	SYS_sys_exit, %eax
+	movl	$SYS_sys_exit, %eax
 #endif
 	KERNCALL
 
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 76c314c..4c3c47f 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -47,7 +47,7 @@
 	.set	vfork,__sys_vfork
 ENTRY(__sys_vfork)
 	popl	%ecx		/* my rta into ecx */
-	lea	SYS_vfork,%eax
+	mov	$SYS_vfork,%eax
 	KERNCALL
 	jb	1f
 	jmp	*%ecx
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
index 652e4b9..d9d8877 100644
--- a/lib/libc/i386/sys/brk.S
+++ b/lib/libc/i386/sys/brk.S
@@ -58,7 +58,7 @@ ENTRY(brk)
 	movl	(%ecx),%eax
 	movl	%eax,4(%esp)
 ok:
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	4(%esp),%eax
@@ -77,7 +77,7 @@ err:
 	movl	HIDENAME(minbrk),%eax
 	movl	%eax,4(%esp)
 ok:
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
index 676b3f8..d3c8433 100644
--- a/lib/libc/i386/sys/exect.S
+++ b/lib/libc/i386/sys/exect.S
@@ -43,7 +43,7 @@
 #include <machine/psl.h>
 
 ENTRY(exect)
-	lea	SYS_execve,%eax
+	mov	$SYS_execve,%eax
 	pushf
 	popl	%edx
 	orl	$ PSL_T,%edx
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
index 881e8a3..dc786fb 100644
--- a/lib/libc/i386/sys/ptrace.S
+++ b/lib/libc/i386/sys/ptrace.S
@@ -51,7 +51,7 @@ ENTRY(ptrace)
 #else
         movl    %eax,CNAME(errno)
 #endif
-	lea	SYS_ptrace,%eax
+	mov	$SYS_ptrace,%eax
 	KERNCALL
 	jb	err
 	ret
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
index 8d4ca87..066535e 100644
--- a/lib/libc/i386/sys/sbrk.S
+++ b/lib/libc/i386/sys/sbrk.S
@@ -60,7 +60,7 @@ ENTRY(sbrk)
 	testl	%ecx,%ecx
 	jz	back
 	addl	%eax,4(%esp)
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	PIC_PROLOGUE
@@ -81,7 +81,7 @@ err:
 	testl	%ecx,%ecx
 	jz	back
 	addl	%eax,4(%esp)
-	lea	SYS_break,%eax
+	mov	$SYS_break,%eax
 	KERNCALL
 	jb	err
 	movl	HIDENAME(curbrk),%eax