diff options
| -rw-r--r-- | build/Android.common_build.mk | 2 | ||||
| -rw-r--r-- | compiler/utils/arm/assembler_thumb2.cc | 2 | ||||
| -rw-r--r-- | compiler/utils/assembler_thumb_test.cc | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 3000cdf087..70b344801c 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -228,7 +228,7 @@ art_non_debug_cflags := \ # Cflags for debug ART and ART tools. art_debug_cflags := \ - -O2 \ + -O0 \ -DDYNAMIC_ANNOTATIONS_ENABLED=1 \ -DVIXL_DEBUG \ -UNDEBUG diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index 580614b943..0920a3f59f 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -951,6 +951,8 @@ void Thumb2Assembler::Emit16BitDataProcessing(Condition cond, rn = so.GetRegister(); break; } + case TST: + case TEQ: case MVN: { CHECK_EQ(rn, 0); rn = so.GetRegister(); diff --git a/compiler/utils/assembler_thumb_test.cc b/compiler/utils/assembler_thumb_test.cc index e3a9580737..a171e59d98 100644 --- a/compiler/utils/assembler_thumb_test.cc +++ b/compiler/utils/assembler_thumb_test.cc @@ -309,13 +309,13 @@ TEST(Thumb2AssemblerTest, DataProcessingRegister) { // 16 bit variants. __ add(R0, R1, ShifterOperand()); __ sub(R0, R1, ShifterOperand()); - __ and_(R0, R1, ShifterOperand()); - __ orr(R0, R1, ShifterOperand()); - __ eor(R0, R1, ShifterOperand()); - __ bic(R0, R1, ShifterOperand()); - __ adc(R0, R1, ShifterOperand()); - __ sbc(R0, R1, ShifterOperand()); - __ rsb(R0, R1, ShifterOperand()); + __ and_(R0, R0, ShifterOperand(R1)); + __ orr(R0, R0, ShifterOperand(R1)); + __ eor(R0, R0, ShifterOperand(R1)); + __ bic(R0, R0, ShifterOperand(R1)); + __ adc(R0, R0, ShifterOperand(R1)); + __ sbc(R0, R0, ShifterOperand(R1)); + __ rsb(R0, R0, ShifterOperand(R1)); __ tst(R0, ShifterOperand(R1)); __ teq(R0, ShifterOperand(R1)); |