speed tweaks and documentation updates (CVS 170)

FossilOrigin-Name: b46f9a317b06bd490bda987e11e24f2c27162370

diff --git a/manifest b/manifest
index 4728936ec2bc418fd93b50801b8dd9e49156870f..1786b4c8623b27dde556a9e67646a6cc28b4de43 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C speed\stweaks\sand\sdocumentation\supdates\s(CVS\s169)
-D 2000-12-10T18:23:51
+C speed\stweaks\sand\sdocumentation\supdates\s(CVS\s170)
+D 2000-12-10T18:35:20
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 0b1fdafa55e1bf4d3a4f5213544130e66ef32052
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -28,7 +28,7 @@ F src/tclsqlite.c 178adf318eab2ff480c288a87541d4ab1c37d985
 F src/tokenize.c 6843f1d7a5d2ee08ceb10bdecfcc8684131ffcf7
 F src/update.c 51b9ef7434b15e31096155da920302e9db0d27fc
 F src/util.c 0298100e6427a4b644f767ede12276fa7170fbb6
-F src/vdbe.c a627f1df4c1eb9194137285e3f55e77ce0506c9b
+F src/vdbe.c 3ddd7e3d17c954fc50afd5e73898371da09ad1c6
 F src/vdbe.h 140cdec3c56f70483e169f8ae657bd90f9fd6e98
 F src/where.c 3dfad2ffd0aa994d5eceac88852f7189c8d1d3c8
 F test/all.test 15cac2f6b2d4c55bf896212aff3cc9d6597b0490
@@ -76,7 +76,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/tclsqlite.tcl 06f81c401f79a04f2c5ebfb97e7c176225c0aef2
 F www/vdbe.tcl 0c8aaa529dd216ccbf7daaabd80985e413d5f9ad
-P af9673d1bff613b93b25fb95dc4cc409314da9f2
-R e96f216bb6081dde097b05975fb0cc41
+P 00c3dfd025f5e66587e23170eddb33112b5e1133
+R c7a71bdb40c0db1def459d2ec0493e1b
 U drh
-Z 8ff5cda94c60b2223245acb96b58f1fe
+Z 503dfd5d9b475fba054ae44bf410e682

diff --git a/manifest.uuid b/manifest.uuid
index ac6249516bb861cb3b24fc1c308e2dbdfe5b3507..2a5b23ab975be8bd441a082680cfdf5b3aa4300b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00c3dfd025f5e66587e23170eddb33112b5e1133
\ No newline at end of file
+b46f9a317b06bd490bda987e11e24f2c27162370
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 2973d85e88403e2e928e8f07eae6d511dba34a93..bfdb65b79b0127c1a644723a6d68d4b2552f04ec 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -41,7 +41,7 @@
 ** But other routines are also provided to help in building up
 ** a program instruction by instruction.
 **
-** $Id: vdbe.c,v 1.48 2000/12/10 18:23:51 drh Exp $
+** $Id: vdbe.c,v 1.49 2000/12/10 18:35:20 drh Exp $
 */
 #include "sqliteInt.h"
 #include <unistd.h>
@@ -1282,8 +1282,8 @@ int sqliteVdbeExec(
               break;
             }
           }
-          PopStack(p, 2);
-          p->tos = nos;
+          POPSTACK;
+          Release(p, nos);
           aStack[nos].i = b;
           aStack[nos].flags = STK_Int;
         }else{
@@ -1471,7 +1471,8 @@ int sqliteVdbeExec(
           case OP_Gt:    c = c>0;      break;
           default:       c = c>=0;     break;
         }
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         if( c ) pc = pOp->p2-1;
         break;
       }
@@ -1499,7 +1500,8 @@ int sqliteVdbeExec(
         Stringify(p, tos);
         Stringify(p, nos);
         c = sqliteLikeCompare(zStack[tos], zStack[nos]);
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         if( pOp->p1 ) c = !c;
         if( c ) pc = pOp->p2-1;
         break;
@@ -1531,7 +1533,8 @@ int sqliteVdbeExec(
         Stringify(p, tos);
         Stringify(p, nos);
         c = sqliteGlobCompare(zStack[tos], zStack[nos]);
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         if( pOp->p1 ) c = !c;
         if( c ) pc = pOp->p2-1;
         break;
@@ -1562,8 +1565,8 @@ int sqliteVdbeExec(
         }else{
           c = aStack[tos].i || aStack[nos].i;
         }
-        PopStack(p, 2);
-        p->tos++;
+        POPSTACK;
+        Release(p, nos);     
         aStack[nos].i = c;
         aStack[nos].flags = STK_Int;
         break;
@@ -2000,7 +2003,8 @@ int sqliteVdbeExec(
           pBe->Put(p->aCsr[i].pCursor, nKey, zKey,
                         aStack[tos].n, zStack[tos]);
         }
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         break;
       }
 
@@ -2296,7 +2300,8 @@ int sqliteVdbeExec(
             }              
           }
         }
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         break;
       }
 
@@ -2348,7 +2353,8 @@ int sqliteVdbeExec(
                           sizeof(int)*nIdx, (char*)aIdx);
           }
         }
-        PopStack(p, 2);
+        POPSTACK;
+        POPSTACK;
         break;
       }