Make use of htonl() and <nowiki>__builtin_bswap32()</nowiki> for faster

implementations of sqlite3Get4byte() and sqlite3Put4byte().

FossilOrigin-Name: bc27ebd7f73e9fc8e00da6ec82632e439fcce812
This commit is contained in:
drh 2015-06-30 12:47:09 +00:00
parent 3169906d06
commit 5372e4d4f9
3 changed files with 31 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C Change\san\sunreachable\sbranch\sinto\san\sassert()\sin\ssqlite3PagerAcquire()\nand\soptimize\ssqlite3PcacheOpenSavepoint()\sby\sfactoring\sout\srarely\sused\scode\ninto\sa\ssubroutine.
D 2015-06-30T11:07:32.245
C Make\suse\sof\shtonl()\sand\s<nowiki>__builtin_bswap32()</nowiki>\sfor\sfaster\nimplementations\sof\ssqlite3Get4byte()\sand\ssqlite3Put4byte().
D 2015-06-30T12:47:09.735
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -388,7 +388,7 @@ F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
F src/util.c a5471ac4834ca3abe9c569745700d3f4dd5f5574
F src/util.c 99396e37038a68073b11bd41b041eace5c1728c2
F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
F src/vdbe.c 5ee4a2bf871418f61d06dc256b9b3a0084b5ec46
F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P d9a0481ce0fd9824b1566f182d68ec46ef091b1b
R 24b6e6de7d9b089958239ab689d72050
P b406b20ecdf0bff63c5c222fab11cb9acee86765
R 52c32250d08365fc3595da7414b917a8
U drh
Z 9400732c29ac033e0975f1d6b596266c
Z a9454dee991519551f365a2fb6736c41

View File

@ -1 +1 @@
b406b20ecdf0bff63c5c222fab11cb9acee86765
bc27ebd7f73e9fc8e00da6ec82632e439fcce812

View File

@ -1078,14 +1078,38 @@ int sqlite3VarintLen(u64 v){
** Read or write a four-byte big-endian integer value.
*/
u32 sqlite3Get4byte(const u8 *p){
#if SQLITE_BYTEORDER==4321
u32 x;
memcpy(&x,p,4);
return x;
#elif defined(_MSC_VER)
u32 x;
memcpy(&x,p,4);
return htonl(x);
#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__)
u32 x;
memcpy(&x,p,4);
return __builtin_bswap32(x);
#else
testcase( p[0]&0x80 );
return ((unsigned)p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
#endif
}
void sqlite3Put4byte(unsigned char *p, u32 v){
#if SQLITE_BYTEORDER==4321
memcpy(p,&v,4);
#elif defined(_MSC_VER)
u32 x = htonl(v);
memcpy(&x,p,4);
#elif SQLITE_BYTEORDER==1234 && defined(__GNUC__)
u32 x = __builtin_bswap32(v);
memcpy(p,&x,4);
#else
p[0] = (u8)(v>>24);
p[1] = (u8)(v>>16);
p[2] = (u8)(v>>8);
p[3] = (u8)v;
#endif
}