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

Correct ABI for windows with LLVM

Browse Source
This commit is contained in:
gingerBill
2021-10-02 18:12:34 +01:00
parent 81fe50d623
commit 036fa5cb24
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_abi.cpp
+3 -3
View File
@@ -239,7 +239,7 @@ i64 lb_alignof(LLVMTypeRef type) {
case LLVMIntegerTypeKind: case LLVMIntegerTypeKind:
{ {
unsigned w = LLVMGetIntTypeWidth(type); unsigned w = LLVMGetIntTypeWidth(type);
return gb_clamp((w + 7)/8, 1, build_context.max_align); return gb_clamp((w + 7)/8, 1, build_context.word_size);
} }
case LLVMHalfTypeKind: case LLVMHalfTypeKind:
return 2; return 2;
@@ -342,7 +342,7 @@ namespace lbAbi386 {
LLVMTypeRef t = arg_types[i]; LLVMTypeRef t = arg_types[i];
LLVMTypeKind kind = LLVMGetTypeKind(t); LLVMTypeKind kind = LLVMGetTypeKind(t);
i64 sz = lb_sizeof(t); i64 sz = lb_sizeof(t);
if (kind == LLVMStructTypeKind) { if (kind == LLVMStructTypeKind || kind == LLVMArrayTypeKind) {
if (sz == 0) { if (sz == 0) {
args[i] = lb_arg_type_ignore(t); args[i] = lb_arg_type_ignore(t);
} else { } else {
@@ -392,7 +392,7 @@ namespace lbAbiAmd64Win64 {
for (unsigned i = 0; i < arg_count; i++) { for (unsigned i = 0; i < arg_count; i++) {
LLVMTypeRef t = arg_types[i]; LLVMTypeRef t = arg_types[i];
LLVMTypeKind kind = LLVMGetTypeKind(t); LLVMTypeKind kind = LLVMGetTypeKind(t);
if (kind == LLVMStructTypeKind) { if (kind == LLVMStructTypeKind || kind == LLVMArrayTypeKind) {
i64 sz = lb_sizeof(t); i64 sz = lb_sizeof(t);
switch (sz) { switch (sz) {
case 1: case 1:
src/llvm_backend_general.cpp
+2
View File
@@ -1736,10 +1736,12 @@ LLVMTypeRef lb_type_internal(lbModule *m, Type *type) {
LLVMTypeRef struct_type = LLVMStructTypeInContext(ctx, fields.data, cast(unsigned)fields.count, type->Struct.is_packed); LLVMTypeRef struct_type = LLVMStructTypeInContext(ctx, fields.data, cast(unsigned)fields.count, type->Struct.is_packed);
map_set(&m->struct_field_remapping, hash_pointer(struct_type), field_remapping); map_set(&m->struct_field_remapping, hash_pointer(struct_type), field_remapping);
map_set(&m->struct_field_remapping, hash_pointer(type), field_remapping); map_set(&m->struct_field_remapping, hash_pointer(type), field_remapping);
#if 0
GB_ASSERT_MSG(lb_sizeof(struct_type) == full_type_size, GB_ASSERT_MSG(lb_sizeof(struct_type) == full_type_size,
"(%lld) %s vs (%lld) %s", "(%lld) %s vs (%lld) %s",
cast(long long)lb_sizeof(struct_type), LLVMPrintTypeToString(struct_type), cast(long long)lb_sizeof(struct_type), LLVMPrintTypeToString(struct_type),
cast(long long)full_type_size, type_to_string(type)); cast(long long)full_type_size, type_to_string(type));
#endif
return struct_type; return struct_type;
} }
break; break;