aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrh <>2023-09-14 10:46:50 +0000
committerdrh <>2023-09-14 10:46:50 +0000
commitdc03af67a4427542a34fd64a88a72089c2e192c1 (patch)
tree688dd454730831b3120a00727c2031151c111d65
parent595c3ecc9424edab864dea21d0408114065923e9 (diff)
parent23164c984e9f8fa5b495cc5c797952c33a0e3473 (diff)
downloadsqlite-dc03af67a4427542a34fd64a88a72089c2e192c1.tar.gz
sqlite-dc03af67a4427542a34fd64a88a72089c2e192c1.zip
Do not set the global bUseLongDouble flag based purely on sizeof(long double)
being more than 8. That is a necessary but not sufficient condition to use the long double routines. Instead, do a run-time test to verify that long double really does provide extra precision. FossilOrigin-Name: aa999d490b743f455f2fb6c41009098330380f0bc2e9b1c28fbc82141a9138ce
-rw-r--r--manifest17
-rw-r--r--manifest.uuid2
-rw-r--r--src/main.c34
-rw-r--r--src/vdbeaux.c2
4 files changed, 43 insertions, 12 deletions
diff --git a/manifest b/manifest
index fd46a06a0..5181ab177 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JNI:\senable\sthe\sfts5-customization\sbits\sby\sdefault\sbut\selide\sthem\sfrom\sthe\sdocs\suntil\sit's\sclearer\swhere\sthey're\sheaded.\sUnrelated\sminor\sdoc\stweaks.
-D 2023-09-13T21:32:20.249
+C Do\snot\sset\sthe\sglobal\sbUseLongDouble\sflag\sbased\spurely\son\ssizeof(long\sdouble)\nbeing\smore\sthan\s8.\s\sThat\sis\sa\snecessary\sbut\snot\ssufficient\scondition\sto\suse\nthe\slong\sdouble\sroutines.\s\sInstead,\sdo\sa\srun-time\stest\sto\sverify\sthat\slong\ndouble\sreally\sdoes\sprovide\sextra\sprecision.
+D 2023-09-14T10:46:50.776
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -672,7 +672,7 @@ F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
F src/json.c 51141f1c09ccb177057e5813e6302a5e32e5ba88cc4a756318a35081010fc6df
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
-F src/main.c 3a6f64cb47c605aa8b85de90474f448fc69366cd93ccf46a1276f5ec44c4a110
+F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -783,7 +783,7 @@ F src/vdbe.c 2849053c8625702b324a1553836b5abfcbc1559b4e49187e745dea349fb81685
F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
F src/vdbeapi.c 4184402246172220418c0ef49ff4cf1a19ced9a4ac6c843c2f0773fb5c543f37
-F src/vdbeaux.c e3aa5c46827cd95e0fc4d0f302fa3e901ab5f07258fdbb42709eeef40f63018d
+F src/vdbeaux.c 1b58fc93843b04d3e96d3240e554ed9f23b2e308d3b736f1004fe2eb514a8893
F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
F src/vdbemem.c 317b9f48708139db6239ade40c7980b4bc8233168383690d588dad6d8437f722
F src/vdbesort.c 0d40dca073c94e158ead752ef4225f4fee22dee84145e8c00ca2309afb489015
@@ -2120,8 +2120,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9ea0a9f39d03707d251af5af08d1ba94958704ba74019d7e8823ccd21936023c
-R 15fb56dd0ed96c53b2161c099e5852b9
-U stephan
-Z 08847e36507f621d83fdc14a37bfae39
+P 21adb1aef24398fba918a5e1479ce2b6fd7e86d87eb9f2bea86a0eb43e8809c2 810c635ce063d873e969bf83339c654f6008e84ce8a61f0ffc61806e98d13dde
+R b390e5a75fc36ea63cfccf4d34a2bd01
+T +closed 810c635ce063d873e969bf83339c654f6008e84ce8a61f0ffc61806e98d13dde
+U drh
+Z 76fc386c693b15f15cfeb2b7cb92381f
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f4db41a44..c7ffb9789 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21adb1aef24398fba918a5e1479ce2b6fd7e86d87eb9f2bea86a0eb43e8809c2 \ No newline at end of file
+aa999d490b743f455f2fb6c41009098330380f0bc2e9b1c28fbc82141a9138ce \ No newline at end of file
diff --git a/src/main.c b/src/main.c
index d69ebf75b..a43afab16 100644
--- a/src/main.c
+++ b/src/main.c
@@ -160,6 +160,32 @@ char *sqlite3_temp_directory = 0;
char *sqlite3_data_directory = 0;
/*
+** Determine whether or not high-precision (long double) floating point
+** math works correctly on CPU currently running.
+*/
+static SQLITE_NOINLINE int hasHighPrecisionDouble(int rc){
+ if( sizeof(LONGDOUBLE_TYPE)<=8 ){
+ /* If the size of "long double" is not more than 8, then
+ ** high-precision math is not possible. */
+ return 0;
+ }else{
+ /* Just because sizeof(long double)>8 does not mean that the underlying
+ ** hardware actually supports high-precision floating point. For example,
+ ** clearing the 0x100 bit in the floating-point control word on Intel
+ ** processors will make long double work like double, even though long
+ ** double takes up more space. The only way to determine if long double
+ ** actually works is to run an experiment. */
+ LONGDOUBLE_TYPE a, b, c;
+ rc++;
+ a = 1.0+rc*0.1;
+ b = 1.0e+18+rc*25.0;
+ c = a+b;
+ return b!=c;
+ }
+}
+
+
+/*
** Initialize SQLite.
**
** This routine must be called to initialize the memory allocation,
@@ -354,6 +380,10 @@ int sqlite3_initialize(void){
}
#endif
+ /* Experimentally determine if high-precision floating point is
+ ** available. */
+ sqlite3Config.bUseLongDouble = hasHighPrecisionDouble(rc);
+
return rc;
}
@@ -4554,11 +4584,11 @@ int sqlite3_test_control(int op, ...){
** X<0 Make no changes to the bUseLongDouble. Just report value.
** X==0 Disable bUseLongDouble
** X==1 Enable bUseLongDouble
- ** X==2 Set bUseLongDouble to its default value for this platform
+ ** X>=2 Set bUseLongDouble to its default value for this platform
*/
case SQLITE_TESTCTRL_USELONGDOUBLE: {
int b = va_arg(ap, int);
- if( b==2 ) b = sizeof(LONGDOUBLE_TYPE)>8;
+ if( b>=2 ) b = hasHighPrecisionDouble(b);
if( b>=0 ) sqlite3Config.bUseLongDouble = b>0;
rc = sqlite3Config.bUseLongDouble!=0;
break;
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 225c8d12c..106b8073c 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -4467,7 +4467,7 @@ SQLITE_NOINLINE int sqlite3BlobCompare(const Mem *pB1, const Mem *pB2){
** equal to, or greater than the second (double).
*/
int sqlite3IntFloatCompare(i64 i, double r){
- if( sizeof(LONGDOUBLE_TYPE)>8 ){
+ if( sqlite3Config.bUseLongDouble ){
LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i;
testcase( x<r );
testcase( x>r );