git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
x86_64
/
lib
/
putuser.S
diff --git
a/arch/x86_64/lib/putuser.S
b/arch/x86_64/lib/putuser.S
index
4d287ce
..
4989f5a
100644
(file)
--- a/
arch/x86_64/lib/putuser.S
+++ b/
arch/x86_64/lib/putuser.S
@@
-2,87
+2,105
@@
* __put_user functions.
*
* (C) Copyright 1998 Linus Torvalds
* __put_user functions.
*
* (C) Copyright 1998 Linus Torvalds
+ * (C) Copyright 2005 Andi Kleen
*
* These functions have a non-standard call interface
*
* These functions have a non-standard call interface
- * to make them more efficient.
+ * to make them more efficient, especially as they
+ * return an error value in addition to the "real"
+ * return value.
*/
/*
* __put_user_X
*
*/
/*
* __put_user_X
*
- * Inputs: %r
a
x contains the address
- * %rdx contains
the
value
+ * Inputs: %r
c
x contains the address
+ * %rdx contains
new
value
*
* Outputs: %rax is error code (0 or -EFAULT)
*
* Outputs: %rax is error code (0 or -EFAULT)
- * %rbx is corrupted (will contain "current_task").
+ *
+ * %r8 is destroyed.
*
* These functions should not modify any other registers,
* as they get called from within inline assembly.
*/
*
* These functions should not modify any other registers,
* as they get called from within inline assembly.
*/
-/* FIXME: putuser.S should be really merged with getuser.S, and preprocessor should be used to keep code duplication lower */
-
#include <linux/linkage.h>
#include <linux/linkage.h>
+#include <asm/dwarf2.h>
#include <asm/page.h>
#include <asm/errno.h>
#include <asm/page.h>
#include <asm/errno.h>
-#include <asm/
offset
.h>
+#include <asm/
asm-offsets
.h>
#include <asm/thread_info.h>
#include <asm/thread_info.h>
-.text
-.p2align
-.globl __put_user_1
-__put_user_1:
- GET_THREAD_INFO(%rbx)
- cmpq threadinfo_addr_limit(%rbx),%rax
+ .text
+ENTRY(__put_user_1)
+ CFI_STARTPROC
+ GET_THREAD_INFO(%r8)
+ cmpq threadinfo_addr_limit(%r8),%rcx
jae bad_put_user
jae bad_put_user
-1: movb %dl,(%r
a
x)
- xor
q %rax,%r
ax
+1: movb %dl,(%r
c
x)
+ xor
l %eax,%e
ax
ret
ret
+ CFI_ENDPROC
+ENDPROC(__put_user_1)
-.p2align
-.globl __put_user_2
-__put_user_2:
- GET_THREAD_INFO(%rbx)
- addq $1,%rax
- jc bad_put_user
- cmpq threadinfo_addr_limit(%rbx),%rax
- jae bad_put_user
-2: movw %dx,
-1(%ra
x)
- xor
q %rax,%r
ax
+ENTRY(__put_user_2)
+ CFI_STARTPROC
+ GET_THREAD_INFO(%r8)
+ addq $1,%rcx
+ jc 20f
+ cmpq threadinfo_addr_limit(%r8),%rcx
+ jae 20f
+ decq %rcx
+2: movw %dx,
(%rc
x)
+ xor
l %eax,%e
ax
ret
ret
+20: decq %rcx
+ jmp bad_put_user
+ CFI_ENDPROC
+ENDPROC(__put_user_2)
-.p2align
-.globl __put_user_4
-__put_user_4:
- GET_THREAD_INFO(%rbx)
- addq $3,%rax
- jc bad_put_user
- cmpq threadinfo_addr_limit(%rbx),%rax
- jae bad_put_user
-3: movl %edx,
-3(%ra
x)
- xor
q %rax,%r
ax
+ENTRY(__put_user_4)
+ CFI_STARTPROC
+ GET_THREAD_INFO(%r8)
+ addq $3,%rcx
+ jc 30f
+ cmpq threadinfo_addr_limit(%r8),%rcx
+ jae 30f
+ subq $3,%rcx
+3: movl %edx,
(%rc
x)
+ xor
l %eax,%e
ax
ret
ret
+30: subq $3,%rcx
+ jmp bad_put_user
+ CFI_ENDPROC
+ENDPROC(__put_user_4)
-.p2align
-.globl __put_user_8
-__put_user_8:
- GET_THREAD_INFO(%rbx)
- addq $7,%rax
- jc bad_put_user
- cmpq threadinfo_addr_limit(%rbx),%rax
- jae bad_put_user
-4: movq %rdx,
-7(%ra
x)
- xor
q %rax,%r
ax
+ENTRY(__put_user_8)
+ CFI_STARTPROC
+ GET_THREAD_INFO(%r8)
+ addq $7,%rcx
+ jc 40f
+ cmpq threadinfo_addr_limit(%r8),%rcx
+ jae 40f
+ subq $7,%rcx
+4: movq %rdx,
(%rc
x)
+ xor
l %eax,%e
ax
ret
ret
+40: subq $7,%rcx
+ jmp bad_put_user
+ CFI_ENDPROC
+ENDPROC(__put_user_8)
-ENTRY(bad_put_user)
bad_put_user:
bad_put_user:
+ CFI_STARTPROC
movq $(-EFAULT),%rax
ret
movq $(-EFAULT),%rax
ret
+ CFI_ENDPROC
+END(bad_put_user)
.section __ex_table,"a"
.quad 1b,bad_put_user
.quad 2b,bad_put_user
.quad 3b,bad_put_user
.section __ex_table,"a"
.quad 1b,bad_put_user
.quad 2b,bad_put_user
.quad 3b,bad_put_user
- .quad 4b,bad_put_user
+ .quad 4b,bad_put_user
.previous
.previous