Improvements to power-of-ten computations used for text ↔ binary64

conversions.

FossilOrigin-Name: 0780bce854b962fb2d4a1a19c55c9b5790a9669f26e1ff8b5f1f1733cfc647e0

diff --git a/manifest b/manifest
index 59031e860ce177589bd05d1887af8caf6996548c..338b1657972d91843149f917e72af7b86ad4f9d1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\ssimplification\sto\sthe\stext→binary64\sconversion\salgorithm.
-D 2026-02-27T20:37:03.759
+C Improvements\sto\spower-of-ten\scomputations\sused\sfor\stext\s↔\sbinary64\nconversions.
+D 2026-02-27T22:59:46.633
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -803,7 +803,7 @@ F src/trigger.c a40440614bdf523090cc07223f4878f7e3c892bcd1a13afe18f90190daa5945d
 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
-F src/util.c aaa5fbad1bcecdb8a873950aeabfddf47814cbdb258b9c774041a33d7aee739f
+F src/util.c 4769c290c2325d058a65f38a0056da39cbed1ad372c5a7184732ffa779261db6
 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 F src/vdbe.c 5328c99dd256ee8132383565a86e253543a85daccfd7477c52f20bac6b385a7f
 F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9
@@ -2195,8 +2195,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 3fbd28fabc5509a0bf2026cb60891d6d3efe251910baa3a3934225d0a7187bfa
-R 5d85555e5b7026b5225f749aa45ba7e8
+P 6632d51f1673e9a6b6e26baebc7aaa1ae27024ad5db1baff6ee5fcf865099f43
+R 780d0868274477455c94d9f95a020fbe
 U drh
-Z 872a2fa601913fc9cb45b1534ed4798c
+Z e4a510a255d84f66bd7f025adf1138d4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 91c2fbb502962fd29cd88e590b190d5549f52374..59d81d1399147e95ecbe81038866259730533f1f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6632d51f1673e9a6b6e26baebc7aaa1ae27024ad5db1baff6ee5fcf865099f43
+0780bce854b962fb2d4a1a19c55c9b5790a9669f26e1ff8b5f1f1733cfc647e0

diff --git a/src/util.c b/src/util.c
index c56a2795fa7205551b01164d4d1741a81dfbd864..3ba31da98b86b0c2fb0599d3f4f1f699a9ba5166 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -546,28 +546,28 @@ static u64 powerOfTen(int p){
   static const u64 aScale[] = {
     0x8049a4ac0c5811aeLLU, /*  0: 1.0e-351 << 1229 */
     0xcf42894a5dce35eaLLU, /*  1: 1.0e-324 << 1140 */
-    0xa76c582338ed2621LLU, /*  2: 1.0e-297 << 1050 */
+    0xa76c582338ed2622LLU, /*  2: 1.0e-297 << 1050 */
     0x873e4f75e2224e68LLU, /*  3: 1.0e-270 << 960 */
-    0xda7f5bf590966848LLU, /*  4: 1.0e-243 << 871 */
-    0xb080392cc4349decLLU, /*  5: 1.0e-216 << 781 */
+    0xda7f5bf590966849LLU, /*  4: 1.0e-243 << 871 */
+    0xb080392cc4349dedLLU, /*  5: 1.0e-216 << 781 */
     0x8e938662882af53eLLU, /*  6: 1.0e-189 << 691 */
     0xe65829b3046b0afaLLU, /*  7: 1.0e-162 << 602 */
-    0xba121a4650e4ddebLLU, /*  8: 1.0e-135 << 512 */
+    0xba121a4650e4ddecLLU, /*  8: 1.0e-135 << 512 */
     0x964e858c91ba2655LLU, /*  9: 1.0e-108 << 422 */
-    0xf2d56790ab41c2a2LLU, /* 10: 1.0e-81 << 333 */
-    0xc428d05aa4751e4cLLU, /* 11: 1.0e-54 << 243 */
+    0xf2d56790ab41c2a3LLU, /* 10: 1.0e-81 << 333 */
+    0xc428d05aa4751e4dLLU, /* 11: 1.0e-54 << 243 */
     0x9e74d1b791e07e48LLU, /* 12: 1.0e-27 << 153 */
     0x8000000000000000LLU, /* 13: 1.0e+0 << 63 */
     0xcecb8f27f4200f3aLLU, /* 14: 1.0e+27 >> 26 */
-    0xa70c3c40a64e6c51LLU, /* 15: 1.0e+54 >> 116 */
+    0xa70c3c40a64e6c52LLU, /* 15: 1.0e+54 >> 116 */
     0x86f0ac99b4e8dafdLLU, /* 16: 1.0e+81 >> 206 */
-    0xda01ee641a708de9LLU, /* 17: 1.0e+108 >> 295 */
+    0xda01ee641a708deaLLU, /* 17: 1.0e+108 >> 295 */
     0xb01ae745b101e9e4LLU, /* 18: 1.0e+135 >> 385 */
     0x8e41ade9fbebc27dLLU, /* 19: 1.0e+162 >> 475 */
-    0xe5d3ef282a242e81LLU, /* 20: 1.0e+189 >> 564 */
+    0xe5d3ef282a242e82LLU, /* 20: 1.0e+189 >> 564 */
     0xb9a74a0637ce2ee1LLU, /* 21: 1.0e+216 >> 654 */
     0x95f83d0a1fb69cd9LLU, /* 22: 1.0e+243 >> 744 */
-    0xf24a01a73cf2dccfLLU, /* 23: 1.0e+270 >> 833 */
+    0xf24a01a73cf2dcd0LLU, /* 23: 1.0e+270 >> 833 */
     0xc3b8358109e84f07LLU, /* 24: 1.0e+297 >> 923 */
     0x9e19db92b4e31ba9LLU, /* 25: 1.0e+324 >> 1013 */
   };
@@ -594,7 +594,7 @@ static u64 powerOfTen(int p){
   }
   x = sqlite3Multiply128(aBase[n],y);
   if( (U64_BIT(63) & x)==0 ){
-    x <<= 1;
+    x  = (x<<1)|1;
   }
   return x;
 }