[llvm] r232376 - Revert r232374: [hexagon] Distinguish the 'o', 'v', and 'm' inline assembly memory constraints.

[Daniel Sanders]

Author: dsanders
Date: Mon Mar 16 09:21:22 2015
New Revision: 232376

URL: http://llvm.org/viewvc/llvm-project?rev=232376&view=rev
Log:
Revert r232374: [hexagon] Distinguish the 'o', 'v', and 'm' inline assembly memory constraints.

2007-12-17-InvokeAsm.ll fails on the buildbot but not on my own system. Will investigate.


Modified:
    llvm/trunk/include/llvm/IR/InlineAsm.h
    llvm/trunk/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
    llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h

Modified: llvm/trunk/include/llvm/IR/InlineAsm.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/InlineAsm.h?rev=232376&r1=232375&r2=232376&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/InlineAsm.h (original)
+++ llvm/trunk/include/llvm/IR/InlineAsm.h Mon Mar 16 09:21:22 2015
@@ -240,8 +240,8 @@ public:
     // constraint codes for all targets.
     Constraint_Unknown = 0,
     Constraint_m,
-    Constraint_o,
-    Constraint_v,
+    Constraint_o, // Unused at the moment since Constraint_m is always used.
+    Constraint_v, // Unused at the moment since Constraint_m is always used.
     Constraints_Max = Constraint_v,
     Constraints_ShiftAmount = 16,
 

Modified: llvm/trunk/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp?rev=232376&r1=232375&r2=232376&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp Mon Mar 16 09:21:22 2015
@@ -1108,11 +1108,11 @@ SelectInlineAsmMemoryOperand(const SDVal
   SDValue Inp = Op, Res;
 
   switch (ConstraintID) {
+  case InlineAsm::Constraint_o:   // Offsetable.
+  case InlineAsm::Constraint_v:   // Not offsetable.
   default:
     return true;
-  case InlineAsm::Constraint_o: // Offsetable.
-  case InlineAsm::Constraint_v: // Not offsetable.
-  case InlineAsm::Constraint_m: // Memory.
+  case InlineAsm::Constraint_m:   // Memory.
     if (SelectAddrFI(Inp, Res))
       OutOps.push_back(Res);
     else

Modified: llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h?rev=232376&r1=232375&r2=232376&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonISelLowering.h Mon Mar 16 09:21:22 2015
@@ -185,11 +185,8 @@ bool isPositiveHalfWord(SDNode *N);
 
     unsigned getInlineAsmMemConstraint(
         const std::string &ConstraintCode) const override {
-      if (ConstraintCode == "o")
-        return InlineAsm::Constraint_o;
-      else if (ConstraintCode == "v")
-        return InlineAsm::Constraint_v;
-      return TargetLowering::getInlineAsmMemConstraint(ConstraintCode);
+      // FIXME: Map different constraints differently.
+      return InlineAsm::Constraint_m;
     }
 
     // Intrinsics