[cfe-commits] r41236 - in /cfe/trunk/CodeGen: CGAggExpr.cpp CGComplexExpr.cpp CGExpr.cpp CodeGenFunction.h
Chris Lattner
sabre at nondot.org
Tue Aug 21 10:28:34 PDT 2007
Author: lattner
Date: Tue Aug 21 12:28:34 2007
New Revision: 41236
URL: http://llvm.org/viewvc/llvm-project?rev=41236&view=rev
Log:
move EmitLoadOfComplex/EmitStoreOfComplex into ComplexExprEmitter.
Modified:
cfe/trunk/CodeGen/CGAggExpr.cpp
cfe/trunk/CodeGen/CGComplexExpr.cpp
cfe/trunk/CodeGen/CGExpr.cpp
cfe/trunk/CodeGen/CodeGenFunction.h
Modified: cfe/trunk/CodeGen/CGAggExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CodeGen/CGAggExpr.cpp?rev=41236&r1=41235&r2=41236&view=diff
==============================================================================
--- cfe/trunk/CodeGen/CGAggExpr.cpp (original)
+++ cfe/trunk/CodeGen/CGAggExpr.cpp Tue Aug 21 12:28:34 2007
@@ -160,14 +160,7 @@
// FIXME: Handle volatility!
void CodeGenFunction::EmitAggregateCopy(llvm::Value *DestPtr,
llvm::Value *SrcPtr, QualType Ty) {
- // Don't use memcpy for complex numbers.
- // FIXME: split complex number handling out of here.
- if (Ty->isComplexType()) {
- llvm::Value *Real, *Imag;
- EmitLoadOfComplex(SrcPtr, Real, Imag);
- EmitStoreOfComplex(Real, Imag, DestPtr);
- return;
- }
+ assert(!Ty->isComplexType() && "Shouldn't happen for complex");
// Aggregate assignment turns into llvm.memcpy.
const llvm::Type *BP = llvm::PointerType::get(llvm::Type::Int8Ty);
Modified: cfe/trunk/CodeGen/CGComplexExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CodeGen/CGComplexExpr.cpp?rev=41236&r1=41235&r2=41236&view=diff
==============================================================================
--- cfe/trunk/CodeGen/CGComplexExpr.cpp (original)
+++ cfe/trunk/CodeGen/CGComplexExpr.cpp Tue Aug 21 12:28:34 2007
@@ -42,8 +42,17 @@
/// EmitLoadOfLValue - Given an expression with complex type that represents a
/// value l-value, this method emits the address of the l-value, then loads
/// and returns the result.
- ComplexPairTy EmitLoadOfLValue(const Expr *E);
+ ComplexPairTy EmitLoadOfLValue(const Expr *E) {
+ return EmitLoadOfComplex(CGF.EmitLValue(E).getAddress());
+ }
+ /// EmitLoadOfComplex - Given a pointer to a complex value, emit code to load
+ /// the real and imaginary pieces.
+ ComplexPairTy EmitLoadOfComplex(llvm::Value *SrcPtr);
+
+ /// EmitStoreOfComplex - Store the specified real/imag parts into the
+ /// specified value pointer.
+ void EmitStoreOfComplex(ComplexPairTy Val, llvm::Value *ResPtr);
//===--------------------------------------------------------------------===//
// Visitor Methods
@@ -89,19 +98,37 @@
// Utilities
//===----------------------------------------------------------------------===//
-/// EmitLoadOfLValue - Given an expression with complex type that represents a
-/// value l-value, this method emits the address of the l-value, then loads
-/// and returns the result.
-ComplexPairTy ComplexExprEmitter::EmitLoadOfLValue(const Expr *E) {
- LValue LV = CGF.EmitLValue(E);
- assert(LV.isSimple() && "Can't have complex bitfield, vector, etc");
-
- // Load the real/imag values.
- llvm::Value *Real, *Imag;
- CGF.EmitLoadOfComplex(LV.getAddress(), Real, Imag);
+/// EmitLoadOfComplex - Given an RValue reference for a complex, emit code to
+/// load the real and imaginary pieces, returning them as Real/Imag.
+ComplexPairTy ComplexExprEmitter::EmitLoadOfComplex(llvm::Value *SrcPtr) {
+ llvm::Constant *Zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0);
+ llvm::Constant *One = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1);
+ // FIXME: It would be nice to make this "Ptr->getName()+realp"
+ llvm::Value *RealPtr = CGF.Builder.CreateGEP(SrcPtr, Zero, Zero, "realp");
+ llvm::Value *ImagPtr = CGF.Builder.CreateGEP(SrcPtr, Zero, One, "imagp");
+
+ // FIXME: Handle volatility.
+ // FIXME: It would be nice to make this "Ptr->getName()+real"
+ llvm::Value *Real = CGF.Builder.CreateLoad(RealPtr, "real");
+ llvm::Value *Imag = CGF.Builder.CreateLoad(ImagPtr, "imag");
return ComplexPairTy(Real, Imag);
}
+/// EmitStoreOfComplex - Store the specified real/imag parts into the
+/// specified value pointer.
+void ComplexExprEmitter::EmitStoreOfComplex(ComplexPairTy V, llvm::Value *Ptr) {
+ llvm::Constant *Zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0);
+ llvm::Constant *One = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1);
+ llvm::Value *RealPtr = CGF.Builder.CreateGEP(Ptr, Zero, Zero, "real");
+ llvm::Value *ImagPtr = CGF.Builder.CreateGEP(Ptr, Zero, One, "imag");
+
+ // FIXME: Handle volatility.
+ CGF.Builder.CreateStore(V.first, RealPtr);
+ CGF.Builder.CreateStore(V.second, ImagPtr);
+}
+
+
+
//===----------------------------------------------------------------------===//
// Visitor Methods
//===----------------------------------------------------------------------===//
@@ -148,7 +175,7 @@
// Store into it.
// FIXME: Volatility!
- CGF.EmitStoreOfComplex(Val.first, Val.second, LHS.getAddress());
+ EmitStoreOfComplex(Val, LHS.getAddress());
return Val;
}
Modified: cfe/trunk/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CodeGen/CGExpr.cpp?rev=41236&r1=41235&r2=41236&view=diff
==============================================================================
--- cfe/trunk/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/CodeGen/CGExpr.cpp Tue Aug 21 12:28:34 2007
@@ -40,36 +40,6 @@
return ConvertScalarValueToBool(EmitExpr(E), E->getType());
}
-/// EmitLoadOfComplex - Given an RValue reference for a complex, emit code to
-/// load the real and imaginary pieces, returning them as Real/Imag.
-void CodeGenFunction::EmitLoadOfComplex(llvm::Value *SrcPtr,
- llvm::Value *&Real, llvm::Value *&Imag){
- llvm::Constant *Zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0);
- llvm::Constant *One = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1);
- // FIXME: It would be nice to make this "Ptr->getName()+realp"
- llvm::Value *RealPtr = Builder.CreateGEP(SrcPtr, Zero, Zero, "realp");
- llvm::Value *ImagPtr = Builder.CreateGEP(SrcPtr, Zero, One, "imagp");
-
- // FIXME: Handle volatility.
- // FIXME: It would be nice to make this "Ptr->getName()+real"
- Real = Builder.CreateLoad(RealPtr, "real");
- Imag = Builder.CreateLoad(ImagPtr, "imag");
-}
-
-/// EmitStoreOfComplex - Store the specified real/imag parts into the
-/// specified value pointer.
-void CodeGenFunction::EmitStoreOfComplex(llvm::Value *Real, llvm::Value *Imag,
- llvm::Value *ResPtr) {
- llvm::Constant *Zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0);
- llvm::Constant *One = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1);
- llvm::Value *RealPtr = Builder.CreateGEP(ResPtr, Zero, Zero, "real");
- llvm::Value *ImagPtr = Builder.CreateGEP(ResPtr, Zero, One, "imag");
-
- // FIXME: Handle volatility.
- Builder.CreateStore(Real, RealPtr);
- Builder.CreateStore(Imag, ImagPtr);
-}
-
//===--------------------------------------------------------------------===//
// Conversions
//===--------------------------------------------------------------------===//
Modified: cfe/trunk/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CodeGen/CodeGenFunction.h?rev=41236&r1=41235&r2=41236&view=diff
==============================================================================
--- cfe/trunk/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/CodeGen/CodeGenFunction.h Tue Aug 21 12:28:34 2007
@@ -248,16 +248,6 @@
llvm::Value *EvaluateExprAsBool(const Expr *E);
- /// EmitLoadOfComplex - Given an RValue reference for a complex, emit code to
- /// load the real and imaginary pieces, returning them as Real/Imag.
- void EmitLoadOfComplex(llvm::Value *SrcPtr, llvm::Value *&Real,
- llvm::Value *&Imag);
-
- /// EmitStoreOfComplex - Store the specified real/imag parts into the
- /// specified value pointer.
- void EmitStoreOfComplex(llvm::Value *Real, llvm::Value *Imag,
- llvm::Value *ResPtr);
-
//===--------------------------------------------------------------------===//
// Conversions
//===--------------------------------------------------------------------===//
More information about the cfe-commits
mailing list