diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-19 16:53:20 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-20 13:51:26 -0800 |
| commit | 851e68a2402fa414544e66650e09dfdaac813e51 (patch) | |
| tree | baec353c8e9b6f24e885459b20a8748fc5c39468 /libc/arch-mips/string/memset.S | |
| parent | 22c6b7ffd36fe8b34b677eea94d00aef2624e4e8 (diff) | |
| download | bionic-851e68a2402fa414544e66650e09dfdaac813e51.zip bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.gz bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.bz2 | |
Unify our assembler macros.
Our <machine/asm.h> files were modified from upstream, to the extent
that no architecture was actually using the upstream ENTRY or END macros,
assuming that architecture even had such a macro upstream. This patch moves
everyone to the same macros, with just a few tweaks remaining in the
<machine/asm.h> files, which no one should now use directly.
I've removed most of the unused cruft from the <machine/asm.h> files, though
there's still rather a lot in the mips/mips64 ones.
Bug: 12229603
Change-Id: I2fff287dc571ac1087abe9070362fb9420d85d6d
Diffstat (limited to 'libc/arch-mips/string/memset.S')
| -rw-r--r-- | libc/arch-mips/string/memset.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libc/arch-mips/string/memset.S b/libc/arch-mips/string/memset.S index a1c5055..3e630ca 100644 --- a/libc/arch-mips/string/memset.S +++ b/libc/arch-mips/string/memset.S @@ -39,12 +39,12 @@ * Include files ************************************************************************/ -#include "machine/asm.h" +#include <private/bionic_asm.h> -/* +/* * This routine could be optimized for MIPS64. The current code only * uses MIPS32 instructions. - */ + */ #if defined(__MIPSEB__) # define SWHI swl /* high part is left in big-endian */ @@ -220,7 +220,7 @@ LEAF(memset,0) sw a1,-36(a0) nop nop # the extra nop instructions help to balance - nop # cycles needed for "store" + "fill" + "evict" + nop # cycles needed for "store" + "fill" + "evict" nop # For 64byte store there are needed 8 fill nop # and 8 evict cycles, i.e. at least 32 instr. nop @@ -320,4 +320,3 @@ END(memset) /************************************************************************ * Implementation : Static functions ************************************************************************/ - |