diff options
| author | 2017-02-21 13:00:35 +0000 | |
|---|---|---|
| committer | 2017-02-21 13:00:35 +0000 | |
| commit | 30e015c442c8033390c30d2f293604723c29bc75 (patch) | |
| tree | c71324e48fe026cbd11119ef43f44da7ae134093 /compiler/optimizing/optimizing_cfi_test.cc | |
| parent | e78fc52ca379493801c749a44093f72906abe1e6 (diff) | |
| parent | e6316892821287b1d1906b9962eae129fbdc37be (diff) | |
Merge "ARM: VIXL32: Use VIXL backend by default."
Diffstat (limited to 'compiler/optimizing/optimizing_cfi_test.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_cfi_test.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index 0e02311672..490e50cb77 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -24,17 +24,17 @@ #include "optimizing/code_generator.h" #include "optimizing/optimizing_unit_test.h" #include "utils/assembler.h" -#ifdef ART_USE_VIXL_ARM_BACKEND -#include "utils/arm/assembler_arm_vixl.h" -#else +#ifdef ART_USE_OLD_ARM_BACKEND #include "utils/arm/assembler_thumb2.h" +#else +#include "utils/arm/assembler_arm_vixl.h" #endif #include "utils/mips/assembler_mips.h" #include "utils/mips64/assembler_mips64.h" #include "optimizing/optimizing_cfi_test_expected.inc" -#ifdef ART_USE_VIXL_ARM_BACKEND +#ifndef ART_USE_OLD_ARM_BACKEND namespace vixl32 = vixl::aarch32; using vixl32::r0; @@ -196,7 +196,15 @@ TEST_F(OptimizingCFITest, kThumb2Adjust) { expected_cfi_kThumb2_adjust, expected_cfi_kThumb2_adjust + arraysize(expected_cfi_kThumb2_adjust)); SetUpFrame(kThumb2); -#ifdef ART_USE_VIXL_ARM_BACKEND +#ifdef ART_USE_OLD_ARM_BACKEND +#define __ down_cast<arm::Thumb2Assembler*>(GetCodeGenerator()->GetAssembler())-> + Label target; + __ CompareAndBranchIfZero(arm::R0, &target); + // Push the target out of range of CBZ. + for (size_t i = 0; i != 65; ++i) { + __ ldr(arm::R0, arm::Address(arm::R0)); + } +#else #define __ down_cast<arm::ArmVIXLAssembler*>(GetCodeGenerator() \ ->GetAssembler())->GetVIXLAssembler()-> vixl32::Label target; @@ -205,14 +213,6 @@ TEST_F(OptimizingCFITest, kThumb2Adjust) { for (size_t i = 0; i != 65; ++i) { __ Ldr(r0, vixl32::MemOperand(r0)); } -#else -#define __ down_cast<arm::Thumb2Assembler*>(GetCodeGenerator()->GetAssembler())-> - Label target; - __ CompareAndBranchIfZero(arm::R0, &target); - // Push the target out of range of CBZ. - for (size_t i = 0; i != 65; ++i) { - __ ldr(arm::R0, arm::Address(arm::R0)); - } #endif __ Bind(&target); #undef __ |