Index: runtime/vm/assembler_arm_test.cc |
=================================================================== |
--- runtime/vm/assembler_arm_test.cc (revision 33437) |
+++ runtime/vm/assembler_arm_test.cc (working copy) |
@@ -59,9 +59,18 @@ |
ASSEMBLER_TEST_GENERATE(MovImm16, assembler) { |
- __ movw(R0, 0x5678); |
- __ movt(R0, 0x1234); |
+#if defined(USING_SIMULATOR) |
+ // ARMv7 is the default. |
+ HostCPUFeatures::set_arm_version(ARMv6); |
+ __ LoadDecodableImmediate(R0, 0x12345678 << 1); |
+ HostCPUFeatures::set_arm_version(ARMv7); |
+ __ LoadDecodableImmediate(R1, 0x12345678); |
+ __ sub(R0, R0, ShifterOperand(R1)); |
__ bx(LR); |
+#else |
+ __ LoadDecodableImmediate(R0, 0x12345678); |
+ __ bx(LR); |
+#endif |
} |