Chromium Code Reviews| Index: test/cctest/test-assembler-mips64.cc |
| diff --git a/test/cctest/test-assembler-mips64.cc b/test/cctest/test-assembler-mips64.cc |
| index 1ec9a65c960ca6c76720cd95340d5842ebb04e0e..d672deae3456d616925145b672aaa24671144996 100644 |
| --- a/test/cctest/test-assembler-mips64.cc |
| +++ b/test/cctest/test-assembler-mips64.cc |
| @@ -66,7 +66,7 @@ TEST(MIPS0) { |
| F2 f = FUNCTION_CAST<F2>(code->entry()); |
| int64_t res = |
| reinterpret_cast<int64_t>(CALL_GENERATED_CODE(f, 0xab0, 0xc, 0, 0, 0)); |
| - ::printf("f() = %ld\n", res); |
| + ::printf("f() = %lld\n", res); |
|
paul.l...
2015/01/30 18:21:38
This and 2 more instances below fail to compile on
balazs.kilvady
2015/01/30 18:36:48
Done.
|
| CHECK_EQ(0xabcL, res); |
| } |
| @@ -103,7 +103,7 @@ TEST(MIPS1) { |
| F1 f = FUNCTION_CAST<F1>(code->entry()); |
| int64_t res = |
| reinterpret_cast<int64_t>(CALL_GENERATED_CODE(f, 50, 0, 0, 0, 0)); |
| - ::printf("f() = %ld\n", res); |
| + ::printf("f() = %lld\n", res); |
| CHECK_EQ(1275L, res); |
| } |
| @@ -250,7 +250,7 @@ TEST(MIPS2) { |
| F2 f = FUNCTION_CAST<F2>(code->entry()); |
| int64_t res = |
| reinterpret_cast<int64_t>(CALL_GENERATED_CODE(f, 0xab0, 0xc, 0, 0, 0)); |
| - ::printf("f() = %ld\n", res); |
| + ::printf("f() = %lld\n", res); |
| CHECK_EQ(0x31415926L, res); |
| } |
| @@ -407,8 +407,8 @@ TEST(MIPS4) { |
| CHECK_EQ(2.75e11, t.a); |
| CHECK_EQ(2.75e11, t.b); |
| CHECK_EQ(1.5e22, t.c); |
| - CHECK_EQ(0xffffffffc25001d1L, t.high); |
| - CHECK_EQ(0xffffffffbf800000L, t.low); |
| + CHECK_EQ(static_cast<int64_t>(0xffffffffc25001d1L), t.high); |
| + CHECK_EQ(static_cast<int64_t>(0xffffffffbf800000L), t.low); |
| } |
| @@ -538,12 +538,12 @@ TEST(MIPS6) { |
| Object* dummy = CALL_GENERATED_CODE(f, &t, 0, 0, 0, 0); |
| USE(dummy); |
| - CHECK_EQ(0x11223344, t.r1); |
| - CHECK_EQ(0x3344, t.r2); |
| - CHECK_EQ(0xffffbbcc, t.r3); |
| - CHECK_EQ(0x0000bbcc, t.r4); |
| - CHECK_EQ(0xffffffcc, t.r5); |
| - CHECK_EQ(0x3333bbcc, t.r6); |
| + CHECK_EQ(static_cast<int32_t>(0x11223344), t.r1); |
| + CHECK_EQ(static_cast<int32_t>(0x3344), t.r2); |
| + CHECK_EQ(static_cast<int32_t>(0xffffbbcc), t.r3); |
| + CHECK_EQ(static_cast<int32_t>(0x0000bbcc), t.r4); |
| + CHECK_EQ(static_cast<int32_t>(0xffffffcc), t.r5); |
| + CHECK_EQ(static_cast<int32_t>(0x3333bbcc), t.r6); |
| } |
| @@ -712,21 +712,21 @@ TEST(MIPS8) { |
| t.input = 0x12345678; |
| Object* dummy = CALL_GENERATED_CODE(f, &t, 0x0, 0, 0, 0); |
| USE(dummy); |
| - CHECK_EQ(0x81234567, t.result_rotr_4); |
| - CHECK_EQ(0x78123456, t.result_rotr_8); |
| - CHECK_EQ(0x67812345, t.result_rotr_12); |
| - CHECK_EQ(0x56781234, t.result_rotr_16); |
| - CHECK_EQ(0x45678123, t.result_rotr_20); |
| - CHECK_EQ(0x34567812, t.result_rotr_24); |
| - CHECK_EQ(0x23456781, t.result_rotr_28); |
| - |
| - CHECK_EQ(0x81234567, t.result_rotrv_4); |
| - CHECK_EQ(0x78123456, t.result_rotrv_8); |
| - CHECK_EQ(0x67812345, t.result_rotrv_12); |
| - CHECK_EQ(0x56781234, t.result_rotrv_16); |
| - CHECK_EQ(0x45678123, t.result_rotrv_20); |
| - CHECK_EQ(0x34567812, t.result_rotrv_24); |
| - CHECK_EQ(0x23456781, t.result_rotrv_28); |
| + CHECK_EQ(static_cast<int32_t>(0x81234567), t.result_rotr_4); |
| + CHECK_EQ(static_cast<int32_t>(0x78123456), t.result_rotr_8); |
| + CHECK_EQ(static_cast<int32_t>(0x67812345), t.result_rotr_12); |
| + CHECK_EQ(static_cast<int32_t>(0x56781234), t.result_rotr_16); |
| + CHECK_EQ(static_cast<int32_t>(0x45678123), t.result_rotr_20); |
| + CHECK_EQ(static_cast<int32_t>(0x34567812), t.result_rotr_24); |
| + CHECK_EQ(static_cast<int32_t>(0x23456781), t.result_rotr_28); |
| + |
| + CHECK_EQ(static_cast<int32_t>(0x81234567), t.result_rotrv_4); |
| + CHECK_EQ(static_cast<int32_t>(0x78123456), t.result_rotrv_8); |
| + CHECK_EQ(static_cast<int32_t>(0x67812345), t.result_rotrv_12); |
| + CHECK_EQ(static_cast<int32_t>(0x56781234), t.result_rotrv_16); |
| + CHECK_EQ(static_cast<int32_t>(0x45678123), t.result_rotrv_20); |
| + CHECK_EQ(static_cast<int32_t>(0x34567812), t.result_rotrv_24); |
| + CHECK_EQ(static_cast<int32_t>(0x23456781), t.result_rotrv_28); |
| } |
| @@ -838,15 +838,15 @@ TEST(MIPS10) { |
| Object* dummy = CALL_GENERATED_CODE(f, &t, 0, 0, 0, 0); |
| USE(dummy); |
| - CHECK_EQ(0x41DFFFFF, t.dbl_exp); |
| - CHECK_EQ(0xFFC00000, t.dbl_mant); |
| + CHECK_EQ(static_cast<int32_t>(0x41DFFFFF), t.dbl_exp); |
| + CHECK_EQ(static_cast<int32_t>(0xFFC00000), t.dbl_mant); |
| CHECK_EQ(0, t.long_hi); |
| - CHECK_EQ(0x7fffffff, t.long_lo); |
| + CHECK_EQ(static_cast<int32_t>(0x7fffffff), t.long_lo); |
| CHECK_EQ(2.147483647e9, t.a_converted); |
| // 0xFF00FF00FF -> 1.095233372415e12. |
| CHECK_EQ(1.095233372415e12, t.b); |
| - CHECK_EQ(0xFF00FF00FF, t.b_long_as_int64); |
| + CHECK_EQ(static_cast<int64_t>(0xFF00FF00FF), t.b_long_as_int64); |
| } |
| } |
| @@ -973,25 +973,25 @@ TEST(MIPS11) { |
| Object* dummy = CALL_GENERATED_CODE(f, &t, 0, 0, 0, 0); |
| USE(dummy); |
| - CHECK_EQ(0x44bbccdd, t.lwl_0); |
| - CHECK_EQ(0x3344ccdd, t.lwl_1); |
| - CHECK_EQ(0x223344dd, t.lwl_2); |
| - CHECK_EQ(0x11223344, t.lwl_3); |
| - |
| - CHECK_EQ(0x11223344, t.lwr_0); |
| - CHECK_EQ(0xaa112233, t.lwr_1); |
| - CHECK_EQ(0xaabb1122, t.lwr_2); |
| - CHECK_EQ(0xaabbcc11, t.lwr_3); |
| - |
| - CHECK_EQ(0x112233aa, t.swl_0); |
| - CHECK_EQ(0x1122aabb, t.swl_1); |
| - CHECK_EQ(0x11aabbcc, t.swl_2); |
| - CHECK_EQ(0xaabbccdd, t.swl_3); |
| - |
| - CHECK_EQ(0xaabbccdd, t.swr_0); |
| - CHECK_EQ(0xbbccdd44, t.swr_1); |
| - CHECK_EQ(0xccdd3344, t.swr_2); |
| - CHECK_EQ(0xdd223344, t.swr_3); |
| + CHECK_EQ(static_cast<int32_t>(0x44bbccdd), t.lwl_0); |
| + CHECK_EQ(static_cast<int32_t>(0x3344ccdd), t.lwl_1); |
| + CHECK_EQ(static_cast<int32_t>(0x223344dd), t.lwl_2); |
| + CHECK_EQ(static_cast<int32_t>(0x11223344), t.lwl_3); |
| + |
| + CHECK_EQ(static_cast<int32_t>(0x11223344), t.lwr_0); |
| + CHECK_EQ(static_cast<int32_t>(0xaa112233), t.lwr_1); |
| + CHECK_EQ(static_cast<int32_t>(0xaabb1122), t.lwr_2); |
| + CHECK_EQ(static_cast<int32_t>(0xaabbcc11), t.lwr_3); |
| + |
| + CHECK_EQ(static_cast<int32_t>(0x112233aa), t.swl_0); |
| + CHECK_EQ(static_cast<int32_t>(0x1122aabb), t.swl_1); |
| + CHECK_EQ(static_cast<int32_t>(0x11aabbcc), t.swl_2); |
| + CHECK_EQ(static_cast<int32_t>(0xaabbccdd), t.swl_3); |
| + |
| + CHECK_EQ(static_cast<int32_t>(0xaabbccdd), t.swr_0); |
| + CHECK_EQ(static_cast<int32_t>(0xbbccdd44), t.swr_1); |
| + CHECK_EQ(static_cast<int32_t>(0xccdd3344), t.swr_2); |
| + CHECK_EQ(static_cast<int32_t>(0xdd223344), t.swr_3); |
| } |
| } |
| @@ -1374,16 +1374,16 @@ TEST(MIPS16) { |
| USE(dummy); |
| // Unsigned data, 32 & 64. |
| - CHECK_EQ(0x1111111144332211L, t.r1); |
| - CHECK_EQ(0x0000000000002211L, t.r2); |
| + CHECK_EQ(static_cast<int64_t>(0x1111111144332211L), t.r1); |
| + CHECK_EQ(static_cast<int64_t>(0x0000000000002211L), t.r2); |
| // Signed data, 32 & 64. |
| - CHECK_EQ(0x33333333ffffbbccL, t.r3); |
| - CHECK_EQ(0xffffffff0000bbccL, t.r4); |
| + CHECK_EQ(static_cast<int64_t>(0x33333333ffffbbccL), t.r3); |
| + CHECK_EQ(static_cast<int64_t>(0xffffffff0000bbccL), t.r4); |
| // Signed data, 32 & 64. |
| - CHECK_EQ(0x55555555ffffffccL, t.r5); |
| - CHECK_EQ(0x000000003333bbccL, t.r6); |
| + CHECK_EQ(static_cast<int64_t>(0x55555555ffffffccL), t.r5); |
| + CHECK_EQ(static_cast<int64_t>(0x000000003333bbccL), t.r6); |
| } |
| #undef __ |