Modify OP_VUpdate to read arguments from a range of memory cells instead of from...

FossilOrigin-Name: 955b15a020e9ea6401fe03a36f5139a03ea80b8a

diff --git a/manifest b/manifest
index abe6dfbab9743e0231552c3326a61d9a6d94b2a9..8f5963846cb7322a1ae57ec3f113f8dd1d9fa9be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sVdbeOp.p4\sunion\sto\sinclude\sspecific\spointer\stypes\sfor\sthe\svarious\svalues\sof\sVdbeOp.p4type.\s(CVS\s4667)
-D 2008-01-03T11:50:30
+C Modify\sOP_VUpdate\sto\sread\sarguments\sfrom\sa\srange\sof\smemory\scells\sinstead\sof\sfrom\sthe\sstack.\s(CVS\s4668)
+D 2008-01-03T17:31:45
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -90,13 +90,13 @@ F src/build.c 11cd1e6a6425893662edcdf4b39abe02a1fb2ecb
 F src/callback.c 77b302b0d41468dcda78c70e706e5b84577f0fa0
 F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131
 F src/date.c 49c5a6d2de6c12000905b4d36868b07d3011bbf6
-F src/delete.c 16389863bf16fdbec6810d6b44b9236fdbf4e567
+F src/delete.c 1fa15280738943907cb1c5f2b9d5506bf84a9915
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 24202e79a92c8b9b0b5a609d03051ff3d91e5bf4
 F src/func.c 996071cf0af9d967e58b69fce1909555059ebc7d
 F src/hash.c 45a7005aac044b6c86bd7e49c44bc15d30006d6c
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
-F src/insert.c b952904a7783c9f3929fb6ea94c279051eb35cb5
+F src/insert.c b5e3def19f5a21a9e916b25a41ce78eaf8b0966d
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c 4ac53191fad2e3c4d59bde1228879b2dc5a96d66
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
@@ -136,7 +136,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 5391e889384d2062249f668110d64ed16f601c4b
 F src/sqlite.h.in 2a7e3776534bbe6ff2cdc058f3abebe91e7e429f
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
-F src/sqliteInt.h 84c6525e3a082b7c30f8a07e562ea25a62f88ed0
+F src/sqliteInt.h 44c2d9976f42bf088ada24a06bbfb174e720a74e
 F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e
 F src/table.c 1aeb9eab57b4235db86fe15a35dec76fb445a9c4
 F src/tclsqlite.c 9923abeffc9b3d7dad58e92b319661521f60debf
@@ -164,11 +164,11 @@ F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
 F src/test_thread.c e297dd41db0b249646e69f97d36ec13e56e8b730
 F src/tokenize.c a4e04438c11fed2c67ec47fe3edbef9cca2d1b48
 F src/trigger.c caa971c1a9bba37b6ad705e7990316dd1e8266c9
-F src/update.c 9b90a5d55cba28800a40ed5f443dcc44d71c3abc
+F src/update.c b4b8790d63749fb3ef5ee41108c43bfdbfa48623
 F src/utf.c ef4b7d83bae533b76c3e1bf635b113fdad86a736
 F src/util.c 05f31144bbd3f1a24f4139ae029c42545cb72624
 F src/vacuum.c 3f34f278809bf3eb0b62ec46ff779e9c385b28f0
-F src/vdbe.c ae8e6bc6ebf13676971b57773134b1382009d96d
+F src/vdbe.c e54f89e877d13987d795ffe26e2f878a53334c9d
 F src/vdbe.h bb128757b84280504a1243c450fd13ead248ede5
 F src/vdbeInt.h 869d0f550354c1364dde1d3611d770bd1c767505
 F src/vdbeapi.c f14174843bf4be2c9afdf2ef48b61e7c3ac62d7c
@@ -603,7 +603,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 46501f490a5f5577ea31c758df749e02c7c65f39
-R 0cc84ce7ce7bb87ca2954894cd5a3824
+P 7e8330c8044dc7718e720dbd33f6e2fe970ead77
+R d11ee9bd6acba303515dc16046acb770
 U danielk1977
-Z 79bc9ce6663a48b927b6f2c6ae40aa8f
+Z d78d4992a9bc07790c788a8fc06b7da2

diff --git a/manifest.uuid b/manifest.uuid
index 02aa31ef428ec1a4615fecf812e8217e240c2503..ca10aa721d4943179d510f7e62df68e81e5100af 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e8330c8044dc7718e720dbd33f6e2fe970ead77
\ No newline at end of file
+955b15a020e9ea6401fe03a36f5139a03ea80b8a
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index b97ce709b00de59c9ef39c71cb747a1f4374af42..6e7f85e3388bd67b7941f3e6e368975d5687a8d4 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $Id: delete.c,v 1.142 2008/01/03 09:51:55 danielk1977 Exp $
+** $Id: delete.c,v 1.143 2008/01/03 17:31:45 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -74,6 +74,24 @@ void sqlite3CodeInsert(Parse *p, int iCur, u8 flags){
   sqlite3VdbeChangeP5(v, sqlite3VdbeCurrentAddr(v)-1, flags);
 }
 
+/*
+** Allocate nVal contiguous memory cells and return the index of the
+** first. Also pop nVal elements from the stack and store them in the 
+** registers. The element on the top of the stack is stored in the
+** register with the largest index.
+*/
+int sqlite3StackToReg(Parse *p, int nVal){
+  int i;
+  int iRet = p->nMem;
+  Vdbe *v = sqlite3GetVdbe(p);
+  assert(v);
+  p->nMem += nVal;
+  for(i=nVal-1; i>=0; i--){
+    sqlite3VdbeAddOp2(v, OP_MemStore, iRet+i, 1);
+  }
+  return iRet;
+}
+
 /*
 ** Generate code that will open a table for reading.
 */
@@ -354,8 +372,9 @@ void sqlite3DeleteFrom(
       /* Delete the row */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
       if( IsVirtual(pTab) ){
+        int iReg = sqlite3StackToReg(pParse, 1);
         pParse->pVirtualLock = pTab;
-        sqlite3VdbeAddOp4(v, OP_VUpdate, 0, 1, 0,
+        sqlite3VdbeAddOp4(v, OP_VUpdate, 0, 1, iReg,
                           (const char*)pTab->pVtab, P4_VTAB);
       }else
 #endif

diff --git a/src/insert.c b/src/insert.c
index 5ef92958a125889a3f208ea6f48c9c56e0146b97..068bc8ebd31fb7f713b778939d2427a2d8b3e285 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.205 2008/01/03 11:50:30 danielk1977 Exp $
+** $Id: insert.c,v 1.206 2008/01/03 17:31:45 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -795,8 +795,9 @@ void sqlite3Insert(
     */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
     if( IsVirtual(pTab) ){
+      int iReg = sqlite3StackToReg(pParse, pTab->nCol+2);
       pParse->pVirtualLock = pTab;
-      sqlite3VdbeAddOp4(v, OP_VUpdate, 1, pTab->nCol+2, 0,
+      sqlite3VdbeAddOp4(v, OP_VUpdate, 1, pTab->nCol+2, iReg,
                      (const char*)pTab->pVtab, P4_VTAB);
     }else
 #endif

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 912a318318c8365b69d5db9349ea7c01ff37909b..fad6ca96ab71f2dc5f986cf38721618ccadbaa06 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.633 2008/01/03 11:50:30 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.634 2008/01/03 17:31:45 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1919,7 +1919,7 @@ void sqlite3StrAccumAppend(StrAccum*,const char*,int);
 char *sqlite3StrAccumFinish(StrAccum*);
 void sqlite3StrAccumReset(StrAccum*);
 void sqlite3CodeInsert(Parse *, int, u8);
-
+int sqlite3StackToReg(Parse *, int);
 
 /*
 ** The interface to the LEMON-generated parser

diff --git a/src/update.c b/src/update.c
index d7ae939e7fdc2bb047bd7da4acf115d317d3b87e..60fd19581d6375f454a9a8070883ebf001b39d52 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.152 2008/01/03 09:51:55 danielk1977 Exp $
+** $Id: update.c,v 1.153 2008/01/03 17:31:45 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -647,8 +647,10 @@ static void updateVirtualTable(
     sqlite3VdbeAddOp2(v, OP_Column, ephemTab, i+1+(pRowid!=0));
   }
   pParse->pVirtualLock = pTab;
-  sqlite3VdbeAddOp4(v, OP_VUpdate, 0, pTab->nCol+2, 0,
-                     (const char*)pTab->pVtab, P4_VTAB);
+  sqlite3VdbeAddOp4(v, OP_VUpdate, 0, pTab->nCol+2, 
+      sqlite3StackToReg(pParse, pTab->nCol+2), 
+      (const char*)pTab->pVtab, P4_VTAB
+  );
   sqlite3VdbeAddOp2(v, OP_Next, ephemTab, addr);
   sqlite3VdbeJumpHere(v, addr-1);
   sqlite3VdbeAddOp2(v, OP_Close, ephemTab, 0);

diff --git a/src/vdbe.c b/src/vdbe.c
index 0ecee7534d85b2bf957f62f6d2c87d9d1adf48cc..47079cfc05c3bdaac39dcf305ae5c8263de54509 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.669 2008/01/03 11:50:30 danielk1977 Exp $
+** $Id: vdbe.c,v 1.670 2008/01/03 17:31:45 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -5198,21 +5198,21 @@ case OP_VRename: {   /* no-push */
 #endif
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-/* Opcode: VUpdate P1 P2 P4
+/* Opcode: VUpdate P1 P2 P3 P4
 **
 ** P4 is a pointer to a virtual table object, an sqlite3_vtab structure.
 ** This opcode invokes the corresponding xUpdate method. P2 values
-** are taken from the stack to pass to the xUpdate invocation. The
-** value on the top of the stack corresponds to the p2th element 
-** of the argv array passed to xUpdate.
+** are contiguous memory cells starting at P3 to pass to the xUpdate 
+** invocation. The value in register (P3+P2-1) corresponds to the 
+** p2th element of the argv array passed to xUpdate.
 **
 ** The xUpdate method will do a DELETE or an INSERT or both.
-** The argv[0] element (which corresponds to the P2-th element down
-** on the stack) is the rowid of a row to delete.  If argv[0] is
-** NULL then no deletion occurs.  The argv[1] element is the rowid
-** of the new row.  This can be NULL to have the virtual table
-** select the new rowid for itself.  The higher elements in the
-** stack are the values of columns in the new row.
+** The argv[0] element (which corresponds to memory cell P3)
+** is the rowid of a row to delete.  If argv[0] is NULL then no 
+** deletion occurs.  The argv[1] element is the rowid of the new 
+** row.  This can be NULL to have the virtual table select the new 
+** rowid for itself.  The subsequent elements in the array are 
+** the values of columns in the new row.
 **
 ** If P2==1 then no insert is performed.  argv[0] is the rowid of
 ** a row to delete.
@@ -5233,10 +5233,11 @@ case OP_VUpdate: {   /* no-push */
     int i;
     sqlite_int64 rowid;
     Mem **apArg = p->apArg;
-    Mem *pX = &pTos[1-nArg];
-    for(i = 0; i<nArg; i++, pX++){
+    Mem *pX = &p->aMem[pOp->p3];
+    for(i=0; i<nArg; i++){
       storeTypeInfo(pX, 0);
       apArg[i] = pX;
+      pX++;
     }
     if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
     sqlite3VtabLock(pVtab);
@@ -5248,7 +5249,6 @@ case OP_VUpdate: {   /* no-push */
       db->lastRowid = rowid;
     }
   }
-  popStack(&pTos, nArg);
   break;
 }
 #endif /* SQLITE_OMIT_VIRTUALTABLE */