| Index: test/cctest/test-macro-assembler-mips64.cc
|
| diff --git a/test/cctest/test-macro-assembler-mips64.cc b/test/cctest/test-macro-assembler-mips64.cc
|
| index 9527e620bdd6ffccb9adc440f93f37aec2771b19..37517d0d428fcc4da3b32c17f0328b0020e22313 100644
|
| --- a/test/cctest/test-macro-assembler-mips64.cc
|
| +++ b/test/cctest/test-macro-assembler-mips64.cc
|
| @@ -68,40 +68,40 @@ TEST(BYTESWAP) {
|
|
|
| MacroAssembler* masm = &assembler;
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r1)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r1)));
|
| __ nop();
|
| __ ByteSwapSigned(a4, a4, 8);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r1)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r1)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r2)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r2)));
|
| __ nop();
|
| __ ByteSwapSigned(a4, a4, 4);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r2)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r2)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r3)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r3)));
|
| __ nop();
|
| __ ByteSwapSigned(a4, a4, 2);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r3)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r3)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r4)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r4)));
|
| __ nop();
|
| __ ByteSwapSigned(a4, a4, 1);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r4)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r4)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r5)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r5)));
|
| __ nop();
|
| __ ByteSwapUnsigned(a4, a4, 1);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r5)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r5)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r6)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r6)));
|
| __ nop();
|
| __ ByteSwapUnsigned(a4, a4, 2);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r6)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r6)));
|
|
|
| - __ ld(a4, MemOperand(a0, offsetof(T, r7)));
|
| + __ Ld(a4, MemOperand(a0, offsetof(T, r7)));
|
| __ nop();
|
| __ ByteSwapUnsigned(a4, a4, 4);
|
| - __ sd(a4, MemOperand(a0, offsetof(T, r7)));
|
| + __ Sd(a4, MemOperand(a0, offsetof(T, r7)));
|
|
|
| __ jr(ra);
|
| __ nop();
|
| @@ -151,7 +151,7 @@ TEST(LoadConstants) {
|
| for (int i = 0; i < 64; i++) {
|
| // Load constant.
|
| __ li(a5, Operand(refConstants[i]));
|
| - __ sd(a5, MemOperand(a4));
|
| + __ Sd(a5, MemOperand(a4));
|
| __ Daddu(a4, a4, Operand(kPointerSize));
|
| }
|
|
|
| @@ -311,7 +311,7 @@ TEST(jump_tables5) {
|
|
|
| __ addiupc(at, 6 + 1);
|
| __ Dlsa(at, at, a0, 3);
|
| - __ ld(at, MemOperand(at));
|
| + __ Ld(at, MemOperand(at));
|
| __ jalr(at);
|
| __ nop(); // Branch delay slot nop.
|
| __ bc(&done);
|
| @@ -1502,7 +1502,7 @@ TEST(min_max_nan) {
|
| auto handle_dnan = [masm](FPURegister dst, Label* nan, Label* back) {
|
| __ bind(nan);
|
| __ LoadRoot(at, Heap::kNanValueRootIndex);
|
| - __ ldc1(dst, FieldMemOperand(at, HeapNumber::kValueOffset));
|
| + __ Ldc1(dst, FieldMemOperand(at, HeapNumber::kValueOffset));
|
| __ Branch(back);
|
| };
|
|
|
| @@ -1517,10 +1517,10 @@ TEST(min_max_nan) {
|
|
|
| __ push(s6);
|
| __ InitializeRootRegister();
|
| - __ ldc1(f4, MemOperand(a0, offsetof(TestFloat, a)));
|
| - __ ldc1(f8, MemOperand(a0, offsetof(TestFloat, b)));
|
| - __ lwc1(f2, MemOperand(a0, offsetof(TestFloat, e)));
|
| - __ lwc1(f6, MemOperand(a0, offsetof(TestFloat, f)));
|
| + __ Ldc1(f4, MemOperand(a0, offsetof(TestFloat, a)));
|
| + __ Ldc1(f8, MemOperand(a0, offsetof(TestFloat, b)));
|
| + __ Lwc1(f2, MemOperand(a0, offsetof(TestFloat, e)));
|
| + __ Lwc1(f6, MemOperand(a0, offsetof(TestFloat, f)));
|
| __ Float64Min(f10, f4, f8, &handle_mind_nan);
|
| __ bind(&back_mind_nan);
|
| __ Float64Max(f12, f4, f8, &handle_maxd_nan);
|
| @@ -1529,10 +1529,10 @@ TEST(min_max_nan) {
|
| __ bind(&back_mins_nan);
|
| __ Float32Max(f16, f2, f6, &handle_maxs_nan);
|
| __ bind(&back_maxs_nan);
|
| - __ sdc1(f10, MemOperand(a0, offsetof(TestFloat, c)));
|
| - __ sdc1(f12, MemOperand(a0, offsetof(TestFloat, d)));
|
| - __ swc1(f14, MemOperand(a0, offsetof(TestFloat, g)));
|
| - __ swc1(f16, MemOperand(a0, offsetof(TestFloat, h)));
|
| + __ Sdc1(f10, MemOperand(a0, offsetof(TestFloat, c)));
|
| + __ Sdc1(f12, MemOperand(a0, offsetof(TestFloat, d)));
|
| + __ Swc1(f14, MemOperand(a0, offsetof(TestFloat, g)));
|
| + __ Swc1(f16, MemOperand(a0, offsetof(TestFloat, h)));
|
| __ pop(s6);
|
| __ jr(ra);
|
| __ nop();
|
| @@ -1988,11 +1988,11 @@ static ::F4 GenerateMacroFloat32MinMax(MacroAssembler* masm) {
|
| Label done_max_abc, done_max_aab, done_max_aba;
|
|
|
| #define FLOAT_MIN_MAX(fminmax, res, x, y, done, ool, res_field) \
|
| - __ lwc1(x, MemOperand(a0, offsetof(Inputs, src1_))); \
|
| - __ lwc1(y, MemOperand(a0, offsetof(Inputs, src2_))); \
|
| + __ Lwc1(x, MemOperand(a0, offsetof(Inputs, src1_))); \
|
| + __ Lwc1(y, MemOperand(a0, offsetof(Inputs, src2_))); \
|
| __ fminmax(res, x, y, &ool); \
|
| __ bind(&done); \
|
| - __ swc1(a, MemOperand(a1, offsetof(Results, res_field)))
|
| + __ Swc1(a, MemOperand(a1, offsetof(Results, res_field)))
|
|
|
| // a = min(b, c);
|
| FLOAT_MIN_MAX(Float32Min, a, b, c, done_min_abc, ool_min_abc, min_abc_);
|
| @@ -2131,11 +2131,11 @@ static ::F4 GenerateMacroFloat64MinMax(MacroAssembler* masm) {
|
| Label done_max_abc, done_max_aab, done_max_aba;
|
|
|
| #define FLOAT_MIN_MAX(fminmax, res, x, y, done, ool, res_field) \
|
| - __ ldc1(x, MemOperand(a0, offsetof(Inputs, src1_))); \
|
| - __ ldc1(y, MemOperand(a0, offsetof(Inputs, src2_))); \
|
| + __ Ldc1(x, MemOperand(a0, offsetof(Inputs, src1_))); \
|
| + __ Ldc1(y, MemOperand(a0, offsetof(Inputs, src2_))); \
|
| __ fminmax(res, x, y, &ool); \
|
| __ bind(&done); \
|
| - __ sdc1(a, MemOperand(a1, offsetof(Results, res_field)))
|
| + __ Sdc1(a, MemOperand(a1, offsetof(Results, res_field)))
|
|
|
| // a = min(b, c);
|
| FLOAT_MIN_MAX(Float64Min, a, b, c, done_min_abc, ool_min_abc, min_abc_);
|
|
|