Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2d4586 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: merge getuser asm functions. 



getuser_32.S and getuser_64.S are merged into getuser.S.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 87e2f1e7

arch/x86/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
obj-$(CONFIG_SMP) := msr-on-cpu.o



lib-y := delay.o

lib-y += usercopy_$(BITS).o getuser_$(BITS).o putuser_$(BITS).o

lib-y += usercopy_$(BITS).o getuser.o putuser_$(BITS).o

lib-y += memcpy_$(BITS).o



ifeq ($(CONFIG_X86_32),y)

arch/x86/lib/getuser_64.S→arch/x86/lib/getuser.S

+9 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 * (C) Copyright 1998 Linus Torvalds

 * (C) Copyright 2005 Andi Kleen

 * (C) Copyright 2008 Glauber Costa

 *

 * These functions have a non-standard call interface

 * to make them more efficient, especially as they
@@ -13,12 +14,12 @@ 
/*

 * __get_user_X

 *

 * Inputs:	%rax contains the address.

 * Inputs:	%[r|e]ax contains the address.

 *		The register is modified, but all changes are undone

 *		before returning because the C code doesn't know about it.

 *

 * Outputs:	%rax is error code (0 or -EFAULT)

 *		%rdx contains zero-extended value

 * Outputs:	%[r|e]ax is error code (0 or -EFAULT)

 *		%[r|e]dx contains zero-extended value

 *

 *

 * These functions should not modify any other registers,
@@ -71,6 +72,7 @@ ENTRY(__get_user_4) 
	CFI_ENDPROC

ENDPROC(__get_user_4)



#ifdef CONFIG_X86_64

ENTRY(__get_user_8)

	CFI_STARTPROC

	add $7,%_ASM_AX
@@ -83,6 +85,7 @@ ENTRY(__get_user_8) 
	ret

	CFI_ENDPROC

ENDPROC(__get_user_8)

#endif



bad_get_user:

	CFI_STARTPROC
@@ -96,5 +99,6 @@ END(bad_get_user) 
	_ASM_PTR 1b,bad_get_user

	_ASM_PTR 2b,bad_get_user

	_ASM_PTR 3b,bad_get_user

#ifdef CONFIG_X86_64

	_ASM_PTR 4b,bad_get_user

.previous
 
#endif

arch/x86/lib/getuser_32.S

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
/*

 * __get_user functions.

 *

 * (C) Copyright 1998 Linus Torvalds

 *

 * These functions have a non-standard call interface

 * to make them more efficient, especially as they

 * return an error value in addition to the "real"

 * return value.

 */

#include <linux/linkage.h>

#include <asm/dwarf2.h>

#include <asm/thread_info.h>

#include <asm/asm.h>





/*

 * __get_user_X

 *

 * Inputs:	%eax contains the address

 *

 * Outputs:	%eax is error code (0 or -EFAULT)

 *		%edx contains zero-extended value

 *

 * These functions should not modify any other registers,

 * as they get called from within inline assembly.

 */



.text

ENTRY(__get_user_1)

	CFI_STARTPROC

	GET_THREAD_INFO(%_ASM_DX)

	cmp TI_addr_limit(%_ASM_DX),%_ASM_AX

	jae bad_get_user

1:	movzb (%_ASM_AX),%edx

	xor %eax,%eax

	ret

	CFI_ENDPROC

ENDPROC(__get_user_1)



ENTRY(__get_user_2)

	CFI_STARTPROC

	add $1,%_ASM_AX

	jc bad_get_user

	GET_THREAD_INFO(%_ASM_DX)

	cmp TI_addr_limit(%_ASM_DX),%_ASM_AX

	jae bad_get_user

2:	movzwl -1(%_ASM_AX),%edx

	xor %eax,%eax

	ret

	CFI_ENDPROC

ENDPROC(__get_user_2)



ENTRY(__get_user_4)

	CFI_STARTPROC

	add $3,%_ASM_AX

	jc bad_get_user

	GET_THREAD_INFO(%_ASM_DX)

	cmp TI_addr_limit(%_ASM_DX),%_ASM_AX

	jae bad_get_user

3:	mov -3(%_ASM_AX),%edx

	xor %eax,%eax

	ret

	CFI_ENDPROC

ENDPROC(__get_user_4)



bad_get_user:

	CFI_STARTPROC

	xor %edx,%edx

	mov $-14,%_ASM_AX

	ret

	CFI_ENDPROC

END(bad_get_user)



.section __ex_table,"a"

	_ASM_PTR 1b,bad_get_user

	_ASM_PTR 2b,bad_get_user

	_ASM_PTR 3b,bad_get_user

.previous

include/asm-x86/asm.h

+3 −1
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ 


#ifdef __ASSEMBLY__

# define __ASM_FORM(x)	x

# define __ASM_EX_SEC	.section __ex_table

#else

# define __ASM_FORM(x)	" " #x " "

# define __ASM_EX_SEC	" .section __ex_table,\"a\"\n"

#endif



#ifdef CONFIG_X86_32
@@ -30,7 +32,7 @@ 


/* Exception table entry */

# define _ASM_EXTABLE(from,to) \

	" .section __ex_table,\"a\"\n" \

	__ASM_EX_SEC	\

	_ASM_ALIGN "\n" \

	_ASM_PTR #from "," #to "\n" \

	" .previous\n"