aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/lib
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-01-02 11:04:38 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:13 -0400
commit053970542f049d3e30dc4be6eb19e92ff1f70f00 (patch)
tree63fcc75f9ae253079349d640b0fd7a9caf1c9060 /arch/mips/lib
parent5cc494972adbaeff08a1b7544acaa608c68cd527 (diff)
MIPS: lib: strlen_user: Add EVA support
In non-EVA mode, strlen_user* aliases are used for the strlen_kernel* symbols since the code is identical. In EVA mode, new strlen_user* symbols are used which use the EVA specific instructions to load values from userspace. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/lib')
-rw-r--r--arch/mips/lib/strlen_user.S20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S
index 6e8bdb373213..bef65c98df59 100644
--- a/arch/mips/lib/strlen_user.S
+++ b/arch/mips/lib/strlen_user.S
@@ -30,7 +30,11 @@ LEAF(__strlen_\func\()_asm)
30 30
31FEXPORT(__strlen_\func\()_nocheck_asm) 31FEXPORT(__strlen_\func\()_nocheck_asm)
32 move v0, a0 32 move v0, a0
33.ifeqs "\func", "kernel"
331: EX(lbu, v1, (v0), .Lfault\@) 341: EX(lbu, v1, (v0), .Lfault\@)
35.else
361: EX(lbue, v1, (v0), .Lfault\@)
37.endif
34 PTR_ADDIU v0, 1 38 PTR_ADDIU v0, 1
35 bnez v1, 1b 39 bnez v1, 1b
36 PTR_SUBU v0, a0 40 PTR_SUBU v0, a0
@@ -41,4 +45,20 @@ FEXPORT(__strlen_\func\()_nocheck_asm)
41 jr ra 45 jr ra
42 .endm 46 .endm
43 47
48#ifndef CONFIG_EVA
49 /* Set aliases */
50 .global __strlen_user_asm
51 .global __strlen_user_nocheck_asm
52 .set __strlen_user_asm, __strlen_kernel_asm
53 .set __strlen_user_nocheck_asm, __strlen_kernel_nocheck_asm
54#endif
55
56__BUILD_STRLEN_ASM kernel
57
58#ifdef CONFIG_EVA
59
60 .set push
61 .set eva
44__BUILD_STRLEN_ASM user 62__BUILD_STRLEN_ASM user
63 .set pop
64#endif