commit bada8b0f0a10bd32d6cb87ed4e57f2aa3d7c03c2
author Guillaume "Vermeille" Sanchez <guillaumesa@google.com> Wed Mar 11 14:00:30 2015 +0000
committer Guillaume Sanchez <guillaumesa@google.com> Wed Mar 11 16:36:08 2015 +0000
tree ffb5b8e7caaed4e4c1a629703fe2ecb2d6e58142
parent e8e42f3548fd894f860912bb1b71ce6fa2d7daf3

Forbid the use of shifts in ShifterOperand in Thumb2

Change-Id: Ib141f53e52cce3032a42fbc991303e227c98820b

compiler/utils/arm/assembler_arm.h

diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h
index 8730f52..dd0dba2 100644
--- a/compiler/utils/arm/assembler_arm.h
+++ b/compiler/utils/arm/assembler_arm.h
@@ -100,6 +100,10 @@
     return rm_;
   }
 
+  Register GetSecondRegister() const {
+    return rs_;
+  }
+
   enum Type {
     kUnknown = -1,
     kRegister,

compiler/utils/arm/assembler_thumb2.cc

diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc
index 6d0571e..eb5b454 100644
--- a/compiler/utils/arm/assembler_thumb2.cc
+++ b/compiler/utils/arm/assembler_thumb2.cc
@@ -921,6 +921,8 @@
       use_immediate = true;
       immediate = so.GetImmediate();
     } else {
+      CHECK(!(so.IsRegister() && so.IsShift() && so.GetSecondRegister() != kNoRegister))
+          << "No register-shifted register instruction available in thumb";
       // Adjust rn and rd: only two registers will be emitted.
       switch (opcode) {
         case AND: