Fix codegen_test.
Allow the execution of Thumb-2 code on ARM32 hardware.
Change-Id: I2fec71e39d538249569ffa88435f3198e8c28c01
diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index 715eca4..28fc816 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -121,8 +121,15 @@
DISALLOW_COPY_AND_ASSIGN(InternalCodeAllocator);
};
+static bool CanExecuteOnHardware(InstructionSet target_isa) {
+ return (target_isa == kRuntimeISA)
+ // Handle the special case of ARM, with two instructions sets
+ // (ARM32 and Thumb-2).
+ || (kRuntimeISA == kArm && target_isa == kThumb2);
+}
+
static bool CanExecute(InstructionSet target_isa) {
- return (target_isa == kRuntimeISA) || CodeSimulator::CanSimulate(target_isa);
+ return CanExecuteOnHardware(target_isa) || CodeSimulator::CanSimulate(target_isa);
}
template <typename Expected>
@@ -151,7 +158,7 @@
Expected (*f)(),
bool has_result,
Expected expected) {
- ASSERT_TRUE(CanExecute(target_isa)) << "Target isa is not executable.";
+ ASSERT_TRUE(CanExecute(target_isa)) << "Target ISA is not executable " << target_isa;
// Verify on simulator.
if (CodeSimulator::CanSimulate(target_isa)) {
@@ -163,7 +170,7 @@
}
// Verify on hardware.
- if (kRuntimeISA == target_isa) {
+ if (CanExecuteOnHardware(target_isa)) {
Expected result = f();
if (has_result) {
ASSERT_EQ(expected, result);