Big Step was too big - reintroduce skip step optimizations.

5 files changed, 27 insertions, 27 deletions

diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded
index 6d7903db984..0740408421b 100644
--- a/regress/sbin/pfctl/pf17.loaded
+++ b/regress/sbin/pfctl/pf17.loaded
@@ -51,11 +51,11 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 binat on lo0 inet from (lo0) to 1.1.1.1 -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sp=end da=15 dp=end ]
+  [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end da=15 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1)
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 binat on lo0 inet from (lo0) to (lo1) -> (lo1)
@@ -87,11 +87,11 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 binat on lo0 inet6 from (lo0) to ::1 -> ::2
-  [ Skip steps: i=end d=end f=end p=end sp=end da=24 dp=end ]
+  [ Skip steps: i=end d=end f=end p=end sa=25 sp=end da=24 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 binat on lo0 inet6 from (lo0) to ::1 -> (lo1)
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=end p=end sa=25 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 binat on lo0 inet6 from (lo0) to (lo1) -> (lo1)
diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded
index 353c9bc9438..bf8cc34acb2 100644
--- a/regress/sbin/pfctl/pf47.loaded
+++ b/regress/sbin/pfctl/pf47.loaded
@@ -87,11 +87,11 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 pass in on lo0 inet from any to (lo0) label "(lo0)"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 da=25 dp=46 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 pass in on lo0 inet from any to (lo0) label "(lo0)(lo0)"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 da=25 dp=46 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 pass in on lo0 inet from any to (lo0) label " (lo0) (lo0) "
@@ -111,11 +111,11 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 da=31 dp=46 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)! (lo0)"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 da=31 dp=46 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 pass in on lo0 inet6 from any to ! (lo0) label " ! (lo0) ! (lo0) "
diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded
index 7bcdea943ab..d53e9665a30 100644
--- a/regress/sbin/pfctl/pf48.loaded
+++ b/regress/sbin/pfctl/pf48.loaded
@@ -1,5 +1,5 @@
 @0 nat on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1
-  [ Skip steps: d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: d=end f=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 nat on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1
@@ -7,7 +7,7 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 rdr on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1
-  [ Skip steps: d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: d=end f=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 rdr on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1
diff --git a/regress/sbin/pfctl/pf81.loaded b/regress/sbin/pfctl/pf81.loaded
index 5c6cd6adb33..6e00f34f960 100644
--- a/regress/sbin/pfctl/pf81.loaded
+++ b/regress/sbin/pfctl/pf81.loaded
@@ -1,9 +1,9 @@
 @0 pass inet6 from (lo0) to ::1
-  [ Skip steps: i=end d=end f=3 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=3 p=end sa=3 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass inet6 from (lo0) to ::2
-  [ Skip steps: i=end d=end f=3 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=3 p=end sa=3 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass inet6 from (lo0) to ::3
@@ -11,11 +11,11 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass inet from (lo0) to 0.0.0.1
-  [ Skip steps: i=end d=end f=6 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass inet from (lo0) to 0.0.0.2
-  [ Skip steps: i=end d=end f=6 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass inet from (lo0) to 0.0.0.3
@@ -23,47 +23,47 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass from <foo:*> to <bar1:*>
-  [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=9 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass from <foo:*> to <bar2:*>
-  [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=9 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass from <foo:*> to <bar3:*>
-  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass inet6 from <foo:*> to ::1
-  [ Skip steps: i=end d=end f=12 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=12 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass inet6 from <foo:*> to ::2
-  [ Skip steps: i=end d=end f=12 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=12 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass inet6 from <foo:*> to ::3
-  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass inet from <foo:*> to 0.0.0.1
-  [ Skip steps: i=end d=end f=15 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=15 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass inet from <foo:*> to 0.0.0.2
-  [ Skip steps: i=end d=end f=15 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=15 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass inet from <foo:*> to 0.0.0.3
-  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass from <foo:*> to <bar1:*>
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=21 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass from <foo:*> to <bar2:*>
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end f=21 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass from <foo:*> to <bar3:*>
diff --git a/regress/sbin/pfctl/pf82.loaded b/regress/sbin/pfctl/pf82.loaded
index 8f3438b1600..d0c133316ac 100644
--- a/regress/sbin/pfctl/pf82.loaded
+++ b/regress/sbin/pfctl/pf82.loaded
@@ -27,7 +27,7 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass inet from <bar:*> to any
-  [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=end d=end p=end sa=9 sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass from <bar:*> to any
@@ -35,7 +35,7 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass inet6 from <foo:*> to any
-  [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=end d=end p=end sa=11 sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass from <foo:*> to any