Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DRAFT: Fix issue #2670, support for extern(Objective-C) #4361

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

DRAFT: Fix issue #2670, support for extern(Objective-C) #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a86151
WIP: Adding base structs
MrcSnm Mar 26, 2023
9c5bd23
Fixed missing pointer in struct array
MrcSnm Mar 26, 2023
ed5119f
Merge fix
MrcSnm Apr 1, 2023
44846fe
Help needed on next step in ObjcClassReferenceExp
MrcSnm Apr 1, 2023
c09aae3
Update on classVarRef
MrcSnm Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 90 additions & 1 deletion gen/objcgen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
//===----------------------------------------------------------------------===//

#include "gen/objcgen.h"

#include "dmd/expression.h"
#include "dmd/identifier.h"
#include "dmd/mtype.h"
#include "dmd/objc.h"
#include "gen/irstate.h"
Expand Down Expand Up @@ -40,6 +41,78 @@ bool objc_isSupported(const llvm::Triple &triple) {
return false;
}

ObjCState::ObjCState(llvm::Module &module) : module(module) {
llvm::LLVMContext &c = module.getContext();
_class_t = llvm::StructType::create(c, "_class_t");
_objc_cache = llvm::StructType::create(c, "_objc_cache");
_class_ro_t = llvm::StructType::create(c, "_class_ro_t");
__method_list_t = llvm::StructType::create(c, "__method_list_t");
_objc_method = llvm::StructType::create(c, "_objc_method");
_objc_protocol_list = llvm::StructType::create(c, "_objc_protocol_list");
_protocol_t = llvm::StructType::create(c, "_protocol_t");
_ivar_t = llvm::StructType::create(c, "_ivar_t");
_ivar_list_t = llvm::StructType::create(c, "_ivar_list_t");
_prop_t = llvm::StructType::create(c, "_prop_t");

_class_t->setBody(
{_class_t->getPointerTo(), _class_t->getPointerTo(),
_objc_cache->getPointerTo(), _class_t->getPointerTo(),
/// i8* (i8*, i8*)**
llvm::FunctionType::get(
llvm::Type::getInt8PtrTy(c),
{llvm::Type::getInt8PtrTy(c), llvm::Type::getInt8PtrTy(c)}, false)
->getPointerTo()
->getPointerTo(),
_class_ro_t->getPointerTo()});

_class_ro_t->setBody(
{llvm::Type::getInt32Ty(c), llvm::Type::getInt32Ty(c),
llvm::Type::getInt32Ty(c), llvm::Type::getInt8PtrTy(c),
llvm::Type::getInt8PtrTy(c), __method_list_t->getPointerTo(),
_objc_protocol_list->getPointerTo(), _ivar_list_t->getPointerTo(),
llvm::Type::getInt8PtrTy(c), _prop_list_t->getPointerTo()});

__method_list_t->setBody({llvm::Type::getInt32Ty(c),
llvm::Type::getInt32Ty(c),
llvm::ArrayType::get(_objc_method, 0)});

_objc_method->setBody({llvm::Type::getInt8PtrTy(c),
llvm::Type::getInt8PtrTy(c),
llvm::Type::getInt8PtrTy(c)});

_objc_protocol_list->setBody(
{llvm::Type::getInt64Ty(c),
llvm::ArrayType::get(_protocol_t->getPointerTo(), 0)});

_protocol_t->setBody({
llvm::Type::getInt8PtrTy(c),
llvm::Type::getInt8PtrTy(c),
_objc_protocol_list->getPointerTo(),
__method_list_t->getPointerTo(),
__method_list_t->getPointerTo(),
__method_list_t->getPointerTo(),
__method_list_t->getPointerTo(),
_prop_list_t->getPointerTo(),
llvm::Type::getInt32Ty(c),
llvm::Type::getInt32Ty(c),
llvm::Type::getInt8PtrTy(c)->getPointerTo(),
llvm::Type::getInt8PtrTy(c),
_prop_list_t->getPointerTo(),
});

_ivar_list_t->setBody({llvm::Type::getInt32Ty(c), llvm::Type::getInt32Ty(c),
llvm::ArrayType::get(_ivar_t, 0)});

_ivar_t->setBody({llvm::Type::getInt64PtrTy(c), llvm::Type::getInt8PtrTy(c),
llvm::Type::getInt8PtrTy(c), llvm::Type::getInt32Ty(c),
llvm::Type::getInt32Ty(c)});

_prop_list_t->setBody({llvm::Type::getInt32Ty(c), llvm::Type::getInt32Ty(c),
llvm::ArrayType::get(_prop_t, 0)});

_prop_t->setBody({llvm::Type::getInt8PtrTy(c), llvm::Type::getInt8PtrTy(c)});
}

LLGlobalVariable *ObjCState::getCStringVar(const char *symbol,
const llvm::StringRef &str,
const char *section) {
Expand Down Expand Up @@ -91,6 +164,22 @@ LLGlobalVariable *ObjCState::getMethVarRef(const ObjcSelector &sel) {
return selref;
}

LLGlobalVariable *ObjCState::classVarRef(const ObjcClassReferenceExp &cre) {
llvm::StringRef s(std::string("OBJC_CLASS_$_")
+ cre.classDeclaration->objc.identifier->toChars());

auto it = methVarRefMap.find(s);
if (it != methVarRefMap.end()) {
return it->second;
}
auto selref = new LLGlobalVariable(module, _class_t, false, LLGlobalValue::ExternalLinkage, llvm::ConstantPointerNull::get(_class_t->getPointerTo()), s);
selref->setSection("__DATA,__objc_classrefs");
methVarRefMap[s] = selref;
retain(selref);

return selref;
}

void ObjCState::retain(LLConstant *sym) {
retainedSymbols.push_back(DtoBitCast(sym, getVoidPtrType()));
}
Expand Down
18 changes: 17 additions & 1 deletion gen/objcgen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include <vector>
#include "llvm/ADT/StringMap.h"
#include "llvm/IR/Type.h"
#include "llvm/IR/DerivedTypes.h"

struct ObjcSelector;
namespace llvm {
Expand All @@ -23,20 +25,33 @@ class GlobalVariable;
class Module;
class Triple;
}
class ObjcClassReferenceExp;

bool objc_isSupported(const llvm::Triple &triple);

// Objective-C state tied to an LLVM module (object file).
class ObjCState {
public:
ObjCState(llvm::Module &module) : module(module) {}
ObjCState(llvm::Module &module);

llvm::GlobalVariable *getMethVarRef(const ObjcSelector &sel);
void finalize();

private:
llvm::Module &module;

llvm::StructType* _class_t;
llvm::StructType* _objc_cache;
llvm::StructType* _class_ro_t;
llvm::StructType* __method_list_t;
llvm::StructType* _objc_method;
llvm::StructType* _objc_protocol_list;
llvm::StructType* _protocol_t;
llvm::StructType* _ivar_list_t;
llvm::StructType* _ivar_t;
llvm::StructType* _prop_list_t;
llvm::StructType* _prop_t;

// symbols that shouldn't be optimized away
std::vector<llvm::Constant *> retainedSymbols;

Expand All @@ -47,6 +62,7 @@ class ObjCState {
const llvm::StringRef &str,
const char *section);
llvm::GlobalVariable *getMethVarName(const llvm::StringRef &name);
llvm::GlobalVariable *classVarRef(const ObjcClassReferenceExp& cre);
void retain(llvm::Constant *sym);

void genImageInfo();
Expand Down
11 changes: 11 additions & 0 deletions gen/toir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,6 +2805,17 @@ class ToElemVisitor : public Visitor {
llvm_unreachable("Unknown TypeidExp argument kind");
}

void visit(ObjcClassReferenceExp *e) override {
IF_LOG Logger::print("ObjcClassReferenceExp::toElem() %s\n", e->toChars());
LOG_SCOPE;

auto name = std::string("OBJC_CLASS_$_") + e->classDeclaration->objc.identifier->toChars();

IF_LOG Logger::print("%s\n", name.data());
// result = DtoLoad(llvm::StructType::get(gIR->context(), "_class_t")->getPointerTo(), name);

}

////////////////////////////////////////////////////////////////////////////////

#define STUB(x) \
Expand Down
Loading