motiejus/zig
1
Fork 0
Code Releases Activity

Builder: fix enough bugs to pass the behavior tests

Browse Source 
without using any information from the LLVM API
This commit is contained in:
Jacob Young
2023-08-07 23:50:40 -04:00
parent a66cd54f94
commit 2499d8fb73
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/codegen/llvm.zig
View File

@@ -6243,7 +6243,7 @@ pub const FuncGen = struct {
if (elem_ptr.ptrInfo(mod).flags.vector_index != .none) return base_ptr;
const llvm_elem_ty = try o.lowerPtrElemTy(elem_ty);
return try self.wip.gep(.inbounds, llvm_elem_ty, base_ptr, if (ptr_ty.isSinglePointer(mod))
return self.wip.gep(.inbounds, llvm_elem_ty, base_ptr, if (ptr_ty.isSinglePointer(mod))
// If this is a single-item pointer to an array, we need another index in the GEP.
&.{ try o.builder.intValue(try o.lowerType(Type.usize), 0), rhs }
else
@@ -10532,7 +10532,7 @@ pub const FuncGen = struct {
else => unreachable,
};
return try fg.wip.callAsm(
return fg.wip.callAsm(
.none,
try o.builder.fnType(llvm_usize, &.{ llvm_usize, llvm_usize }, .normal),
.{ .sideeffect = true },

45
src/codegen/llvm/Builder.zig
View File

@@ -5723,7 +5723,16 @@ pub const WipFunction = struct {
.void => null,
else => name,
}, .{
.tag = .call,
.tag = switch (kind) {
.normal => .call,
.fast => .@"call fast",
.musttail => .@"musttail call",
.musttail_fast => .@"musttail call fast",
.notail => .@"notail call",
.notail_fast => .@"notail call fast",
.tail => .@"tail call",
.tail_fast => .@"tail call fast",
},
.data = self.addExtraAssumeCapacity(Instruction.Call{
.info = .{ .call_conv = call_conv },
.attributes = function_attributes,
@@ -7312,9 +7321,34 @@ pub const Constant = enum(u32) {
.bfloat => 16,
else => unreachable,
} }),
.float => try writer.print("0x{X:0>16}", .{
@as(u64, @bitCast(@as(f64, @as(f32, @bitCast(item.data))))),
}),
.float => {
const Float = struct {
fn Repr(comptime T: type) type {
return packed struct(std.meta.Int(.unsigned, @bitSizeOf(T))) {
mantissa: std.meta.Int(.unsigned, std.math.floatMantissaBits(T)),
exponent: std.meta.Int(.unsigned, std.math.floatExponentBits(T)),
sign: u1,
};
}
};
const Exponent32 = std.meta.FieldType(Float.Repr(f32), .exponent);
const Exponent64 = std.meta.FieldType(Float.Repr(f64), .exponent);
const repr: Float.Repr(f32) = @bitCast(item.data);
try writer.print("0x{X:0>16}", .{@as(u64, @bitCast(Float.Repr(f64){
.mantissa = std.math.shl(
std.meta.FieldType(Float.Repr(f64), .mantissa),
repr.mantissa,
std.math.floatMantissaBits(f64) - std.math.floatMantissaBits(f32),
),
.exponent = switch (repr.exponent) {
std.math.minInt(Exponent32) => std.math.minInt(Exponent64),
else => @as(Exponent64, repr.exponent) +
(std.math.floatExponentMax(f64) - std.math.floatExponentMax(f32)),
std.math.maxInt(Exponent32) => std.math.maxInt(Exponent64),
},
.sign = repr.sign,
}))});
},
.double => {
const extra = data.builder.constantExtraData(Double, item.data);
try writer.print("0x{X:0>8}{X:0>8}", .{ extra.hi, extra.lo });
@@ -8361,6 +8395,7 @@ pub fn getIntrinsic(
var overload_index: usize = 0;
function_attributes[FunctionAttributes.function_index] = try attributes.get(signature.attrs);
function_attributes[FunctionAttributes.return_index] = .none; // needed for void return
for (0.., param_types, signature.params) |param_index, *param_type, signature_param| {
switch (signature_param.kind) {
.type => |ty| param_type.* = ty,
@@ -9573,7 +9608,7 @@ fn fnTypeAssumeCapacity(
gop.key_ptr.* = {};
gop.value_ptr.* = {};
self.type_items.appendAssumeCapacity(.{
.tag = .function,
.tag = tag,
.data = self.addTypeExtraAssumeCapacity(Type.Function{
.ret = ret,
.params_len = @intCast(params.len),