arm double to (unsigned) long long conversion

hermantb · hermantb · commit 199e1351426c · 2025-08-17T08:49:29.000+02:00
Bug found with openssl test suite.
diff --git a/lib/armeabi.c b/lib/armeabi.c
@@ -177,7 +177,7 @@ void __aeabi_ ## name(double_unsigned_struct val)                            \
         ret.high = 0;                                                        \
         ret.low = 1 << exp;                                                  \
         if (exp > DOUBLE_FRAC_BITS - 32) {                                   \
-            high_shift = exp - DOUBLE_FRAC_BITS - 32;                        \
+            high_shift = exp - (DOUBLE_FRAC_BITS - 32);                      \
             ret.low |= val.high << high_shift;                               \
             ret.low |= val.low >> (32 - high_shift);                         \
         } else                                                               \
diff --git a/tests/tests2/111_conversion.c b/tests/tests2/111_conversion.c
@@ -14,9 +14,11 @@ conv (union u *p)
 int main (void)
 {
     union u v;
+    double d = 1234567890.0;
 
     v.ld = 42;
     conv (&v);
     printf ("%lu\n", v.ul);
+    printf ("%llu\n", (unsigned long long)d);
     return 0;
 }
diff --git a/tests/tests2/111_conversion.expect b/tests/tests2/111_conversion.expect
@@ -1 +1,2 @@
 42
+1234567890

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,11 @@ conv (union u *p)`
`14`	`14`	`int main (void)`
`15`	`15`	`{`
`16`	`16`	`union u v;`
	`17`	`+ double d = 1234567890.0;`
`17`	`18`
`18`	`19`	`v.ld = 42;`
`19`	`20`	`conv (&v);`
`20`	`21`	`printf ("%lu\n", v.ul);`
	`22`	`+ printf ("%llu\n", (unsigned long long)d);`
`21`	`23`	`return 0;`
`22`	`24`	`}`