diff options
| -rw-r--r-- | runtime/Android.mk | 2 | ||||
| -rw-r--r-- | runtime/arch/mips/memcmp16_mips.S | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 52b5f43b8d..8f8eeba46d 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -256,7 +256,7 @@ LIBART_TARGET_SRC_FILES_mips := \ arch/mips/context_mips.cc \ arch/mips/entrypoints_init_mips.cc \ arch/mips/jni_entrypoints_mips.S \ - arch/mips/memcmp16.S \ + arch/mips/memcmp16_mips.S \ arch/mips/portable_entrypoints_mips.S \ arch/mips/quick_entrypoints_mips.S \ arch/mips/thread_mips.cc \ diff --git a/runtime/arch/mips/memcmp16_mips.S b/runtime/arch/mips/memcmp16_mips.S index 571ad752cd..0196edc2c5 100644 --- a/runtime/arch/mips/memcmp16_mips.S +++ b/runtime/arch/mips/memcmp16_mips.S @@ -17,27 +17,27 @@ #ifndef ART_RUNTIME_ARCH_MIPS_MEMCMP16_MIPS_S_ #define ART_RUNTIME_ARCH_MIPS_MEMCMP16_MIPS_S_ -#include "asm_support_mips.h" +#include "asm_support_mips.S" // u4 __memcmp16(const u2*, const u2*, size_t); -ENTRY(__memcmp16) - li t0,0 - li t1,0 - beqz a2,done /* 0 length string */ - beq a0,a1,done /* strings are identical */ +ENTRY __memcmp16 + li $t0,0 + li $t1,0 + beqz $a2,done /* 0 length string */ + beq $a0,$a1,done /* strings are identical */ /* Unoptimised... */ -1: lhu t0,0(a0) - lhu t1,0(a1) - addu a1,2 - bne t0,t1,done - addu a0,2 - subu a2,1 - bnez a2,1b +1: lhu $t0,0($a0) + lhu $t1,0($a1) + addu $a1,2 + bne $t0,$t1,done + addu $a0,2 + subu $a2,1 + bnez $a2,1b done: - subu v0,t0,t1 - j ra -END(__memcmp16) + subu $v0,$t0,$t1 + j $ra +END __memcmp16 #endif // ART_RUNTIME_ARCH_MIPS_MEMCMP16_MIPS_S_ |