From 69cc9e184657e4ad44bac8e916dc6d3bb998ba10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= Date: Mon, 9 Dec 2024 13:43:00 +0000 Subject: [PATCH] Fix aors macros in longlong.h --- src/longlong.h | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/longlong.h b/src/longlong.h index 0c853be555..0ed4f24ae9 100644 --- a/src/longlong.h +++ b/src/longlong.h @@ -125,26 +125,26 @@ flint_bitcnt_t FLINT_BIT_COUNT(ulong x) # define add_ssssaaaaaaaa(s3, s2, s1, s0, a3, a2, a1, a0, b3, b2, b1, b0) \ do { \ - ulong __u2; \ - add_sssaaaaaa(__u2, s1, s0, (ulong) 0, a1, a0, (ulong) 0, b1, b0); \ + ulong __t3; \ + add_sssaaaaaa(__t3, s1, s0, (ulong) 0, a1, a0, (ulong) 0, b1, b0); \ add_ssaaaa(s3, s2, a3, a2, b3, b2); \ - add_ssaaaa(s3, s2, s3, s2, (ulong) 0, __u2); \ + add_ssaaaa(s3, s2, s3, s2, (ulong) 0, __t3); \ } while (0) #define add_sssssaaaaaaaaaa(s4, s3, s2, s1, s0, a4, a3, a2, a1, a0, b4, b3, b2, b1, b0) \ do { \ - ulong __t0 = 0; \ - add_ssssaaaaaaaa(__t0, s2, s1, s0, (ulong) 0, a2, a1, a0, (ulong) 0, b2, b1, b0); \ + ulong __t4 = 0; \ + add_ssssaaaaaaaa(__t4, s2, s1, s0, (ulong) 0, a2, a1, a0, (ulong) 0, b2, b1, b0); \ add_ssaaaa(s4, s3, a4, a3, b4, b3); \ - add_ssaaaa(s4, s3, s4, s3, (ulong) 0, __t0); \ + add_ssaaaa(s4, s3, s4, s3, (ulong) 0, __t4); \ } while (0) #define add_ssssssaaaaaaaaaaaa(s5, s4, s3, s2, s1, s0, a5, a4, a3, a2, a1, a0, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t1 = 0; \ - add_sssssaaaaaaaaaa(__t1, s3, s2, s1, s0, (ulong) 0, a3, a2, a1, a0, (ulong) 0, b3, b2, b1, b0); \ + ulong __t5 = 0; \ + add_sssssaaaaaaaaaa(__t5, s3, s2, s1, s0, (ulong) 0, a3, a2, a1, a0, (ulong) 0, b3, b2, b1, b0); \ add_ssaaaa(s5, s4, a5, a4, b5, b4); \ - add_ssaaaa(s5, s4, s5, s4, (ulong) 0, __t1); \ + add_ssaaaa(s5, s4, s5, s4, (ulong) 0, __t5); \ } while (0) # define sub_ddmmss(s1, s0, a1, a0, b1, b0) \ @@ -164,26 +164,26 @@ flint_bitcnt_t FLINT_BIT_COUNT(ulong x) #define sub_ddddmmmmssss(s3, s2, s1, s0, a3, a2, a1, a0, b3, b2, b1, b0) \ do { \ - ulong __t1, __u1; \ - sub_dddmmmsss(__t1, s1, s0, (ulong) 0, a1, a0, (ulong) 0, b1, b0); \ - sub_ddmmss(__u1, s2, (ulong) 0, a2, (ulong) 0, b2); \ - sub_ddmmss(s3, s2, (a3) - (b3), s2, -__u1, -__t1); \ + ulong __t3, __t4; \ + sub_dddmmmsss(__t3, s1, s0, (ulong) 0, a1, a0, (ulong) 0, b1, b0); \ + sub_ddmmss(__t4, s2, (ulong) 0, a2, (ulong) 0, b2); \ + sub_ddmmss(s3, s2, (a3) - (b3), s2, -__t4, -__t3); \ } while (0) #define sub_dddddmmmmmsssss(s4, s3, s2, s1, s0, a4, a3, a2, a1, a0, b4, b3, b2, b1, b0) \ do { \ - ulong __t2, __u2; \ - sub_ddddmmmmssss(__t2, s2, s1, s0, (ulong) 0, a2, a1, a0, (ulong) 0, b2, b1, b0); \ - sub_ddmmss(__u2, s3, (ulong) 0, a3, (ulong) 0, b3); \ - sub_ddmmss(s4, s3, (a4) - (b4), s3, -__u2, -__t2); \ + ulong __t5, __t6; \ + sub_ddddmmmmssss(__t5, s2, s1, s0, (ulong) 0, a2, a1, a0, (ulong) 0, b2, b1, b0); \ + sub_ddmmss(__t6, s3, (ulong) 0, a3, (ulong) 0, b3); \ + sub_ddmmss(s4, s3, (a4) - (b4), s3, -__t6, -__t5); \ } while (0) #define sub_ddddddmmmmmmssssss(s5, s4, s3, s2, s1, s0, a5, a4, a3, a2, a1, a0, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t3, __u3; \ - sub_dddddmmmmmsssss(__t3, s3, s2, s1, s0, (ulong) 0, a3, a2, a1, a0, (ulong) 0, b3, b2, b1, b0);\ - sub_ddmmss(__u3, s4, (ulong) 0, a4, (ulong) 0, b4); \ - sub_ddmmss(s5, s4, (a5) - (b5), s4, -__u3, -__t3); \ + ulong __t7, __t8; \ + sub_dddddmmmmmsssss(__t7, s3, s2, s1, s0, (ulong) 0, a3, a2, a1, a0, (ulong) 0, b3, b2, b1, b0);\ + sub_ddmmss(__t8, s4, (ulong) 0, a4, (ulong) 0, b4); \ + sub_ddmmss(s5, s4, (a5) - (b5), s4, -__t8, -__t7); \ } while (0) #endif @@ -193,34 +193,34 @@ flint_bitcnt_t FLINT_BIT_COUNT(ulong x) #define add_sssssssaaaaaaaaaaaaaa(s6, s5, s4, s3, s2, s1, s0, a6, a5, a4, a3, a2, a1, a0, b6, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t2 = 0; \ - add_ssssssaaaaaaaaaaaa(__t2, s4, s3, s2, s1, s0, (ulong) 0, a4, a3, a2, a1, a0, (ulong) 0, b4, b3, b2, b1, b0); \ + ulong __t6 = 0; \ + add_ssssssaaaaaaaaaaaa(__t6, s4, s3, s2, s1, s0, (ulong) 0, a4, a3, a2, a1, a0, (ulong) 0, b4, b3, b2, b1, b0); \ add_ssaaaa(s6, s5, a6, a5, b6, b5); \ - add_ssaaaa(s6, s5, s6, s5, (ulong) 0, __t2); \ + add_ssaaaa(s6, s5, s6, s5, (ulong) 0, __t6); \ } while (0) #define add_ssssssssaaaaaaaaaaaaaaaa(s7, s6, s5, s4, s3, s2, s1, s0, a7, a6, a5, a4, a3, a2, a1, a0, b7, b6, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t3 = 0; \ - add_sssssssaaaaaaaaaaaaaa(__t3, s5, s4, s3, s2, s1, s0, (ulong) 0, a5, a4, a3, a2, a1, a0, (ulong) 0, b5, b4, b3, b2, b1, b0); \ + ulong __t7 = 0; \ + add_sssssssaaaaaaaaaaaaaa(__t7, s5, s4, s3, s2, s1, s0, (ulong) 0, a5, a4, a3, a2, a1, a0, (ulong) 0, b5, b4, b3, b2, b1, b0); \ add_ssaaaa(s7, s6, a7, a6, b7, b6); \ - add_ssaaaa(s7, s6, s7, s6, (ulong) 0, __t3); \ + add_ssaaaa(s7, s6, s7, s6, (ulong) 0, __t7); \ } while (0) #define sub_dddddddmmmmmmmsssssss(s6, s5, s4, s3, s2, s1, s0, a6, a5, a4, a3, a2, a1, a0, b6, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t4, __u4; \ - sub_ddddddmmmmmmssssss(__t4, s4, s3, s2, s1, s0, (ulong) 0, a4, a3, a2, a1, a0, (ulong) 0, b4, b3, b2, b1, b0); \ - sub_ddmmss(__u4, s5, (ulong) 0, a5, (ulong) 0, b5); \ - sub_ddmmss(s6, s5, (a6) - (b6), s5, -__u4, -__t4); \ + ulong __t9, __t10; \ + sub_ddddddmmmmmmssssss(__t9, s4, s3, s2, s1, s0, (ulong) 0, a4, a3, a2, a1, a0, (ulong) 0, b4, b3, b2, b1, b0); \ + sub_ddmmss(__t10, s5, (ulong) 0, a5, (ulong) 0, b5); \ + sub_ddmmss(s6, s5, (a6) - (b6), s5, -__t10, -__t9); \ } while (0) #define sub_ddddddddmmmmmmmmssssssss(s7, s6, s5, s4, s3, s2, s1, s0, a7, a6, a5, a4, a3, a2, a1, a0, b7, b6, b5, b4, b3, b2, b1, b0) \ do { \ - ulong __t5, __u5; \ - sub_dddddddmmmmmmmsssssss(__t5, s5, s4, s3, s2, s1, s0, (ulong) 0, a5, a4, a3, a2, a1, a0, (ulong) 0, b5, b4, b3, b2, b1, b0); \ - sub_ddmmss(__u5, s6, (ulong) 0, a6, (ulong) 0, b6); \ - sub_ddmmss(s7, s6, (a7) - (b7), s6, -__u5, -__t5); \ + ulong __t11, __t12; \ + sub_dddddddmmmmmmmsssssss(__t11, s5, s4, s3, s2, s1, s0, (ulong) 0, a5, a4, a3, a2, a1, a0, (ulong) 0, b5, b4, b3, b2, b1, b0); \ + sub_ddmmss(__t12, s6, (ulong) 0, a6, (ulong) 0, b6); \ + sub_ddmmss(s7, s6, (a7) - (b7), s6, -__t12, -__t11); \ } while (0) #endif