diff options
| -rw-r--r-- | lib/CodeGen/CGStmt.cpp | 23 | ||||
| -rw-r--r-- | test/CodeGen/asm.c | 7 |
2 files changed, 25 insertions, 5 deletions
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index fd01905698..edccbe41bf 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -19,6 +19,7 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/InlineAsm.h" #include "llvm/Intrinsics.h" +#include "llvm/Target/TargetData.h" using namespace clang; using namespace CodeGen; @@ -867,12 +868,24 @@ llvm::Value* CodeGenFunction::EmitAsmInput(const AsmStmt &S, { llvm::Value *Arg; if ((Info & TargetInfo::CI_AllowsRegister) || - !(Info & TargetInfo::CI_AllowsMemory)) { - if (ConvertType(InputExpr->getType())->isSingleValueType()) { + !(Info & TargetInfo::CI_AllowsMemory)) { + const llvm::Type *Ty = ConvertType(InputExpr->getType()); + + if (Ty->isSingleValueType()) { Arg = EmitScalarExpr(InputExpr); } else { - ErrorUnsupported(&S, - "asm statement passing multiple-value types as inputs"); + LValue Dest = EmitLValue(InputExpr); + + uint64_t Size = CGM.getTargetData().getTypeSizeInBits(Ty); + if (Size <= 64 && llvm::isPowerOf2_64(Size)) { + Ty = llvm::IntegerType::get(Size); + Ty = llvm::PointerType::getUnqual(Ty); + + Arg = Builder.CreateLoad(Builder.CreateBitCast(Dest.getAddress(), Ty)); + } else { + Arg = Dest.getAddress(); + ConstraintStr += '*'; + } } } else { LValue Dest = EmitLValue(InputExpr); @@ -964,7 +977,7 @@ void CodeGenFunction::EmitAsmStmt(const AsmStmt &S) { TargetInfo::ConstraintInfo Info; bool result = Target.validateInputConstraint(InputConstraint.c_str(), - NumConstraints, Info); + NumConstraints, Info); assert(result && "Failed to parse input constraint"); result=result; if (i != 0 || S.getNumOutputs() > 0) diff --git a/test/CodeGen/asm.c b/test/CodeGen/asm.c index 0b6485ebff..4ef97bde2a 100644 --- a/test/CodeGen/asm.c +++ b/test/CodeGen/asm.c @@ -14,6 +14,13 @@ void t3(unsigned char *src, unsigned long long temp) __asm__ volatile("" : "+m"(temp), "+r"(src)); } +void t4() +{ + unsigned long long a; + struct reg { unsigned long long a, b; } b; + + __asm__ volatile ("":: "m"(a), "m"(b)); +} |