linux-mips
[Top] [All Lists]

[PATCH 14/58] MIPS: lib: strncpy_user: Use macro to build the strncpy_fr

To: <linux-mips@linux-mips.org>
Subject: [PATCH 14/58] MIPS: lib: strncpy_user: Use macro to build the strncpy_from_user symbol
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 27 Jan 2014 20:19:01 +0000
Cc: Markos Chandras <markos.chandras@imgtec.com>
In-reply-to: <1390853985-14246-1-git-send-email-markos.chandras@imgtec.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1390853985-14246-1-git-send-email-markos.chandras@imgtec.com>
Sender: linux-mips-bounce@linux-mips.org
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>
---
 arch/mips/lib/strncpy_user.S | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index 92870b6..51b38ab 100644
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
@@ -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
@@ -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
-- 
1.8.5.3



<Prev in Thread] Current Thread [Next in Thread>