From 1fa85a15df681cd1ed0f8f93ebe248a4e92620e4 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 3 Dec 2013 22:32:48 +0000 Subject: [PATCH 1/5] Add memory subsystem related defines to the compile-time options list. FossilOrigin-Name: 52a44146dd7c5a7662545042045e23deab302c96 --- manifest | 17 ++++++++++------- manifest.uuid | 2 +- src/ctime.c | 6 ++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index aceb0f89c8..81c7f73bd7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\sbranch\sin\sSTAT4\slogic\sthat\sis\sno\slonger\sreachable\safter\s\nthe\sprevious\schange. -D 2013-12-03T19:49:55.482 +C Add\smemory\ssubsystem\srelated\sdefines\sto\sthe\scompile-time\soptions\slist. +D 2013-12-03T22:32:48.485 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -172,7 +172,7 @@ F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0 F src/build.c 1965c7b596ca6295b7ca59541ad186c57564b8f7 F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac -F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c +F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd F src/date.c 593c744b2623971e45affd0bde347631bdfa4625 F src/delete.c b36db1f79ee50eaca979660c9dd36437f5410b93 F src/expr.c 31a2b65339f6c3795d4cfa5e99798cd72f9fdfdf @@ -1145,7 +1145,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 33ad4f91477907b7b3e5808c7ba11aacc9a83ba6 -R b9a8385eb7153992ed9d3229f4d58e8a -U drh -Z 1abf6c68d7a5a613f293f6a4e7a65cb6 +P eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6 +R 532b42dc23159f7eb49f2139c4b28b74 +T *branch * memTests +T *sym-memTests * +T -sym-trunk * +U mistachkin +Z 95952b1fd2b9669de1eabdf9cc1c4e34 diff --git a/manifest.uuid b/manifest.uuid index 33fe443f15..08e424e306 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6 \ No newline at end of file +52a44146dd7c5a7662545042045e23deab302c96 \ No newline at end of file diff --git a/src/ctime.c b/src/ctime.c index 7c915d58c6..c863cbed50 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -347,6 +347,9 @@ static const char * const azCompileOpt[] = { #ifdef SQLITE_SOUNDEX "SOUNDEX", #endif +#ifdef SQLITE_SYSTEM_MALLOC + "SYSTEM_MALLOC", +#endif #ifdef SQLITE_TCL "TCL", #endif @@ -362,6 +365,9 @@ static const char * const azCompileOpt[] = { #ifdef SQLITE_USE_ALLOCA "USE_ALLOCA", #endif +#ifdef SQLITE_WIN32_MALLOC + "WIN32_MALLOC", +#endif #ifdef SQLITE_ZERO_MALLOC "ZERO_MALLOC" #endif From 3f9cd2ae75e9d992179ef1de0b00c95e719a764f Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 3 Dec 2013 22:33:35 +0000 Subject: [PATCH 2/5] Fix harmless compiler warnings. FossilOrigin-Name: a12d214ecccc5d3372dbcedc88705b0092363971 --- manifest | 15 ++++++--------- manifest.uuid | 2 +- src/mem5.c | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 81c7f73bd7..27c9a6e154 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\smemory\ssubsystem\srelated\sdefines\sto\sthe\scompile-time\soptions\slist. -D 2013-12-03T22:32:48.485 +C Fix\sharmless\scompiler\swarnings. +D 2013-12-03T22:33:35.657 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -194,7 +194,7 @@ F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 -F src/mem5.c 2221f7e4619619d2df16fcb8a1da2a165ae56d9d +F src/mem5.c 19d9271cb936742707b6118ed44d779657c7c511 F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785 F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea @@ -1145,10 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6 -R 532b42dc23159f7eb49f2139c4b28b74 -T *branch * memTests -T *sym-memTests * -T -sym-trunk * +P 52a44146dd7c5a7662545042045e23deab302c96 +R 2b3d133e432ced9c3134bb1e5c9a52ed U mistachkin -Z 95952b1fd2b9669de1eabdf9cc1c4e34 +Z c9f1aceb76bb9affc6fd3e7a6bcd7640 diff --git a/manifest.uuid b/manifest.uuid index 08e424e306..f54177f7c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -52a44146dd7c5a7662545042045e23deab302c96 \ No newline at end of file +a12d214ecccc5d3372dbcedc88705b0092363971 \ No newline at end of file diff --git a/src/mem5.c b/src/mem5.c index 3870e91488..4674ec68f5 100644 --- a/src/mem5.c +++ b/src/mem5.c @@ -202,7 +202,7 @@ static void memsys5Leave(void){ static int memsys5Size(void *p){ int iSize = 0; if( p ){ - int i = ((u8 *)p-mem5.zPool)/mem5.szAtom; + int i = (int)(((u8 *)p-mem5.zPool)/mem5.szAtom); assert( i>=0 && i=0 && iBlock Date: Tue, 3 Dec 2013 23:33:29 +0000 Subject: [PATCH 3/5] Make use of the CC nmake macro even when cross-compiling (with MSVC). FossilOrigin-Name: aae7b30ebd9601882a02fe8cf46fbf0390ec3fac --- Makefile.msc | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index 437cb0eac3..34059ea2f3 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -162,7 +162,7 @@ RC = rc.exe !IFDEF NCC NCC = $(NCC:\\=\) !ELSEIF $(XCOMPILE)!=0 -NCC = "$(VCINSTALLDIR)\bin\cl.exe" +NCC = "$(VCINSTALLDIR)\bin\$(CC)" NCC = $(NCC:\\=\) !ELSE NCC = $(CC) diff --git a/manifest b/manifest index 27c9a6e154..ce20ef4e04 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Fix\sharmless\scompiler\swarnings. -D 2013-12-03T22:33:35.657 +C Make\suse\sof\sthe\sCC\snmake\smacro\seven\swhen\scross-compiling\s(with\sMSVC). +D 2013-12-03T23:33:29.475 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc a6247094079f3ef97dcd7a69d0e13ff718c7073e +F Makefile.msc bb1f271c8ee9773489c89be00f3f8ad7ed7ae8e0 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59 @@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 52a44146dd7c5a7662545042045e23deab302c96 -R 2b3d133e432ced9c3134bb1e5c9a52ed +P a12d214ecccc5d3372dbcedc88705b0092363971 +R 96895a4eb8660c34d34f5a43c1d0b764 U mistachkin -Z c9f1aceb76bb9affc6fd3e7a6bcd7640 +Z 57ab0c18bcd1f41d722261f64b89de43 diff --git a/manifest.uuid b/manifest.uuid index f54177f7c8..ce4e0f7069 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a12d214ecccc5d3372dbcedc88705b0092363971 \ No newline at end of file +aae7b30ebd9601882a02fe8cf46fbf0390ec3fac \ No newline at end of file From 47676fedf640e2433bde647a6c3343fa2e3a64c0 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 5 Dec 2013 16:41:55 +0000 Subject: [PATCH 4/5] Fix two potential (and apparently harmless) shift overflows discovered by the -fcatch-undefined-behavior option of clang. FossilOrigin-Name: e19eead8c9977ed4f00eac54c5bc7e90db78caa8 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_unix.c | 2 +- src/util.c | 4 +++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index aceb0f89c8..3b88511979 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\sbranch\sin\sSTAT4\slogic\sthat\sis\sno\slonger\sreachable\safter\s\nthe\sprevious\schange. -D 2013-12-03T19:49:55.482 +C Fix\stwo\spotential\s(and\sapparently\sharmless)\sshift\soverflows\sdiscovered\sby\nthe\s-fcatch-undefined-behavior\soption\sof\sclang. +D 2013-12-05T16:41:55.583 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -205,7 +205,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 -F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9 +F src/os_unix.c f076587029285554a3a65d30d0e71d50cd61f41f F src/os_win.c 4323dd0bac4f7a7037fc4cf87fb4692d17f0b108 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c @@ -278,7 +278,7 @@ F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4 F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba F src/update.c d1c2477dcf14d90999d1935af4efb4806553250b F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 -F src/util.c c1d47254d805074226eb68bab2327f2559799d88 +F src/util.c 76ed0519296e3f62e97e57dab1999e34184c8e49 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 F src/vdbe.c 54894fde8dc806d259e015ac7c9680145e725835 F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644 @@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 33ad4f91477907b7b3e5808c7ba11aacc9a83ba6 -R b9a8385eb7153992ed9d3229f4d58e8a +P eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6 +R ba7aebdef816e4dde9f2f30108dfb7a9 U drh -Z 1abf6c68d7a5a613f293f6a4e7a65cb6 +Z d225deef3eea562cd29618981c6f7c47 diff --git a/manifest.uuid b/manifest.uuid index 33fe443f15..7d458eb325 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6 \ No newline at end of file +e19eead8c9977ed4f00eac54c5bc7e90db78caa8 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 501b1b769d..ab657dc7bd 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4081,7 +4081,7 @@ static int unixShmSystemLock( #ifdef SQLITE_DEBUG { u16 mask; OSTRACE(("SHM-LOCK ")); - mask = (1<<(ofst+n)) - (1<31 ? 0xffffffff : (1<<(ofst+n)) - (1<=5 ) n -= 2; else if( n>=1 ) n -= 1; - if( x>=3 ) return (n+8)<<(x-3); + if( x>=3 ){ + return x>60 ? (u64)LARGEST_INT64 : (n+8)<<(x-3); + } return (n+8)>>(3-x); } From 6f04b95f02eeb62bcf3901d6d4483bdf68c000ee Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 6 Dec 2013 14:53:30 +0000 Subject: [PATCH 5/5] Version 3.8.2 FossilOrigin-Name: 27392118af4c38c5203a04b8013e1afdb1cebd0d --- manifest | 14 ++++++++------ manifest.uuid | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index ac8e7ab09e..264b3fc190 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\scompiler\swarnings\sand\simprove\sthe\sMSVC\smakefile. -D 2013-12-05T17:12:47.544 +C Version\s3.8.2 +D 2013-12-06T14:53:30.888 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1145,8 +1145,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P e19eead8c9977ed4f00eac54c5bc7e90db78caa8 aae7b30ebd9601882a02fe8cf46fbf0390ec3fac +P c632567063d81c4be404ce58cbac0eff7412f565 R 39f74301df16683d1c19ab7ca83b6451 -T +closed aae7b30ebd9601882a02fe8cf46fbf0390ec3fac -U drh -Z b21886c5e68a29fa7489a30bb0f632c3 +T +bgcolor * #d0c0ff +T +sym-release * +T +sym-version-3.8.2 * +U dan +Z bddf39b758268961698f9899546a37dd diff --git a/manifest.uuid b/manifest.uuid index 047c9ce824..5097db9159 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c632567063d81c4be404ce58cbac0eff7412f565 \ No newline at end of file +27392118af4c38c5203a04b8013e1afdb1cebd0d \ No newline at end of file