Fix to the previous check-in so that it works on a intel Mac. (CVS 4962)

FossilOrigin-Name: 1d67f41c885d052ab10a33892938a85b56882b3d

diff --git a/manifest b/manifest
index 5f03744f5ab531d146cb0acfecea17554d0cadc8..6120bd6aa5fd001edd838db66106a107aa70783e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\san\simproved\sRDTSC\saccess\sroutine.\s(CVS\s4961)
-D 2008-04-03T19:40:59
+C Fix\sto\sthe\sprevious\scheck-in\sso\sthat\sit\sworks\son\sa\sintel\sMac.\s(CVS\s4962)
+D 2008-04-03T20:09:07
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -174,7 +174,7 @@ F src/update.c 6d5f7728ec254c4a36a06a744f45b232b2eef857
 F src/utf.c 8c94fa10efc78c2568d08d436acc59df4df7191b
 F src/util.c dba9e04121eb17ec4643d6ca231ff859452cf0e2
 F src/vacuum.c 3524411bfb58aac0d87eadd3e5b7cd532772af30
-F src/vdbe.c da3f91d8f663902d85862186de88b18af747baa7
+F src/vdbe.c 66ca98cce0f5776006eb5fcaa95a6d90b341646e
 F src/vdbe.h f72201a0657d5f3d6cc008d1f8d9cc65768518c9
 F src/vdbeInt.h 0b96efdeecb0803e504bf1c16b198f87c91d6019
 F src/vdbeapi.c ab6e99f8a6b7fcb82c2c698da7a36762a7593f0a
@@ -564,9 +564,9 @@ F tool/soak1.tcl 85a4a7826c77351bfe1c005ae3cff2ef59123557
 F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
 F tool/spaceanal.tcl b87db46ae29e3116411b1686e136b9b994d7de39
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
-F tool/speedtest16.c 66d5882728c92ba6ab45c223c5812a473da70fe0
+F tool/speedtest16.c 6f5bc019dcf8b6537f379bbac0408a9e1a86f0b6
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
-F tool/speedtest8.c 608f39682983735bc16c993008c2b6ecfa4c604a
+F tool/speedtest8.c fe5c8aeba4f4d4a0159dadc1c3a0733c1b7e0417
 F www/34to35.tcl 942e479aa7740b55d714dce0f0b2cb6ca91c3f20
 F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf
 F www/arch.gif f845a64772062e82d17980a349f95f1f0b4c8054
@@ -625,7 +625,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 64badc50531668de45d76a3dcd90db17e1fe1ab1
-R 25bc5c99942bd3474afe17471012ea72
+P b4eba9c533f6aac9dde4f2c9796fe02e25158a0f
+R b928b7b813c805f78f77a6bd610c37a8
 U drh
-Z 7ecc5921005df095a20c39986dd214cd
+Z 09c839b1b6e4ed2895567dfe9b019d99

diff --git a/manifest.uuid b/manifest.uuid
index 87b253c024a0ae6fe5256a23a32361508d6590d1..d2d3fa58c0b5890214baefb21894ebc8226c0116 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b4eba9c533f6aac9dde4f2c9796fe02e25158a0f
\ No newline at end of file
+1d67f41c885d052ab10a33892938a85b56882b3d
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index befcef1140c1020dd982fef6dc3b66aba69a05aa..b90ba511a18dfba9302057fa19df631dd7f900ba 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.726 2008/04/03 19:40:59 drh Exp $
+** $Id: vdbe.c,v 1.727 2008/04/03 20:09:07 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -490,9 +490,6 @@ static void registerTrace(FILE *out, int iReg, Mem *p){
 */
 __inline__ unsigned long long int hwtime(void){
    unsigned int lo, hi;
-   __asm__ __volatile__ (      // serialize
-     "xorl %%eax,%%eax \n        cpuid"
-     ::: "%rax", "%rbx", "%rcx", "%rdx");
    /* We cannot use "=A", since this would use %rax on x86_64 */
    __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
    return (unsigned long long int)hi << 32 | lo;

diff --git a/tool/speedtest16.c b/tool/speedtest16.c
index af5de3bbedbc6083911534d2340fb4282c9fe99d..f5190fa5112500ab33b9982e2267ba84ba76da0f 100644 (file)
--- a/tool/speedtest16.c
+++ b/tool/speedtest16.c
@@ -38,9 +38,6 @@
 */
 __inline__ unsigned long long int hwtime(void){
    unsigned int lo, hi;
-   __asm__ __volatile__ (      // serialize
-     "xorl %%eax,%%eax \n        cpuid"
-     ::: "%rax", "%rbx", "%rcx", "%rdx");
    /* We cannot use "=A", since this would use %rax on x86_64 */
    __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
    return (unsigned long long int)hi << 32 | lo;

diff --git a/tool/speedtest8.c b/tool/speedtest8.c
index ffe1953fd87fadd81e921837dd7a5e95412e463a..a48830a8a467fb4307f123c45fbce58e5ea2d10a 100644 (file)
--- a/tool/speedtest8.c
+++ b/tool/speedtest8.c
@@ -37,9 +37,6 @@
 */
 __inline__ unsigned long long int hwtime(void){
    unsigned int lo, hi;
-   __asm__ __volatile__ (      // serialize
-     "xorl %%eax,%%eax \n        cpuid"
-     ::: "%rax", "%rbx", "%rcx", "%rdx");
    /* We cannot use "=A", since this would use %rax on x86_64 */
    __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
    return (unsigned long long int)hi << 32 | lo;