represent indirect operands explicitly in inline asm strings.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36522 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 16 insertions, 13 deletions

diff --git a/include/llvm/InlineAsm.h b/include/llvm/InlineAsm.h
index 1ba791c472..20c184ac2e 100644
--- a/include/llvm/InlineAsm.h
+++ b/include/llvm/InlineAsm.h
@@ -85,10 +85,6 @@ public:
     /// read.  This is only ever set for an output operand.
     bool isEarlyClobber; 
     
-    /// isIndirectOutput - If this is true for an output constraint, the address
-    /// to store the output result is passed as an operand to the call.
-    bool isIndirectOutput;
-    
     /// hasMatchingInput - This is set to true for an output constraint iff
     /// there is an input constraint that is required to match it (e.g. "0").
     bool hasMatchingInput;
@@ -97,11 +93,17 @@ public:
     /// with the next operand.
     bool isCommutative;
     
+    /// isIndirect - True if this operand is an indirect operand.  This means
+    /// that the address of the source or destination is present in the call
+    /// instruction, instead of it being returned or passed in explicitly.  This
+    /// is represented with a '*' in the asm string.
+    bool isIndirect;
+    
     /// Code - The constraint code, either the register name (in braces) or the
     /// constraint letter/number.
     std::vector<std::string> Codes;
     
-    /// Parse - Analyze the specified string (e.g. "==&{eax}") and fill in the
+    /// Parse - Analyze the specified string (e.g. "=*&{eax}") and fill in the
     /// fields in this structure.  If the constraint string is not understood,
     /// return true, otherwise return false.
     bool Parse(const std::string &Str, 
diff --git a/lib/VMCore/InlineAsm.cpp b/lib/VMCore/InlineAsm.cpp
index 5f05137459..ca4ecad058 100644
--- a/lib/VMCore/InlineAsm.cpp
+++ b/lib/VMCore/InlineAsm.cpp
@@ -55,21 +55,22 @@ bool InlineAsm::ConstraintInfo::Parse(const std::string &Str,
   // Initialize
   Type = isInput;
   isEarlyClobber = false;
-  isIndirectOutput = false;
   hasMatchingInput = false;
   isCommutative = false;
+  isIndirect = false;
   
-  // Parse the prefix.
+  // Parse prefixes.
   if (*I == '~') {
     Type = isClobber;
     ++I;
   } else if (*I == '=') {
     ++I;
     Type = isOutput;
-    if (I != E && *I == '=') {
-      isIndirectOutput = true;
-      ++I;
-    }
+  }
+  
+  if (*I == '*') {
+    isIndirect = true;
+    ++I;
   }
   
   if (I == E) return true;  // Just a prefix, like "==" or "~".
@@ -184,12 +185,12 @@ bool InlineAsm::Verify(const FunctionType *Ty, const std::string &ConstStr) {
   for (unsigned i = 0, e = Constraints.size(); i != e; ++i) {
     switch (Constraints[i].Type) {
     case InlineAsm::isOutput:
-      if (!Constraints[i].isIndirectOutput) {
+      if (!Constraints[i].isIndirect) {
         if (NumInputs || NumClobbers) return false;  // outputs come first.
         ++NumOutputs;
         break;
       }
-      // FALLTHROUGH for IndirectOutputs.
+      // FALLTHROUGH for Indirect Outputs.
     case InlineAsm::isInput:
       if (NumClobbers) return false;               // inputs before clobbers.
       ++NumInputs;