authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2023-06-14 01:09:23+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-06-16 13:43:32-07:00
log22c6b6c9a9378aaca75c83c2182a6d94298f6bc2
tree4a6f2361d044abf38b011358f5e4d2d0b12d1b25
parentc4cc796695dddbfba749514823ed29bda37b7bcd

Update zig1.wasm

This is needed in order to remove math.{min,max} from std in favour of the builtins, since the builtins need the behavior fix from the previous commit. Note from Andrew: I updated this commit with zig1.wasm built by me. Signed-off-by: Andrew Kelley <andrew@ziglang.org>

2 files changed, 17 insertions(+), 20 deletions(-)

stage1/zig.h+17-20
......@@ -487,14 +487,14 @@ typedef ptrdiff_t intptr_t;
487487 zig_basic_operator(uint##w##_t, div_floor_u##w, /) \
488488\
489489 static inline int##w##_t zig_div_floor_i##w(int##w##_t lhs, int##w##_t rhs) { \
490 return lhs / rhs - (((lhs ^ rhs) & (lhs % rhs)) < INT##w##_C(0)); \
490 return lhs / rhs + (lhs % rhs != INT##w##_C(0) ? zig_shr_i##w(lhs ^ rhs, UINT8_C(w) - UINT8_C(1)) : INT##w##_C(0)); \
491491 } \
492492\
493493 zig_basic_operator(uint##w##_t, mod_u##w, %) \
494494\
495495 static inline int##w##_t zig_mod_i##w(int##w##_t lhs, int##w##_t rhs) { \
496496 int##w##_t rem = lhs % rhs; \
497 return rem + (((lhs ^ rhs) & rem) < INT##w##_C(0) ? rhs : INT##w##_C(0)); \
497 return rem + (rem != INT##w##_C(0) ? rhs & zig_shr_i##w(lhs ^ rhs, UINT8_C(w) - UINT8_C(1)) : INT##w##_C(0)); \
498498 } \
499499\
500500 static inline uint##w##_t zig_shlw_u##w(uint##w##_t lhs, uint8_t rhs, uint8_t bits) { \
......@@ -1078,7 +1078,7 @@ static inline int64_t zig_bit_reverse_i64(int64_t val, uint8_t bits) {
10781078 uint##w##_t temp = val - ((val >> 1) & (UINT##w##_MAX / 3)); \
10791079 temp = (temp & (UINT##w##_MAX / 5)) + ((temp >> 2) & (UINT##w##_MAX / 5)); \
10801080 temp = (temp + (temp >> 4)) & (UINT##w##_MAX / 17); \
1081 return temp * (UINT##w##_MAX / 255) >> (w - 8); \
1081 return temp * (UINT##w##_MAX / 255) >> (UINT8_C(w) - UINT8_C(8)); \
10821082 } \
10831083\
10841084 zig_builtin_popcount_common(w)
......@@ -1298,15 +1298,6 @@ static inline zig_i128 zig_rem_i128(zig_i128 lhs, zig_i128 rhs) {
12981298 return lhs % rhs;
12991299}
13001300
1301static inline zig_i128 zig_div_floor_i128(zig_i128 lhs, zig_i128 rhs) {
1302 return zig_div_trunc_i128(lhs, rhs) - (((lhs ^ rhs) & zig_rem_i128(lhs, rhs)) < zig_make_i128(0, 0));
1303}
1304
1305static inline zig_i128 zig_mod_i128(zig_i128 lhs, zig_i128 rhs) {
1306 zig_i128 rem = zig_rem_i128(lhs, rhs);
1307 return rem + (((lhs ^ rhs) & rem) < zig_make_i128(0, 0) ? rhs : zig_make_i128(0, 0));
1308}
1309
13101301#else /* zig_has_int128 */
13111302
13121303static inline zig_u128 zig_not_u128(zig_u128 val, uint8_t bits) {
......@@ -1394,20 +1385,26 @@ static zig_i128 zig_rem_i128(zig_i128 lhs, zig_i128 rhs) {
13941385 return __modti3(lhs, rhs);
13951386}
13961387
1397static inline zig_i128 zig_mod_i128(zig_i128 lhs, zig_i128 rhs) {
1398 zig_i128 rem = zig_rem_i128(lhs, rhs);
1399 return zig_add_i128(rem, ((lhs.hi ^ rhs.hi) & rem.hi) < INT64_C(0) ? rhs : zig_make_i128(0, 0));
1400}
1388#endif /* zig_has_int128 */
1389
1390#define zig_div_floor_u128 zig_div_trunc_u128
14011391
14021392static inline zig_i128 zig_div_floor_i128(zig_i128 lhs, zig_i128 rhs) {
1403 return zig_sub_i128(zig_div_trunc_i128(lhs, rhs), zig_make_i128(0, zig_cmp_i128(zig_and_i128(zig_xor_i128(lhs, rhs), zig_rem_i128(lhs, rhs)), zig_make_i128(0, 0)) < INT32_C(0)));
1393 zig_i128 rem = zig_rem_i128(lhs, rhs);
1394 int64_t mask = zig_or_u64((uint64_t)zig_hi_i128(rem), zig_lo_i128(rem)) != UINT64_C(0)
1395 ? zig_shr_i64(zig_xor_i64(zig_hi_i128(lhs), zig_hi_i128(rhs)), UINT8_C(63)) : INT64_C(0);
1396 return zig_add_i128(zig_div_trunc_i128(lhs, rhs), zig_make_i128(mask, (uint64_t)mask));
14041397}
14051398
1406#endif /* zig_has_int128 */
1407
1408#define zig_div_floor_u128 zig_div_trunc_u128
14091399#define zig_mod_u128 zig_rem_u128
14101400
1401static inline zig_i128 zig_mod_i128(zig_i128 lhs, zig_i128 rhs) {
1402 zig_i128 rem = zig_rem_i128(lhs, rhs);
1403 int64_t mask = zig_or_u64((uint64_t)zig_hi_i128(rem), zig_lo_i128(rem)) != UINT64_C(0)
1404 ? zig_shr_i64(zig_xor_i64(zig_hi_i128(lhs), zig_hi_i128(rhs)), UINT8_C(63)) : INT64_C(0);
1405 return zig_add_i128(rem, zig_and_i128(rhs, zig_make_i128(mask, (uint64_t)mask)));
1406}
1407
14111408static inline zig_u128 zig_min_u128(zig_u128 lhs, zig_u128 rhs) {
14121409 return zig_cmp_u128(lhs, rhs) < INT32_C(0) ? lhs : rhs;
14131410}
stage1/zig1.wasm
Binary files a/stage1/zig1.wasm and b/stage1/zig1.wasm differ