Skip to content

Commit 9e340b3

Browse files
papparapaalexrp
authored andcommitted
This commit enables fmax and fmin to differentiate between 0.0 and
-0.0, making it compatible with musl.
1 parent 14ad837 commit 9e340b3

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

lib/compiler_rt/fmax.zig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,24 @@ inline fn generic_fmax(comptime T: type, x: T, y: T) T {
5454
return y;
5555
if (math.isNan(y))
5656
return x;
57+
if (math.signbit(x) != math.signbit(y))
58+
return if (math.signbit(x)) y else x;
5759
return if (x < y) y else x;
5860
}
5961

6062
test "generic_fmax" {
6163
inline for ([_]type{ f32, f64, c_longdouble, f80, f128 }) |T| {
6264
const nan_val = math.nan(T);
65+
const Int = std.meta.Int(.unsigned, @bitSizeOf(T));
6366

6467
try std.testing.expect(math.isNan(generic_fmax(T, nan_val, nan_val)));
6568
try std.testing.expectEqual(@as(T, 1.0), generic_fmax(T, nan_val, 1.0));
6669
try std.testing.expectEqual(@as(T, 1.0), generic_fmax(T, 1.0, nan_val));
6770

6871
try std.testing.expectEqual(@as(T, 10.0), generic_fmax(T, 1.0, 10.0));
6972
try std.testing.expectEqual(@as(T, 1.0), generic_fmax(T, 1.0, -1.0));
73+
74+
try std.testing.expectEqual(@as(Int, @bitCast(@as(T, 0.0))), @as(Int, @bitCast(generic_fmax(T, 0.0, -0.0))));
75+
try std.testing.expectEqual(@as(Int, @bitCast(@as(T, 0.0))), @as(Int, @bitCast(generic_fmax(T, -0.0, 0.0))));
7076
}
7177
}

lib/compiler_rt/fmin.zig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,24 @@ inline fn generic_fmin(comptime T: type, x: T, y: T) T {
5454
return y;
5555
if (math.isNan(y))
5656
return x;
57+
if (math.signbit(x) != math.signbit(y))
58+
return if (math.signbit(x)) x else y;
5759
return if (x < y) x else y;
5860
}
5961

6062
test "generic_fmin" {
6163
inline for ([_]type{ f32, f64, c_longdouble, f80, f128 }) |T| {
6264
const nan_val = math.nan(T);
65+
const Int = std.meta.Int(.unsigned, @bitSizeOf(T));
6366

6467
try std.testing.expect(math.isNan(generic_fmin(T, nan_val, nan_val)));
6568
try std.testing.expectEqual(@as(T, 1.0), generic_fmin(T, nan_val, 1.0));
6669
try std.testing.expectEqual(@as(T, 1.0), generic_fmin(T, 1.0, nan_val));
6770

6871
try std.testing.expectEqual(@as(T, 1.0), generic_fmin(T, 1.0, 10.0));
6972
try std.testing.expectEqual(@as(T, -1.0), generic_fmin(T, 1.0, -1.0));
73+
74+
try std.testing.expectEqual(@as(Int, @bitCast(@as(T, -0.0))), @as(Int, @bitCast(generic_fmin(T, 0.0, -0.0))));
75+
try std.testing.expectEqual(@as(Int, @bitCast(@as(T, -0.0))), @as(Int, @bitCast(generic_fmin(T, -0.0, 0.0))));
7076
}
7177
}

0 commit comments

Comments
 (0)