Commit fd9720e9 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle

MIPS: lib: memset: Add EVA support for the __bzero function.

Build the __bzero function using the EVA load/store instructions
when operating in the EVA mode. This function is only used when
accessing user code so there is no need to build two distinct symbols
for user and kernel operations respectively.
Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent 6d5155c2
...@@ -37,13 +37,24 @@ ...@@ -37,13 +37,24 @@
#define LEGACY_MODE 1 #define LEGACY_MODE 1
#define EVA_MODE 2 #define EVA_MODE 2
/*
* No need to protect it with EVA #ifdefery. The generated block of code
* will never be assembled if EVA is not enabled.
*/
#define __EVAFY(insn, reg, addr) __BUILD_EVA_INSN(insn##e, reg, addr)
#define ___BUILD_EVA_INSN(insn, reg, addr) __EVAFY(insn, reg, addr)
#define EX(insn,reg,addr,handler) \ #define EX(insn,reg,addr,handler) \
9: insn reg, addr; \ .if \mode == LEGACY_MODE; \
9: insn reg, addr; \
.else; \
9: ___BUILD_EVA_INSN(insn, reg, addr); \
.endif; \
.section __ex_table,"a"; \ .section __ex_table,"a"; \
PTR 9b, handler; \ PTR 9b, handler; \
.previous .previous
.macro f_fill64 dst, offset, val, fixup .macro f_fill64 dst, offset, val, fixup, mode
EX(LONG_S, \val, (\offset + 0 * STORSIZE)(\dst), \fixup) EX(LONG_S, \val, (\offset + 0 * STORSIZE)(\dst), \fixup)
EX(LONG_S, \val, (\offset + 1 * STORSIZE)(\dst), \fixup) EX(LONG_S, \val, (\offset + 1 * STORSIZE)(\dst), \fixup)
EX(LONG_S, \val, (\offset + 2 * STORSIZE)(\dst), \fixup) EX(LONG_S, \val, (\offset + 2 * STORSIZE)(\dst), \fixup)
...@@ -119,7 +130,7 @@ ...@@ -119,7 +130,7 @@
.set reorder .set reorder
1: PTR_ADDIU a0, 64 1: PTR_ADDIU a0, 64
R10KCBARRIER(0(ra)) R10KCBARRIER(0(ra))
f_fill64 a0, -64, FILL64RG, .Lfwd_fixup\@ f_fill64 a0, -64, FILL64RG, .Lfwd_fixup\@, \mode
bne t1, a0, 1b bne t1, a0, 1b
.set noreorder .set noreorder
...@@ -144,7 +155,7 @@ ...@@ -144,7 +155,7 @@
.set noreorder .set noreorder
.set nomacro .set nomacro
/* ... but first do longs ... */ /* ... but first do longs ... */
f_fill64 a0, -64, FILL64RG, .Lpartial_fixup\@ f_fill64 a0, -64, FILL64RG, .Lpartial_fixup\@, \mode
2: .set pop 2: .set pop
andi a2, STORMASK /* At most one long to go */ andi a2, STORMASK /* At most one long to go */
...@@ -225,5 +236,13 @@ LEAF(memset) ...@@ -225,5 +236,13 @@ LEAF(memset)
#endif #endif
or a1, t1 or a1, t1
1: 1:
#ifndef CONFIG_EVA
FEXPORT(__bzero) FEXPORT(__bzero)
#endif
__BUILD_BZERO LEGACY_MODE __BUILD_BZERO LEGACY_MODE
#ifdef CONFIG_EVA
LEAF(__bzero)
__BUILD_BZERO EVA_MODE
END(__bzero)
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment