Skip to content

Commit

Permalink
MIPS: lib: strncpy_user: Use macro to build the strncpy_from_user symbol
Browse files Browse the repository at this point in the history
Build the __strncpy_from_user symbol using a macro. In EVA mode we will
need to use similar code to do the userspace load operations so
it is better if we use a macro to avoid code duplications.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
  • Loading branch information
Markos Chandras authored and Ralf Baechle committed Mar 26, 2014
1 parent 0539705 commit cc59fe5
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions arch/mips/lib/strncpy_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,17 @@
* it happens at most some bytes of the exceptions handlers will be copied.
*/

LEAF(__strncpy_from_user_asm)
.macro __BUILD_STRNCPY_ASM func
LEAF(__strncpy_from_\func\()_asm)
LONG_L v0, TI_ADDR_LIMIT($28) # pointer ok?
and v0, a1
bnez v0, .Lfault
bnez v0, .Lfault\@

FEXPORT(__strncpy_from_user_nocheck_asm)
FEXPORT(__strncpy_from_\func\()_nocheck_asm)
.set noreorder
move t0, zero
move v1, a1
1: EX(lbu, v0, (v1), .Lfault)
1: EX(lbu, v0, (v1), .Lfault\@)
PTR_ADDIU v1, 1
R10KCBARRIER(0(ra))
beqz v0, 2f
Expand All @@ -47,15 +48,19 @@ FEXPORT(__strncpy_from_user_nocheck_asm)
PTR_ADDIU a0, 1
2: PTR_ADDU v0, a1, t0
xor v0, a1
bltz v0, .Lfault
bltz v0, .Lfault\@
nop
jr ra # return n
move v0, t0
END(__strncpy_from_user_asm)
END(__strncpy_from_\func\()_asm)

.Lfault: jr ra
.Lfault\@: jr ra
li v0, -EFAULT

.section __ex_table,"a"
PTR 1b, .Lfault
PTR 1b, .Lfault\@
.previous

.endm

__BUILD_STRNCPY_ASM user

0 comments on commit cc59fe5

Please sign in to comment.