ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix foreign import dependencies; Fix lbParamPass_Integer ABI

Browse Source
This commit is contained in:
gingerBill
2020-03-08 17:57:46 +00:00
parent dae817e5ab
commit 5a02ebe2c8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+9 -3
View File
@@ -1137,8 +1137,8 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity) {
p->body = pl->body; p->body = pl->body;
p->tags = pt->Proc.tags; p->tags = pt->Proc.tags;
p->inlining = ProcInlining_none; p->inlining = ProcInlining_none;
p->is_foreign = false; p->is_foreign = entity->Procedure.is_foreign;
p->is_export = false; p->is_export = entity->Procedure.is_export;
p->is_entry_point = false; p->is_entry_point = false;
gbAllocator a = heap_allocator(); gbAllocator a = heap_allocator();
@@ -1206,6 +1206,12 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity) {
lb_add_proc_attribute_at_index(p, offset+parameter_index, "nocapture"); lb_add_proc_attribute_at_index(p, offset+parameter_index, "nocapture");
} }
if (entity->Procedure.is_foreign) {
lb_add_foreign_library_path(p->module, entity->Procedure.foreign_library);
}
{ // Debug Information { // Debug Information
unsigned line = cast(unsigned)entity->token.pos.line; unsigned line = cast(unsigned)entity->token.pos.line;
@@ -1379,7 +1385,7 @@ lbValue lb_add_param(lbProcedure *p, Entity *e, Ast *expr, Type *abi_type, i32 i
case lbParamPass_Integer: { case lbParamPass_Integer: {
lbAddr l = lb_add_local(p, e->type, e, false, index); lbAddr l = lb_add_local(p, e->type, e, false, index);
lbValue iptr = lb_emit_conv(p, l.addr, alloc_type_pointer(p->type)); lbValue iptr = lb_emit_conv(p, l.addr, alloc_type_pointer(abi_type));
lb_emit_store(p, iptr, v); lb_emit_store(p, iptr, v);
return lb_addr_load(p, l); return lb_addr_load(p, l);
} }
src/llvm_backend.hpp
+1
View File
@@ -279,6 +279,7 @@ void lb_push_context_onto_stack(lbProcedure *p, lbAddr ctx);
lbAddr lb_add_global_generated(lbModule *m, Type *type, lbValue value={}); lbAddr lb_add_global_generated(lbModule *m, Type *type, lbValue value={});
lbAddr lb_add_local(lbProcedure *p, Type *type, Entity *e=nullptr, bool zero_init=true, i32 param_index=0); lbAddr lb_add_local(lbProcedure *p, Type *type, Entity *e=nullptr, bool zero_init=true, i32 param_index=0);
void lb_add_foreign_library_path(lbModule *m, Entity *e);
lbValue lb_typeid(lbModule *m, Type *type, Type *typeid_type=t_typeid); lbValue lb_typeid(lbModule *m, Type *type, Type *typeid_type=t_typeid);