X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FInlineAsm.h;h=325b777dd49f8644de44f2e87c196c7fa479fd5a;hb=4ae641f4d12c60ee1aaca5e42b6de231c6a02c40;hp=94d3bc86957f396ce89be8a8d633a30fee223392;hpb=e202a253b1f28a564adf994154df3ea23c841afb;p=oota-llvm.git

diff --git a/include/llvm/InlineAsm.h b/include/llvm/InlineAsm.h
index 94d3bc86957..325b777dd49 100644
--- a/include/llvm/InlineAsm.h
+++ b/include/llvm/InlineAsm.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Chris Lattner and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -21,7 +21,6 @@
 
 namespace llvm {
 
-struct AssemblyAnnotationWriter;
 class PointerType;
 class FunctionType;
 class Module;
@@ -35,6 +34,7 @@ class InlineAsm : public Value {
   
   InlineAsm(const FunctionType *Ty, const std::string &AsmString,
             const std::string &Constraints, bool hasSideEffects);
+  virtual ~InlineAsm();
 public:
 
   /// InlineAsm::get - Return the the specified uniqued inline asm string.
@@ -57,9 +57,6 @@ public:
   const std::string &getAsmString() const { return AsmString; }
   const std::string &getConstraintString() const { return Constraints; }
 
-  virtual void print(std::ostream &O) const { print(O, 0); }
-  void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const;
-
   /// Verify - This static method can be used by the parser to check to see if
   /// the specified constraint string is legal for the type.  This returns true
   /// if legal, false if not.
@@ -70,7 +67,7 @@ public:
   enum ConstraintPrefix {
     isInput,            // 'x'
     isOutput,           // '=x'
-    isClobber,          // '~x'
+    isClobber           // '~x'
   };
   
   struct ConstraintInfo {
@@ -82,18 +79,29 @@ 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;
+    
+    /// isCommutative - This is set to true for a constraint that is commutative
+    /// 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);
+    bool Parse(const std::string &Str, 
+               std::vector<InlineAsm::ConstraintInfo> &ConstraintsSoFar);
   };
   
   /// ParseConstraints - Split up the constraint string into the specific
@@ -112,7 +120,7 @@ public:
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const InlineAsm *) { return true; }
   static inline bool classof(const Value *V) {
-    return V->getValueType() == Value::InlineAsmVal;
+    return V->getValueID() == Value::InlineAsmVal;
   }
 };