diff options
| author | LemonBoy <thatlemon@gmail.com> | 2020-04-13 12:49:42 +0200 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-04-13 17:35:14 -0400 |
| commit | ce21a784a4bccc66d555b337ebdf98454aaa652f (patch) | |
| tree | ea84e562d1009ae2ee6121fe190760a8d1dd2543 /src/codegen.cpp | |
| parent | cf750a58d517c03b38509d9d3189c7b7af41820d (diff) | |
| download | zig-ce21a784a4bccc66d555b337ebdf98454aaa652f.tar.gz zig-ce21a784a4bccc66d555b337ebdf98454aaa652f.zip | |
stage1: More fixes for BE targets
* Fix packed struct alignment
* Adjust some tests
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 23ab2a130e..1a091584b4 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -7265,7 +7265,8 @@ check: switch (const_val->special) { LLVMTypeRef field_ty = LLVMStructGetTypeAtIndex(get_llvm_type(g, type_entry), (unsigned)type_struct_field->gen_index); const size_t size_in_bytes = LLVMStoreSizeOfType(g->target_data_ref, field_ty); - LLVMTypeRef big_int_type_ref = LLVMIntType(size_in_bytes * 8); + const size_t size_in_bits = size_in_bytes * 8; + LLVMTypeRef big_int_type_ref = LLVMIntType(size_in_bits); LLVMValueRef val = LLVMConstInt(big_int_type_ref, 0, false); size_t used_bits = 0; for (size_t i = src_field_index; i < src_field_index_end; i += 1) { @@ -7278,16 +7279,17 @@ check: switch (const_val->special) { uint32_t packed_bits_size = type_size_bits(g, it_field->type_entry); if (is_big_endian) { LLVMValueRef shift_amt = LLVMConstInt(big_int_type_ref, - packed_bits_size, false); - val = LLVMConstShl(val, shift_amt); - val = LLVMConstOr(val, child_val); + size_in_bits - used_bits - packed_bits_size, false); + LLVMValueRef child_val_shifted = LLVMConstShl(child_val, shift_amt); + val = LLVMConstOr(val, child_val_shifted); } else { LLVMValueRef shift_amt = LLVMConstInt(big_int_type_ref, used_bits, false); LLVMValueRef child_val_shifted = LLVMConstShl(child_val, shift_amt); val = LLVMConstOr(val, child_val_shifted); - used_bits += packed_bits_size; } + used_bits += packed_bits_size; } + assert(size_in_bits >= used_bits); if (LLVMGetTypeKind(field_ty) != LLVMArrayTypeKind) { assert(LLVMGetTypeKind(field_ty) == LLVMIntegerTypeKind); fields[type_struct_field->gen_index] = val; |