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/bionic/bzero.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/bionic/bzero.S')
| -rw-r--r-- | libc/arch-mips/bionic/bzero.S | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/libc/arch-mips/bionic/bzero.S b/libc/arch-mips/bionic/bzero.S index 6739345..6e5d294 100644 --- a/libc/arch-mips/bionic/bzero.S +++ b/libc/arch-mips/bionic/bzero.S @@ -25,21 +25,15 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - .text -/* - * void bzero(void *s, size_t n); - */ - .type bzero, @function - .global bzero - .align 4 - .ent bzero - .set noreorder -bzero: - .cpload $t9 - move $a2,$a1 - la $t9,memset - j $t9 - move $a1,$zero - .end bzero +#include <private/bionic_asm.h> +// void bzero(void*, size_t); +ENTRY(bzero) + .set noreorder + .cpload t9 + move a2,a1 + la t9,memset + j t9 + move a1,zero +END(bzero) |