Refactor the uint128 type check to consolidate duplicated rules.

FossilOrigin-Name: 362ef7bc00eea180fb3458bd8887021aed54e321901483edc00ad6b23a33d8e5

diff --git a/manifest b/manifest
index 71d579a36fe0cb06b6ecd72c900e2cb5fe2fb745..e7d5f68cf85b8b97b178d49021d7edbe68aabdc2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Feature\sdetection\sfix\sfor\suint128\son\sRISCV\s32-bit,\sreported\sin\s[forum:f8d1417ce8eb2f22|forum\spost\s2026-04-26T11:41:01Z]\sand\svalidated\sby\sthe\sOP.
-D 2026-04-27T05:55:38.108
+C Refactor\sthe\suint128\stype\scheck\sto\sconsolidate\sduplicated\srules.
+D 2026-04-27T06:48:07.885
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -800,7 +800,7 @@ F src/trigger.c 4bf3bfb3851d165e4404a9f9e69357345f3f7103378c07e07139fdd8aeb7bd20
 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
-F src/util.c 08693f1dc8b3a68be4406543f54b1d068be67bffd7ab00b163ec0b9d1c9d4343
+F src/util.c 7c85ba0cdf97f91b57ec9d45f9852aaa4f61e3b7e7cc36d197ee354ad44cdba2
 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 F src/vdbe.c 1cd55e8171e4e87054de196c3c4747d44b69041b5ec910cf547ae82a85beb3e4
 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 048c969c34eaaf8c203b996e999a7dbc94c47b4959719af9e6625052520f7135
-R 1862e524bc499e0896e9ec49d43e30a9
+P c4a2c20839ef75534d71d928a03ad276bdc488b0baa76c1505f48dc1ff0bcdd1
+R c0dfdd72e7d337007a1f024da0578d08
 U stephan
-Z fb15428ad6361e7b9f8f5cec9eca34d7
+Z df3a4e4daedc9f7f5e24107e4c6864f6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2eb030ec93da575b44b3e6682761df2eaab9e88d..42c0b52aa9f170fddbfa1386d08a311acb087fcf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c4a2c20839ef75534d71d928a03ad276bdc488b0baa76c1505f48dc1ff0bcdd1
+362ef7bc00eea180fb3458bd8887021aed54e321901483edc00ad6b23a33d8e5

diff --git a/src/util.c b/src/util.c
index cada261b18095fbeb740593c7d80f2879e472ab3..03c712836dda8e28aeba8c61641767e8ffdb4bb1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -465,8 +465,11 @@ u8 sqlite3StrIHash(const char *z){
   return h;
 }
 
-#if defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen>32)
-#define SQLITE_RISCV64
+#if !defined(SQLITE_DISABLE_INTRINSIC)               \
+  && (defined(__GNUC__) || defined(__clang__))       \
+  && (defined(__x86_64__) || defined(__aarch64__) || \
+      (defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen>32)))
+#define SQLITE_USE_UINT128
 #endif
 
 /*
@@ -475,9 +478,7 @@ u8 sqlite3StrIHash(const char *z){
 ** 64 bits.
 */
 static u64 sqlite3Multiply128(u64 a, u64 b, u64 *pLo){
-#if (defined(__GNUC__) || defined(__clang__)) \
-  && (defined(__x86_64__) || defined(__aarch64__) || defined(SQLITE_RISCV64)) \
-        && !defined(SQLITE_DISABLE_INTRINSIC)
+#if defined(SQLITE_USE_UINT128)
   __uint128_t r = (__uint128_t)a * b;
   *pLo = (u64)r;
   return (u64)(r>>64);
@@ -511,9 +512,7 @@ static u64 sqlite3Multiply128(u64 a, u64 b, u64 *pLo){
 ** The lower 64 bits of A*B are discarded.
 */
 static u64 sqlite3Multiply160(u64 a, u32 aLo, u64 b, u32 *pLo){
-#if (defined(__GNUC__) || defined(__clang__)) \
-        && (defined(__x86_64__) || defined(__aarch64__) || defined(SQLITE_RISCV64)) \
-        && !defined(SQLITE_DISABLE_INTRINSIC)
+#if defined(SQLITE_USE_UINT128)
   __uint128_t r = (__uint128_t)a * b;
   r += ((__uint128_t)aLo * b) >> 32;
   *pLo = (r>>32)&0xffffffff;
@@ -551,7 +550,7 @@ static u64 sqlite3Multiply160(u64 a, u32 aLo, u64 b, u32 *pLo){
 #endif
 }
 
-#undef SQLITE_RISCV64
+#undef SQLITE_USE_UINT128
 
 /*
 ** Return a u64 with the N-th bit set.