From 775e4b7073e5c5c9c2fd6247112d7877541c77ca Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 14 Feb 2026 21:31:31 +0000 Subject: [PATCH] Fix to the generic version of the 128-bit multiple subroutine. FossilOrigin-Name: 9c3d09ee75beb26447161c0bf5ea252520a6ec051774f1a4e9f18204281d504f --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/util.c | 22 ++++++++++------------ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index a9a9ebd545..79d264e866 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Another\sminor\sperformance\srefinement. -D 2026-02-14T20:48:58.637 +C Fix\sto\sthe\sgeneric\sversion\sof\sthe\s128-bit\smultiple\ssubroutine. +D 2026-02-14T21:31:31.986 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 cb894db98083c68c4a17c72566ed39434aa91286db20d2891279ee49e6bfec0c F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165 -F src/util.c dcb787b77edcaf0f89b64e565d54a5edb209542e58a9486011ea4c02b6c6c429 +F src/util.c 7a7c52c4a5a5df105fd1241d93a775089f912f385eb3487c7b0d596f9ce2c7d2 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82 F src/vdbe.c fa28a8f740f3d94c4e6b6d42ba90c220472683486268e753017512a70ef715f5 F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9 @@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 93fdee20021b8cc2a113ea042fedbccd8b53b6aceeeb34c0810e6d3a5f106f07 -R 18d39bc4715509a368296882a035272e +P 9d3a12d3926d55efffdc84bff342bd1dbccd08426104aeb2d339b064bf6f02f4 +R b8f25725ba219a819a702d1e3e67df67 U drh -Z b2a09b8ec1a49f705731dfc617a2c1b1 +Z 27cc9fc5582f41e3830c232fedfd6c40 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c15c2cda97..bdcb0bb63a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9d3a12d3926d55efffdc84bff342bd1dbccd08426104aeb2d339b064bf6f02f4 +9c3d09ee75beb26447161c0bf5ea252520a6ec051774f1a4e9f18204281d504f diff --git a/src/util.c b/src/util.c index c87f120b2e..68d9471e6e 100644 --- a/src/util.c +++ b/src/util.c @@ -1188,18 +1188,16 @@ static u64 sqlite3Multiply128(u64 a, u64 b){ #elif defined(_MSC_VER) && defined(_M_X64) return __umulh(a, b); #else - u32 a1 = (u32)a; - u32 a2 = a >> 32; - u32 b1 = (u32)b; - u32 b2 = b >> 32; - u32 p0 = a1 * b1; - u32 p1 = a1 * b2; - u32 p2 = a2 * b1; - u32 p3 = a2 * b2; - u32 mid = p1 + (p0 >> 32); - mid += p2; - u32 carry = (mid < p2) ? 1 : 0; - return p3 + (mid >> 32) + carry; + u64 a1 = (u32)a; + u64 a2 = a >> 32; + u64 b1 = (u32)b; + u64 b2 = b >> 32; + u64 p0 = a1 * b1; + u64 p1 = a1 * b2; + u64 p2 = a2 * b1; + u64 p3 = a2 * b2; + u64 carry = ((p0 >> 32) + (u32)p1 + (u32)p2) >> 32; + return p3 + (p1 >> 32) + (p2 >> 32) + carry; #endif } -- 2.47.3