merge from trunk

FossilOrigin-Name: 19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204

1 files changed, 6 insertions, 5 deletions

diff --git a/tool/mkopcodeh.tcl b/tool/mkopcodeh.tcl
index 57017364a..cc372e404 100644
--- a/tool/mkopcodeh.tcl
+++ b/tool/mkopcodeh.tcl
@@ -145,7 +145,9 @@ foreach name {OP_Noop OP_Explain OP_Abortable} {
   incr nOp
 }
 
-# The following are the opcodes that are processed by resolveP2Values()
+# The following are the opcodes that receive special processing in the
+# resolveP2Values() routine.  Update this list whenever new cases are
+# added to the pOp->opcode switch within resolveP2Values().
 #
 set rp2v_ops {
   OP_Transaction
@@ -157,13 +159,11 @@ set rp2v_ops {
   OP_VUpdate
   OP_VFilter
   OP_Next
-  OP_NextIfOpen
   OP_SorterNext
   OP_Prev
-  OP_PrevIfOpen
 }
 
-# Assign small values to opcodes that are processed by resolveP2Values()
+# Assign the smallest values to opcodes that are processed by resolveP2Values()
 # to make code generation for the switch() statement smaller and faster.
 #
 set cnt -1
@@ -177,6 +177,7 @@ for {set i 0} {$i<$nOp} {incr i} {
     set def($cnt) $name
   }
 }
+set mxCase1 $cnt
 
 # Assign the next group of values to JUMP opcodes
 #
@@ -311,7 +312,7 @@ for {set i 0} {$i<=$max} {incr i} {
 }
 puts "\175"
 puts ""
-puts "/* The sqlite3P2Values() routine is able to run faster if it knows"
+puts "/* The resolve3P2Values() routine is able to run faster if it knows"
 puts "** the value of the largest JUMP opcode.  The smaller the maximum"
 puts "** JUMP opcode the better, so the mkopcodeh.tcl script that"
 puts "** generated this include file strives to group all JUMP opcodes"