[cfe-commits] r53552 - in /cfe/trunk: clang.xcodeproj/project.pbxproj lib/CodeGen/CGObjCEtoile.cpp
Chris Lattner
sabre at nondot.org
Mon Jul 14 09:54:05 PDT 2008
Author: lattner
Date: Mon Jul 14 11:54:05 2008
New Revision: 53552
URL: http://llvm.org/viewvc/llvm-project?rev=53552&view=rev
Log:
remove CGObjCEtoile until it compiles.
Removed:
cfe/trunk/lib/CodeGen/CGObjCEtoile.cpp
Modified:
cfe/trunk/clang.xcodeproj/project.pbxproj
Modified: cfe/trunk/clang.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/clang.xcodeproj/project.pbxproj?rev=53552&r1=53551&r2=53552&view=diff
==============================================================================
--- cfe/trunk/clang.xcodeproj/project.pbxproj (original)
+++ cfe/trunk/clang.xcodeproj/project.pbxproj Mon Jul 14 11:54:05 2008
@@ -146,7 +146,6 @@
DEC63B1C0C7B940600DBF169 /* CFG.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEC63B1B0C7B940600DBF169 /* CFG.h */; };
DEC8D9910A9433CD00353FCA /* Decl.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEC8D9900A9433CD00353FCA /* Decl.h */; };
DEC8D9A40A94346E00353FCA /* AST.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEC8D9A30A94346E00353FCA /* AST.h */; };
- DECAB0950DA684C500E13CCB /* CGObjCEtoile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECAB0940DA684C500E13CCB /* CGObjCEtoile.cpp */; };
DECAB0D00DB3C84200E13CCB /* RewriteRope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECAB0CF0DB3C84200E13CCB /* RewriteRope.cpp */; };
DED626C90AE0C065001E80A4 /* TargetInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED626C80AE0C065001E80A4 /* TargetInfo.cpp */; };
DED62ABB0AE2EDF1001E80A4 /* Decl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED62ABA0AE2EDF1001E80A4 /* Decl.cpp */; };
@@ -456,7 +455,6 @@
DEC63B1B0C7B940600DBF169 /* CFG.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFG.h; path = clang/AST/CFG.h; sourceTree = "<group>"; };
DEC8D9900A9433CD00353FCA /* Decl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Decl.h; path = clang/AST/Decl.h; sourceTree = "<group>"; };
DEC8D9A30A94346E00353FCA /* AST.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AST.h; path = clang/AST/AST.h; sourceTree = "<group>"; };
- DECAB0940DA684C500E13CCB /* CGObjCEtoile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CGObjCEtoile.cpp; path = lib/CodeGen/CGObjCEtoile.cpp; sourceTree = "<group>"; };
DECAB0CF0DB3C84200E13CCB /* RewriteRope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RewriteRope.cpp; path = lib/Rewrite/RewriteRope.cpp; sourceTree = "<group>"; };
DED626C80AE0C065001E80A4 /* TargetInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TargetInfo.cpp; sourceTree = "<group>"; };
DED62ABA0AE2EDF1001E80A4 /* Decl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = Decl.cpp; path = lib/AST/Decl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -782,7 +780,6 @@
1A7342470C7B57D500122F56 /* CGObjC.cpp */,
DE38CD4E0D794CF900A273B6 /* CGObjCRuntime.h */,
DE38CD4F0D794D0100A273B6 /* CGObjCGNU.cpp */,
- DECAB0940DA684C500E13CCB /* CGObjCEtoile.cpp */,
DE4772F90C10EAE5002239E8 /* CGStmt.cpp */,
DE928B120C05659200231DA4 /* ModuleBuilder.cpp */,
);
@@ -1154,7 +1151,6 @@
3574BC2B0D9B531D00DF491A /* HTMLDiagnostics.cpp in Sources */,
35F8D0D60D9B82CD00D91C5E /* BasicObjCFoundationChecks.cpp in Sources */,
3593790A0DA48ABA0043B19C /* BugReporter.cpp in Sources */,
- DECAB0950DA684C500E13CCB /* CGObjCEtoile.cpp in Sources */,
35EF67700DAD1D2C00B19414 /* SemaDeclCXX.cpp in Sources */,
352712510DAFE54700C76352 /* IdentifierResolver.cpp in Sources */,
DEFFECA70DB1546600B4E7C3 /* DeltaTree.cpp in Sources */,
Removed: cfe/trunk/lib/CodeGen/CGObjCEtoile.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCEtoile.cpp?rev=53551&view=auto
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCEtoile.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCEtoile.cpp (removed)
@@ -1,245 +0,0 @@
-//===------- CGObjCEtoile.cpp - Emit LLVM Code from ASTs for a Module --------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This provides Objective-C code generation targetting the Etoile runtime.
-//
-//===----------------------------------------------------------------------===//
-
-#include "CGObjCRuntime.h"
-#include "llvm/Module.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/IRBuilder.h"
-#include "llvm/ADT/SmallVector.h"
-
-namespace {
-class CGObjCEtoile : public clang::CodeGen::CGObjCRuntime {
-private:
- llvm::Module &TheModule;
- const llvm::Type *SelectorTy;
- const llvm::PointerType *PtrToInt8Ty;
- const llvm::Type *IMPTy;
- const llvm::Type *IntTy;
- const llvm::Type *PtrTy;
- const llvm::Type *LongTy;
- const llvm::Type *PtrToIntTy;
- const llvm::Type *IdTy;
- const llvm::Type *CallTy;
- const llvm::Type *SlotTy;
- const llvm::Type *LookupFunctionTy;
-public:
- CGObjCEtoile(llvm::Module &Mp,
- const llvm::Type *LLVMIntType,
- const llvm::Type *LLVMLongType);
- virtual llvm::Value *generateMessageSend(llvm::IRBuilder &Builder,
- const llvm::Type *ReturnTy,
- llvm::Value *Sender,
- llvm::Value *Receiver,
- llvm::Value *Selector,
- llvm::Value** ArgV,
- unsigned ArgC);
- llvm::Value *getSelector(llvm::IRBuilder &Builder,
- llvm::Value *SelName,
- llvm::Value *SelTypes);
- virtual llvm::Function *MethodPreamble(
- const std::string &ClassName,
- const std::string &CategoryName,
- const std::string &MethodName,
- const llvm::Type *ReturnTy,
- const llvm::Type *SelfTy,
- const llvm::Type **ArgTy,
- unsigned ArgC,
- bool isClassMethod,
- bool isVarArg);
-};
-} // end anonymous namespace
-
-CGObjCEtoile::CGObjCEtoile(llvm::Module &M,
- const llvm::Type *LLVMIntType,
- const llvm::Type *LLVMLongType) :
- TheModule(M),
- IntTy(LLVMIntType),
- LongTy(LLVMLongType)
-{
- // C string type. Used in lots of places.
- PtrToInt8Ty =
- llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
- // Get the selector Type.
- SelectorTy = llvm::Type::Int32Ty;
- PtrToIntTy = llvm::PointerType::getUnqual(IntTy);
- PtrTy = llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
-
- // Object type
- llvm::PATypeHolder OpaqueObjTy = llvm::OpaqueType::get();
- llvm::Type *OpaqueIdTy = llvm::PointerType::getUnqual(OpaqueObjTy);
- IdTy = llvm::StructType::get(OpaqueIdTy, NULL);
- llvm::cast<llvm::OpaqueType>(OpaqueObjTy.get())->refineAbstractTypeTo(IdTy);
- IdTy = llvm::cast<llvm::StructType>(OpaqueObjTy.get());
- IdTy = llvm::PointerType::getUnqual(IdTy);
-
- // Call structure type.
- llvm::PATypeHolder OpaqueSlotTy = llvm::OpaqueType::get();
- CallTy = llvm::StructType::get(
- llvm::PointerType::getUnqual(OpaqueSlotTy),
- SelectorTy,
- IdTy,
- NULL);
- //CallTy = llvm::PointerType::getUnqual(CallTy);
-
- // IMP type
- std::vector<const llvm::Type*> IMPArgs;
- IMPArgs.push_back(IdTy);
- IMPArgs.push_back(llvm::PointerType::getUnqual(CallTy));
- IMPTy = llvm::FunctionType::get(IdTy, IMPArgs, true);
-
- // Slot type
- SlotTy = llvm::StructType::get(IntTy,
- IMPTy,
- PtrToInt8Ty,
- PtrToInt8Ty,
- llvm::Type::Int32Ty,
- NULL);
- llvm::cast<llvm::OpaqueType>(
- OpaqueSlotTy.get())->refineAbstractTypeTo(SlotTy);
- SlotTy = llvm::PointerType::getUnqual(
- llvm::cast<llvm::StructType>(OpaqueSlotTy.get()));
-
- // Lookup function type
- std::vector<const llvm::Type*> LookupFunctionArgs;
- LookupFunctionArgs.push_back(llvm::PointerType::getUnqual(IdTy));
- LookupFunctionArgs.push_back(IdTy);
- LookupFunctionArgs.push_back(SelectorTy);
- LookupFunctionArgs.push_back(IdTy);
- LookupFunctionTy =
- llvm::FunctionType::get(SlotTy, LookupFunctionArgs, false);
- LookupFunctionTy = llvm::PointerType::getUnqual(LookupFunctionTy);
-
-}
-
-/// Looks up the selector for the specified name / type pair.
-llvm::Value *CGObjCEtoile::getSelector(llvm::IRBuilder &Builder,
- llvm::Value *SelName,
- llvm::Value *SelTypes)
-{
- // Look up the selector.
- if(SelTypes == 0) {
- SelTypes = llvm::ConstantPointerNull::get(PtrToInt8Ty);
- }
- llvm::Constant *SelFunction =
- TheModule.getOrInsertFunction("lookup_typed_selector",
- SelectorTy,
- PtrToInt8Ty,
- PtrToInt8Ty,
- NULL);
- return Builder.CreateCall2(SelFunction, SelName, SelTypes);
-}
-
-static void SetField(llvm::IRBuilder &Builder, llvm::Value *Structure,
- unsigned Index, llvm::Value *Value) {
- llvm::Value *element_ptr = Builder.CreateStructGEP(Structure, Index);
- Builder.CreateStore(Value, element_ptr);
-}
-// Generate code for a message send expression on the Etoile runtime.
-// BIG FAT WARNING: Much of this code will need factoring out later.
-llvm::Value *CGObjCEtoile::generateMessageSend(llvm::IRBuilder &Builder,
- const llvm::Type *ReturnTy,
- llvm::Value *Sender,
- llvm::Value *Receiver,
- llvm::Value *Selector,
- llvm::Value** ArgV,
- unsigned ArgC) {
- // FIXME: Selectors should be statically cached, not looked up on every call.
- llvm::Value *cmd = getSelector(Builder, Selector, 0);
- // TODO: [Polymorphic] inline caching
-
- // Get the lookup function for this object:
- llvm::Value *ObjAddr = Builder.CreateBitCast(Receiver, PtrToInt8Ty);
- llvm::Value *FunctionOffset = new llvm::GlobalVariable(llvm::Type::Int32Ty,
- false,
- llvm::GlobalValue::ExternalLinkage,
- 0,
- "lookup_offset",
- &TheModule);
- FunctionOffset = Builder.CreateLoad(FunctionOffset);
- llvm::Value *Tag = Builder.CreateGEP(ObjAddr, FunctionOffset);
- llvm::Value *Lookup = Builder.CreateBitCast(Tag, LookupFunctionTy);
-
- // TODO: Remove this when the caller is providing sensible sender info
- if(Sender == 0) {
- Sender = llvm::ConstantPointerNull::get((llvm::PointerType*)IdTy);
- }
- Receiver = Builder.CreateBitCast(Receiver, IdTy);
- llvm::Value *ReceiverAddr = Builder.CreateAlloca(IdTy);
- Builder.CreateStore(Receiver, ReceiverAddr);
- // Look up the method implementation.
- llvm::SmallVector<llvm::Value*, 4> LookupArgs;
- LookupArgs.push_back(ReceiverAddr);
- LookupArgs.push_back(Receiver);
- LookupArgs.push_back(cmd);
- LookupArgs.push_back(Sender);
- llvm::Value *Slot = Builder.CreateCall(Lookup, LookupArgs.begin(),
- LookupArgs.end());
-
- // Create the call structure
- llvm::Value *Call = Builder.CreateAlloca(CallTy);
- SetField(Builder, Call, 0, Slot);
- SetField(Builder, Call, 1, cmd);
- SetField(Builder, Call, 2, Sender);
-
- // Get the IMP from the slot and call it
- // TODO: Property load / store optimisations
- llvm::Value *IMP = Builder.CreateStructGEP(Slot, 1);
- // If the return type of the IMP is wrong, cast it so it isn't.
- if(ReturnTy != IdTy) {
- std::vector<const llvm::Type*> IMPArgs;
- IMPArgs.push_back(IdTy);
- IMPArgs.push_back(llvm::PointerType::getUnqual(CallTy));
- llvm::Type *NewIMPTy = llvm::FunctionType::get(ReturnTy, IMPArgs, true);
- IMP = Builder.CreateBitCast(IMP, llvm::PointerType::getUnqual(NewIMPTy));
- }
- llvm::SmallVector<llvm::Value*, 16> Args;
- Args.push_back(Receiver);
- Args.push_back(Call);
- Args.insert(Args.end(), ArgV, ArgV+ArgC);
- return Builder.CreateCall(IMP, Args.begin(), Args.end());
-}
-
-/// Generates an LLVM Function object corresponding to the Objective-C method,
-/// including the implicit arguments.
-llvm::Function *CGObjCEtoile::MethodPreamble(
- const std::string &ClassName,
- const std::string &CategoryName,
- const std::string &MethodName,
- const llvm::Type *ReturnTy,
- const llvm::Type *SelfTy,
- const llvm::Type **ArgTy,
- unsigned ArgC,
- bool isClassMethod,
- bool isVarArg) {
- std::vector<const llvm::Type*> Args;
- //Args.push_back(SelfTy);
- Args.push_back(IdTy);
- Args.push_back(llvm::PointerType::getUnqual(CallTy));
- for (unsigned i=0; i<ArgC ; i++) {
- Args.push_back(ArgTy[i]);
- }
- llvm::FunctionType *MethodTy =
- llvm::FunctionType::get(ReturnTy, Args, isVarArg);
- llvm::Function *Method = llvm::Function::Create(MethodTy,
- llvm::GlobalValue::InternalLinkage,
- ".objc.method",
- &TheModule);
- //llvm::BasicBlock *EntryBB = new llvm::BasicBlock("entry", Method);
- // Set the names of the hidden arguments
- llvm::Function::arg_iterator AI = Method->arg_begin();
- AI[0].setName("self");
- AI[1].setName("_call");
- // FIXME: Should create the _cmd variable as _call->selector
- return Method;
-}
-
More information about the cfe-commits
mailing list