Skip to content

Commit

Permalink
x86: don't use word-size specifiers on getuser_64.
Browse files Browse the repository at this point in the history
The instructions access registers, so the size is unambiguous.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Jul 9, 2008
1 parent 26ccb8a commit ef8c1a2
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions arch/x86/lib/getuser_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -37,57 +37,57 @@
ENTRY(__get_user_1)
CFI_STARTPROC
GET_THREAD_INFO(%rdx)
cmpq TI_addr_limit(%rdx),%rax
cmp TI_addr_limit(%rdx),%rax
jae bad_get_user
1: movzb (%rax),%edx
xorl %eax,%eax
xor %eax,%eax
ret
CFI_ENDPROC
ENDPROC(__get_user_1)

ENTRY(__get_user_2)
CFI_STARTPROC
addq $1,%rax
add $1,%rax
jc bad_get_user
GET_THREAD_INFO(%rdx)
cmpq TI_addr_limit(%rdx),%rax
cmp TI_addr_limit(%rdx),%rax
jae bad_get_user
2: movzwl -1(%rax),%edx
xorl %eax,%eax
xor %eax,%eax
ret
CFI_ENDPROC
ENDPROC(__get_user_2)

ENTRY(__get_user_4)
CFI_STARTPROC
addq $3,%rax
add $3,%rax
jc bad_get_user
GET_THREAD_INFO(%rdx)
cmpq TI_addr_limit(%rdx),%rax
cmp TI_addr_limit(%rdx),%rax
jae bad_get_user
3: movl -3(%rax),%edx
xorl %eax,%eax
3: mov -3(%rax),%edx
xor %eax,%eax
ret
CFI_ENDPROC
ENDPROC(__get_user_4)

ENTRY(__get_user_8)
CFI_STARTPROC
addq $7,%rax
add $7,%rax
jc bad_get_user
GET_THREAD_INFO(%rdx)
cmpq TI_addr_limit(%rdx),%rax
cmp TI_addr_limit(%rdx),%rax
jae bad_get_user
4: movq -7(%rax),%rdx
xorl %eax,%eax
xor %eax,%eax
ret
CFI_ENDPROC
ENDPROC(__get_user_8)

bad_get_user:
CFI_STARTPROC
xorl %edx,%edx
movq $(-EFAULT),%rax
xor %edx,%edx
mov $(-EFAULT),%rax
ret
CFI_ENDPROC
END(bad_get_user)
Expand Down

0 comments on commit ef8c1a2

Please sign in to comment.