Index: runtime/vm/assembler_arm_test.cc |
=================================================================== |
--- runtime/vm/assembler_arm_test.cc (revision 32559) |
+++ runtime/vm/assembler_arm_test.cc (working copy) |
@@ -6,7 +6,6 @@ |
#if defined(TARGET_ARCH_ARM) |
#include "vm/assembler.h" |
-#include "vm/cpu.h" |
#include "vm/os.h" |
#include "vm/unit_test.h" |
#include "vm/virtual_memory.h" |
@@ -1458,7 +1457,7 @@ |
ASSEMBLER_TEST_GENERATE(Udiv, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ mov(R0, ShifterOperand(27)); |
__ mov(R1, ShifterOperand(9)); |
__ udiv(R2, R0, R1); |
@@ -1478,7 +1477,7 @@ |
ASSEMBLER_TEST_GENERATE(Sdiv, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ mov(R0, ShifterOperand(27)); |
__ LoadImmediate(R1, -9); |
__ sdiv(R2, R0, R1); |
@@ -1498,7 +1497,7 @@ |
ASSEMBLER_TEST_GENERATE(Udiv_zero, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ mov(R0, ShifterOperand(27)); |
__ mov(R1, ShifterOperand(0)); |
__ udiv(R2, R0, R1); |
@@ -1518,7 +1517,7 @@ |
ASSEMBLER_TEST_GENERATE(Sdiv_zero, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ mov(R0, ShifterOperand(27)); |
__ mov(R1, ShifterOperand(0)); |
__ udiv(R2, R0, R1); |
@@ -1538,7 +1537,7 @@ |
ASSEMBLER_TEST_GENERATE(Udiv_corner, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ LoadImmediate(R0, 0x80000000); |
__ LoadImmediate(R1, 0xffffffff); |
__ udiv(R2, R0, R1); |
@@ -1558,7 +1557,7 @@ |
ASSEMBLER_TEST_GENERATE(Sdiv_corner, assembler) { |
- if (TargetCPUFeatures::integer_division_supported()) { |
+ if (CPUFeatures::integer_division_supported()) { |
__ LoadImmediate(R0, 0x80000000); |
__ LoadImmediate(R1, 0xffffffff); |
__ sdiv(R2, R0, R1); |
@@ -1580,12 +1579,12 @@ |
ASSEMBLER_TEST_GENERATE(IntDiv_supported, assembler) { |
#if defined(USING_SIMULATOR) |
- bool orig = TargetCPUFeatures::integer_division_supported(); |
- HostCPUFeatures::set_integer_division_supported(true); |
+ bool orig = CPUFeatures::integer_division_supported(); |
+ CPUFeatures::set_integer_division_supported(true); |
__ mov(R0, ShifterOperand(27)); |
__ mov(R1, ShifterOperand(9)); |
__ IntegerDivide(R0, R0, R1, D0, D1); |
- HostCPUFeatures::set_integer_division_supported(orig); |
+ CPUFeatures::set_integer_division_supported(orig); |
__ bx(LR); |
#else |
__ mov(R0, ShifterOperand(27)); |
@@ -1605,12 +1604,12 @@ |
ASSEMBLER_TEST_GENERATE(IntDiv_unsupported, assembler) { |
#if defined(USING_SIMULATOR) |
- bool orig = TargetCPUFeatures::integer_division_supported(); |
- HostCPUFeatures::set_integer_division_supported(false); |
+ bool orig = CPUFeatures::integer_division_supported(); |
+ CPUFeatures::set_integer_division_supported(false); |
__ mov(R0, ShifterOperand(27)); |
__ mov(R1, ShifterOperand(9)); |
__ IntegerDivide(R0, R0, R1, D0, D1); |
- HostCPUFeatures::set_integer_division_supported(orig); |
+ CPUFeatures::set_integer_division_supported(orig); |
__ bx(LR); |
#else |
__ mov(R0, ShifterOperand(27)); |
@@ -1645,7 +1644,7 @@ |
ASSEMBLER_TEST_GENERATE(Vaddqi8, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1689,7 +1688,7 @@ |
ASSEMBLER_TEST_GENERATE(Vaddqi16, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1733,7 +1732,7 @@ |
ASSEMBLER_TEST_GENERATE(Vaddqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1777,7 +1776,7 @@ |
ASSEMBLER_TEST_GENERATE(Vaddqi64, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1809,7 +1808,7 @@ |
ASSEMBLER_TEST_GENERATE(Vsubqi8, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1853,7 +1852,7 @@ |
ASSEMBLER_TEST_GENERATE(Vsubqi16, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1897,7 +1896,7 @@ |
ASSEMBLER_TEST_GENERATE(Vsubqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1941,7 +1940,7 @@ |
ASSEMBLER_TEST_GENERATE(Vsubqi64, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -1973,7 +1972,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmulqi8, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2017,7 +2016,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmulqi16, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2061,7 +2060,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmulqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2105,7 +2104,7 @@ |
ASSEMBLER_TEST_GENERATE(Vaddqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -2140,7 +2139,7 @@ |
ASSEMBLER_TEST_GENERATE(Vsubqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -2175,7 +2174,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmulqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -2210,7 +2209,7 @@ |
ASSEMBLER_TEST_GENERATE(VtblX, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Index. |
__ LoadImmediate(R0, 0x03020100); |
__ vmovsr(S0, R0); |
@@ -2253,7 +2252,7 @@ |
ASSEMBLER_TEST_GENERATE(VtblY, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Index. |
__ LoadImmediate(R0, 0x07060504); |
__ vmovsr(S0, R0); |
@@ -2296,7 +2295,7 @@ |
ASSEMBLER_TEST_GENERATE(VtblZ, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Index. |
__ LoadImmediate(R0, 0x0b0a0908); |
__ vmovsr(S0, R0); |
@@ -2339,7 +2338,7 @@ |
ASSEMBLER_TEST_GENERATE(VtblW, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Index. |
__ LoadImmediate(R0, 0x0f0e0d0c); |
__ vmovsr(S0, R0); |
@@ -2382,7 +2381,7 @@ |
ASSEMBLER_TEST_GENERATE(Veorq, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Q0 |
__ LoadImmediate(R0, 0xaaaaaaab); |
__ vmovsr(S0, R0); |
@@ -2424,7 +2423,7 @@ |
ASSEMBLER_TEST_GENERATE(Vornq, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Q0 |
__ LoadImmediate(R0, 0xfffffff0); |
__ vmovsr(S0, R0); |
@@ -2466,7 +2465,7 @@ |
ASSEMBLER_TEST_GENERATE(Vorrq, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Q0 |
__ LoadImmediate(R0, 0xaaaaaaaa); |
__ vmovsr(S0, R0); |
@@ -2508,7 +2507,7 @@ |
ASSEMBLER_TEST_GENERATE(Vandq, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Q0 |
__ LoadImmediate(R0, 0xaaaaaaab); |
__ vmovsr(S0, R0); |
@@ -2550,7 +2549,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmovq, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
// Q0 |
__ LoadSImmediate(S0, 1.0); |
__ vmovs(S1, S0); |
@@ -2588,7 +2587,7 @@ |
ASSEMBLER_TEST_GENERATE(Vdupb, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadImmediate(R0, 0x00000000); |
__ LoadImmediate(R1, 0x00ff0000); |
__ vmovsr(S4, R0); |
@@ -2621,7 +2620,7 @@ |
ASSEMBLER_TEST_GENERATE(Vduph, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadImmediate(R0, 0xffff0000); |
__ LoadImmediate(R1, 0x00000000); |
__ vmovsr(S4, R0); |
@@ -2654,7 +2653,7 @@ |
ASSEMBLER_TEST_GENERATE(Vdupw, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadImmediate(R0, 0x00000000); |
__ LoadImmediate(R1, 0xffffffff); |
__ vmovsr(S4, R0); |
@@ -2687,7 +2686,7 @@ |
ASSEMBLER_TEST_GENERATE(Vzipqw, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 0.0); |
__ LoadSImmediate(S1, 1.0); |
__ LoadSImmediate(S2, 2.0); |
@@ -2721,7 +2720,7 @@ |
ASSEMBLER_TEST_GENERATE(Vceqqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2765,7 +2764,7 @@ |
ASSEMBLER_TEST_GENERATE(Vceqqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -2801,7 +2800,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcgeqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2845,7 +2844,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcugeqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2889,7 +2888,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcgeqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -2925,7 +2924,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcgtqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -2969,7 +2968,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcugtqi32, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ mov(R0, ShifterOperand(1)); |
__ vmovsr(S0, R0); |
__ mov(R0, ShifterOperand(2)); |
@@ -3013,7 +3012,7 @@ |
ASSEMBLER_TEST_GENERATE(Vcgtqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -3049,7 +3048,7 @@ |
ASSEMBLER_TEST_GENERATE(Vminqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -3084,7 +3083,7 @@ |
ASSEMBLER_TEST_GENERATE(Vmaxqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S0, 1.0); |
__ LoadSImmediate(S1, 2.0); |
__ LoadSImmediate(S2, 3.0); |
@@ -3154,7 +3153,7 @@ |
ASSEMBLER_TEST_GENERATE(Vrecpeqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 147.0); |
__ vmovs(S5, S4); |
__ vmovs(S6, S4); |
@@ -3179,7 +3178,7 @@ |
ASSEMBLER_TEST_GENERATE(Vrecpsqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 5.0); |
__ LoadSImmediate(S5, 2.0); |
__ LoadSImmediate(S6, 3.0); |
@@ -3209,7 +3208,7 @@ |
ASSEMBLER_TEST_GENERATE(Reciprocal, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 147000.0); |
__ vmovs(S5, S4); |
__ vmovs(S6, S4); |
@@ -3291,7 +3290,7 @@ |
ASSEMBLER_TEST_GENERATE(Vrsqrteqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 147.0); |
__ vmovs(S5, S4); |
__ vmovs(S6, S4); |
@@ -3316,7 +3315,7 @@ |
ASSEMBLER_TEST_GENERATE(Vrsqrtsqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 5.0); |
__ LoadSImmediate(S5, 2.0); |
__ LoadSImmediate(S6, 3.0); |
@@ -3346,7 +3345,7 @@ |
ASSEMBLER_TEST_GENERATE(ReciprocalSqrt, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 147000.0); |
__ vmovs(S5, S4); |
__ vmovs(S6, S4); |
@@ -3381,7 +3380,7 @@ |
ASSEMBLER_TEST_GENERATE(SIMDSqrt, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 147000.0); |
__ vmovs(S5, S4); |
__ vmovs(S6, S4); |
@@ -3426,7 +3425,7 @@ |
ASSEMBLER_TEST_GENERATE(SIMDSqrt2, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 1.0); |
__ LoadSImmediate(S5, 4.0); |
__ LoadSImmediate(S6, 9.0); |
@@ -3475,7 +3474,7 @@ |
ASSEMBLER_TEST_GENERATE(SIMDDiv, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 1.0); |
__ LoadSImmediate(S5, 4.0); |
__ LoadSImmediate(S6, 9.0); |
@@ -3516,7 +3515,7 @@ |
ASSEMBLER_TEST_GENERATE(Vabsqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 1.0); |
__ LoadSImmediate(S5, -1.0); |
__ LoadSImmediate(S6, 1.0); |
@@ -3545,7 +3544,7 @@ |
ASSEMBLER_TEST_GENERATE(Vnegqs, assembler) { |
- if (TargetCPUFeatures::neon_supported()) { |
+ if (CPUFeatures::neon_supported()) { |
__ LoadSImmediate(S4, 1.0); |
__ LoadSImmediate(S5, -2.0); |
__ LoadSImmediate(S6, 1.0); |