From b8209dfb1722f377c5a9aed4296e7d028fa6b846 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Thu, 28 Aug 2008 18:38:55 +0000
Subject: Fix style consistencies and a comment.

---
 tools/regression/bpf/bpf_filter/tests/test0001.h |  2 +-
 tools/regression/bpf/bpf_filter/tests/test0002.h |  2 +-
 tools/regression/bpf/bpf_filter/tests/test0003.h |  2 +-
 tools/regression/bpf/bpf_filter/tests/test0004.h |  6 +--
 tools/regression/bpf/bpf_filter/tests/test0005.h |  6 +--
 tools/regression/bpf/bpf_filter/tests/test0006.h |  6 +--
 tools/regression/bpf/bpf_filter/tests/test0007.h |  6 +--
 tools/regression/bpf/bpf_filter/tests/test0008.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0009.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0010.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0011.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0012.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0013.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0014.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0015.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0016.h | 16 +++---
 tools/regression/bpf/bpf_filter/tests/test0017.h | 16 +++---
 tools/regression/bpf/bpf_filter/tests/test0018.h | 16 +++---
 tools/regression/bpf/bpf_filter/tests/test0019.h | 26 ++++-----
 tools/regression/bpf/bpf_filter/tests/test0020.h | 22 ++++----
 tools/regression/bpf/bpf_filter/tests/test0021.h | 22 ++++----
 tools/regression/bpf/bpf_filter/tests/test0022.h | 22 ++++----
 tools/regression/bpf/bpf_filter/tests/test0023.h | 42 +++++++--------
 tools/regression/bpf/bpf_filter/tests/test0024.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0025.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0026.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0027.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0028.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0029.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0030.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0031.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0032.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0033.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0034.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0035.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0036.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0037.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0038.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0039.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0040.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0041.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0042.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0043.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0044.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0045.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0046.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0047.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0048.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0049.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0050.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0051.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0052.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0053.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0054.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0055.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0056.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0057.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0058.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0059.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0060.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0061.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0062.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0063.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0064.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0065.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0066.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0067.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0068.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0069.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0070.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0071.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0072.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0073.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0074.h | 12 ++---
 tools/regression/bpf/bpf_filter/tests/test0075.h |  8 +--
 tools/regression/bpf/bpf_filter/tests/test0076.h | 10 ++--
 tools/regression/bpf/bpf_filter/tests/test0077.h |  4 +-
 tools/regression/bpf/bpf_filter/tests/test0078.h |  6 +--
 tools/regression/bpf/bpf_filter/tests/test0079.h |  2 +-
 tools/regression/bpf/bpf_filter/tests/test0080.h | 68 ++++++++++++------------
 80 files changed, 449 insertions(+), 449 deletions(-)

(limited to 'tools')

diff --git a/tools/regression/bpf/bpf_filter/tests/test0001.h b/tools/regression/bpf/bpf_filter/tests/test0001.h
index 6016e30..866b161 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0001.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0001.h
@@ -27,5 +27,5 @@ int	invalid =	1;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	SIGABRT;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0002.h b/tools/regression/bpf/bpf_filter/tests/test0002.h
index af66976..ef92c31 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0002.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0002.h
@@ -26,5 +26,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0003.h b/tools/regression/bpf/bpf_filter/tests/test0003.h
index 9089f05..7a547ef 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0003.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0003.h
@@ -27,5 +27,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0004.h b/tools/regression/bpf/bpf_filter/tests/test0004.h
index 78866ce..ecb4bc2 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0004.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0004.h
@@ -1,12 +1,12 @@
 /*-
- * Test 0004:	BPF_LD|BPF_W|BPF_ABS
+ * Test 0004:	BPF_LD+BPF_W+BPF_ABS
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_W|BPF_ABS, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -27,5 +27,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x23456789;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0005.h b/tools/regression/bpf/bpf_filter/tests/test0005.h
index ec9b0fd..6830add 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0005.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0005.h
@@ -1,12 +1,12 @@
 /*-
- * Test 0005:	BPF_LD|BPF_H|BPF_ABS
+ * Test 0005:	BPF_LD+BPF_H+BPF_ABS
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -27,5 +27,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x2345;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0006.h b/tools/regression/bpf/bpf_filter/tests/test0006.h
index 2d0a0b6..f36ec3f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0006.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0006.h
@@ -1,12 +1,12 @@
 /*-
- * Test 0006:	BPF_LD|BPF_B|BPF_ABS
+ * Test 0006:	BPF_LD+BPF_B+BPF_ABS
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_B|BPF_ABS, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -27,5 +27,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x23;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0007.h b/tools/regression/bpf/bpf_filter/tests/test0007.h
index d001ae1..6975722 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0007.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0007.h
@@ -1,12 +1,12 @@
 /*-
- * Test 0007:	BPF_LD|BPF_W|BPF_LEN
+ * Test 0007:	BPF_LD+BPF_W+BPF_LEN
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_W|BPF_LEN, 0),
+	BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -27,5 +27,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0008.h b/tools/regression/bpf/bpf_filter/tests/test0008.h
index 8c1a5bf..93462c7 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0008.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0008.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0008:	BPF_LDX|BPF_W|BPF_LEN & BPF_MISC|BPF_TXA
+ * Test 0008:	BPF_LDX+BPF_W+BPF_LEN & BPF_MISC+BPF_TXA
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_W|BPF_LEN, 0),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0009.h b/tools/regression/bpf/bpf_filter/tests/test0009.h
index 17c8089..644e58b 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0009.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0009.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0009:	BPF_LDX|BPF_IMM & BPF_LD|BPF_W|BPF_IND
+ * Test 0009:	BPF_LDX+BPF_IMM & BPF_LD+BPF_W+BPF_IND
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 1),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x456789ab;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0010.h b/tools/regression/bpf/bpf_filter/tests/test0010.h
index cc5abb8..ce8488e 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0010.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0010.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0010:	BPF_LD|BPF_H|BPF_IND
+ * Test 0010:	BPF_LD+BPF_H+BPF_IND
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 1),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x4567;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0011.h b/tools/regression/bpf/bpf_filter/tests/test0011.h
index 9cfd2c5..c3a94f3 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0011.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0011.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0011:	BPF_LD|BPF_B|BPF_IND
+ * Test 0011:	BPF_LD+BPF_B+BPF_IND
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 1),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x45;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0012.h b/tools/regression/bpf/bpf_filter/tests/test0012.h
index b388a06..03cd1e9 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0012.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0012.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0012:	BPF_LDX|BPF_MSH|BPF_B
+ * Test 0012:	BPF_LDX+BPF_MSH+BPF_B
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_MSH|BPF_B, 1),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_LDX+BPF_MSH+BPF_B, 1),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	(0x23 & 0xf) << 2;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0013.h b/tools/regression/bpf/bpf_filter/tests/test0013.h
index 2670fc2..78313f6 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0013.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0013.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0013:	BPF_ST & BPF_LDX|BPF_MEM
+ * Test 0013:	BPF_ST & BPF_LDX+BPF_MEM
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_ST, 7),
-	BPF_STMT(BPF_LDX|BPF_MEM, 7),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_LDX+BPF_MEM, 7),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -30,5 +30,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0014.h b/tools/regression/bpf/bpf_filter/tests/test0014.h
index 4301109..bea2b4c 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0014.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0014.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0014:	BPF_STX & BPF_LD|BPF_MEM
+ * Test 0014:	BPF_STX & BPF_LD+BPF_MEM
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_STX, 7),
-	BPF_STMT(BPF_LD|BPF_MEM, 7),
+	BPF_STMT(BPF_LD+BPF_MEM, 7),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0015.h b/tools/regression/bpf/bpf_filter/tests/test0015.h
index 9a2aea3..7818702 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0015.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0015.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0015:	BPF_JMP|BPF_JA
+ * Test 0015:	BPF_JMP+BPF_JA
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
-	BPF_STMT(BPF_JMP|BPF_JA, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_JMP+BPF_JA, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0016.h b/tools/regression/bpf/bpf_filter/tests/test0016.h
index bd7cee3..b5b0bdd 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0016.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0016.h
@@ -1,18 +1,18 @@
 /*-
- * Test 0016:	BPF_JMP|BPF_JGT|BPF_K
+ * Test 0016:	BPF_JMP+BPF_JGT+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_K, 0x01234568, 2, 0),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_K, 0x01234566, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 0x01234568, 2, 0),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 0x01234566, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_K, 0x01234567, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 0x01234567, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -33,5 +33,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0017.h b/tools/regression/bpf/bpf_filter/tests/test0017.h
index e286249..24f412f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0017.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0017.h
@@ -1,18 +1,18 @@
 /*-
- * Test 0017:	BPF_JMP|BPF_JGE|BPF_K
+ * Test 0017:	BPF_JMP+BPF_JGE+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0x01234568, 2, 0),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0x01234567, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 0x01234568, 2, 0),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 0x01234567, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0x01234566, 0, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 0x01234566, 0, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -33,5 +33,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0018.h b/tools/regression/bpf/bpf_filter/tests/test0018.h
index 17c5ee8..ad80b47 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0018.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0018.h
@@ -1,18 +1,18 @@
 /*-
- * Test 0018:	BPF_JMP|BPF_JEQ|BPF_K
+ * Test 0018:	BPF_JMP+BPF_JEQ+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 0x01234568, 2, 0),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 0x01234567, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x01234568, 2, 0),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x01234567, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 0x01234566, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x01234566, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -33,5 +33,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0019.h b/tools/regression/bpf/bpf_filter/tests/test0019.h
index df7bccd..e7977b1 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0019.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0019.h
@@ -1,23 +1,23 @@
 /*-
- * Test 0019:	BPF_JMP|BPF_JSET|BPF_K
+ * Test 0019:	BPF_JMP+BPF_JSET+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x80000000, 5, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x40000000, 4, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x20000000, 3, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x10000000, 2, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x1, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x80000000, 5, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x40000000, 4, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x20000000, 3, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x10000000, 2, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x1, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x08000000, 3, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x04000000, 2, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_K, 0x02000000, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x08000000, 3, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x04000000, 2, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x02000000, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -38,5 +38,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0020.h b/tools/regression/bpf/bpf_filter/tests/test0020.h
index 5b58e70..662d60b 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0020.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0020.h
@@ -1,21 +1,21 @@
 /*-
- * Test 0020:	BPF_JMP|BPF_JGT|BPF_X
+ * Test 0020:	BPF_JMP+BPF_JGT+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234568),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_X, 0, 3, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234566),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_X, 0, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234568),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234566),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JGT|BPF_X, 0, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -36,5 +36,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0021.h b/tools/regression/bpf/bpf_filter/tests/test0021.h
index 4979cf8..cbc93e5 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0021.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0021.h
@@ -1,21 +1,21 @@
 /*-
- * Test 0021:	BPF_JMP|BPF_JGE|BPF_X
+ * Test 0021:	BPF_JMP+BPF_JGE+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234568),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_X, 0, 3, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_X, 0, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234568),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 3, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234566),
-	BPF_JUMP(BPF_JMP|BPF_JGE|BPF_X, 0, 0, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234566),
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -36,5 +36,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0022.h b/tools/regression/bpf/bpf_filter/tests/test0022.h
index f6e4102..5a9fcc0 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0022.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0022.h
@@ -1,21 +1,21 @@
 /*-
- * Test 0022:	BPF_JMP|BPF_JEQ|BPF_X
+ * Test 0022:	BPF_JMP+BPF_JEQ+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234568),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_X, 0, 3, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234567),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_X, 0, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234568),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 3, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234567),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x01234566),
-	BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_X, 0, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x01234566),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -36,5 +36,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0023.h b/tools/regression/bpf/bpf_filter/tests/test0023.h
index 6b5dc01..24f5c69 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0023.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0023.h
@@ -1,31 +1,31 @@
 /*-
- * Test 0023:	BPF_JMP|BPF_JSET|BPF_X
+ * Test 0023:	BPF_JMP+BPF_JSET+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x01234567),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x80000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 9, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x40000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 7, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x20000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 5, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x10000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 3, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x1),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0x1, 2, 1),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x01234567),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x80000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 9, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x40000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 7, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x20000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 5, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x10000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 3, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x1),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0x1, 2, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_RET+BPF_A, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x08000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 5, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x04000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 3, 0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x02000000),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 0, 1, 0),
-	BPF_STMT(BPF_LD|BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x08000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 5, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x04000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 3, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x02000000),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 1, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xc0decafe),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -46,5 +46,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0decafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0024.h b/tools/regression/bpf/bpf_filter/tests/test0024.h
index 7c4347f..d4f80ba 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0024.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0024.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0024:	BPF_ALU|BPF_ADD|BPF_X
+ * Test 0024:	BPF_ALU+BPF_ADD+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xbeadb8dd),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x20000801),
-	BPF_STMT(BPF_ALU|BPF_ADD|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xbeadb8dd),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x20000801),
+	BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0025.h b/tools/regression/bpf/bpf_filter/tests/test0025.h
index 16800f3..2d5f2b4 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0025.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0025.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0025:	BPF_ALU|BPF_SUB|BPF_X
+ * Test 0025:	BPF_ALU+BPF_SUB+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0x20000801),
-	BPF_STMT(BPF_ALU|BPF_SUB|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0x20000801),
+	BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xbeadb8dd;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0026.h b/tools/regression/bpf/bpf_filter/tests/test0026.h
index 9ef1bc1..49c9133 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0026.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0026.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0026:	BPF_ALU|BPF_MUL|BPF_X
+ * Test 0026:	BPF_ALU+BPF_MUL+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdead),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xc0de),
-	BPF_STMT(BPF_ALU|BPF_MUL|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xc0de),
+	BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xa7c2da06;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0027.h b/tools/regression/bpf/bpf_filter/tests/test0027.h
index 8417e1a..c26248d 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0027.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0027.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0027:	BPF_ALU|BPF_DIV|BPF_X
+ * Test 0027:	BPF_ALU+BPF_DIV+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xa7c2da06),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xdead),
-	BPF_STMT(BPF_ALU|BPF_DIV|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xa7c2da06),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xdead),
+	BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0028.h b/tools/regression/bpf/bpf_filter/tests/test0028.h
index 7bcc455..7a34645 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0028.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0028.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0028:	BPF_ALU|BPF_AND|BPF_X
+ * Test 0028:	BPF_ALU+BPF_AND+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xc0decafe),
-	BPF_STMT(BPF_ALU|BPF_AND|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_ALU+BPF_AND+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc08cc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0029.h b/tools/regression/bpf/bpf_filter/tests/test0029.h
index 6ac2b67..65d842a 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0029.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0029.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0029:	BPF_ALU|BPF_OR|BPF_X
+ * Test 0029:	BPF_ALU+BPF_OR+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xc0decafe),
-	BPF_STMT(BPF_ALU|BPF_OR|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xc0decafe),
+	BPF_STMT(BPF_ALU+BPF_OR+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeffcafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0030.h b/tools/regression/bpf/bpf_filter/tests/test0030.h
index b2eb60c..f2197ff 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0030.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0030.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0030:	BPF_ALU|BPF_LSH|BPF_X
+ * Test 0030:	BPF_ALU+BPF_LSH+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdefc0),
-	BPF_STMT(BPF_LDX|BPF_IMM, 9),
-	BPF_STMT(BPF_ALU|BPF_LSH|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdefc0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 9),
+	BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x1bdf8000;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0031.h b/tools/regression/bpf/bpf_filter/tests/test0031.h
index 5db96be..7f868b0 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0031.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0031.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0031:	BPF_ALU|BPF_RSH|BPF_X
+ * Test 0031:	BPF_ALU+BPF_RSH+BPF_X
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 13),
-	BPF_STMT(BPF_ALU|BPF_RSH|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 13),
+	BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x6f56e;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0032.h b/tools/regression/bpf/bpf_filter/tests/test0032.h
index 05fb432..779c48b 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0032.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0032.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0032:	BPF_ALU|BPF_ADD|BPF_K
+ * Test 0032:	BPF_ALU+BPF_ADD+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xbeadb8dd),
-	BPF_STMT(BPF_ALU|BPF_ADD|BPF_K, 0x20000801),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xbeadb8dd),
+	BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 0x20000801),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0033.h b/tools/regression/bpf/bpf_filter/tests/test0033.h
index 79ddafc..54de1b7 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0033.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0033.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0033:	BPF_ALU|BPF_SUB|BPF_K
+ * Test 0033:	BPF_ALU+BPF_SUB+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_ALU|BPF_SUB|BPF_K, 0x20000801),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, 0x20000801),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xbeadb8dd;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0034.h b/tools/regression/bpf/bpf_filter/tests/test0034.h
index 5c09da1..6bb8b6f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0034.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0034.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0034:	BPF_ALU|BPF_MUL|BPF_K
+ * Test 0034:	BPF_ALU+BPF_MUL+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdead),
-	BPF_STMT(BPF_ALU|BPF_MUL|BPF_K, 0xc0de),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+	BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, 0xc0de),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xa7c2da06;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0035.h b/tools/regression/bpf/bpf_filter/tests/test0035.h
index 1283a88..d7f157f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0035.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0035.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0035:	BPF_ALU|BPF_DIV|BPF_K
+ * Test 0035:	BPF_ALU+BPF_DIV+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xa7c2da06),
-	BPF_STMT(BPF_ALU|BPF_DIV|BPF_K, 0xdead),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xa7c2da06),
+	BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 0xdead),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0036.h b/tools/regression/bpf/bpf_filter/tests/test0036.h
index 8506b90..0eddb61 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0036.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0036.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0036:	BPF_ALU|BPF_AND|BPF_K
+ * Test 0036:	BPF_ALU+BPF_AND+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_ALU|BPF_AND|BPF_K, 0xc0decafe),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_ALU+BPF_AND+BPF_K, 0xc0decafe),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xc08cc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0037.h b/tools/regression/bpf/bpf_filter/tests/test0037.h
index f231deb..dc4c411 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0037.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0037.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0037:	BPF_ALU|BPF_OR|BPF_K
+ * Test 0037:	BPF_ALU+BPF_OR+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_ALU|BPF_OR|BPF_K, 0xc0decafe),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_ALU+BPF_OR+BPF_K, 0xc0decafe),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeffcafe;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0038.h b/tools/regression/bpf/bpf_filter/tests/test0038.h
index 1c9b764..a27948c 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0038.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0038.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0038:	BPF_ALU|BPF_LSH|BPF_K
+ * Test 0038:	BPF_ALU+BPF_LSH+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdefc0),
-	BPF_STMT(BPF_ALU|BPF_LSH|BPF_K, 9),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdefc0),
+	BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 9),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x1bdf8000;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0039.h b/tools/regression/bpf/bpf_filter/tests/test0039.h
index 848c0cd..4e7cf72 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0039.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0039.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0039:	BPF_ALU|BPF_RSH|BPF_K
+ * Test 0039:	BPF_ALU+BPF_RSH+BPF_K
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_ALU|BPF_RSH|BPF_K, 13),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 13),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0x6f56e;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0040.h b/tools/regression/bpf/bpf_filter/tests/test0040.h
index c08fe91..9f4e479 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0040.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0040.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0040:	BPF_ALU|BPF_NEG
+ * Test 0040:	BPF_ALU+BPF_NEG
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0x21523f22),
-	BPF_STMT(BPF_ALU|BPF_NEG, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0x21523f22),
+	BPF_STMT(BPF_ALU+BPF_NEG, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0041.h b/tools/regression/bpf/bpf_filter/tests/test0041.h
index 5480bda..235ad9f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0041.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0041.h
@@ -1,16 +1,16 @@
 /*-
- * Test 0041:	BPF_MISC|BPF_TAX
+ * Test 0041:	BPF_MISC+BPF_TAX
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_MISC|BPF_TAX, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_MISC+BPF_TAX, 0),
 	BPF_STMT(BPF_STX, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -30,5 +30,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0042.h b/tools/regression/bpf/bpf_filter/tests/test0042.h
index bf9cf5b..a645cb6 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0042.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0042.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0042:	Check boundary conditions (BPF_LD|BPF_W|BPF_ABS)
+ * Test 0042:	Check boundary conditions (BPF_LD+BPF_W+BPF_ABS)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_W|BPF_ABS, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0043.h b/tools/regression/bpf/bpf_filter/tests/test0043.h
index 2e06829..6971fe0 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0043.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0043.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0043:	Check boundary conditions (BPF_LD|BPF_H|BPF_ABS)
+ * Test 0043:	Check boundary conditions (BPF_LD+BPF_H+BPF_ABS)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0044.h b/tools/regression/bpf/bpf_filter/tests/test0044.h
index ae6e8ee..b6ae8e6 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0044.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0044.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0044:	Check boundary conditions (BPF_LD|BPF_B|BPF_ABS)
+ * Test 0044:	Check boundary conditions (BPF_LD+BPF_B+BPF_ABS)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_B|BPF_ABS, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0045.h b/tools/regression/bpf/bpf_filter/tests/test0045.h
index 329357f..5b420e8 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0045.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0045.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0045:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0045:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0046.h b/tools/regression/bpf/bpf_filter/tests/test0046.h
index 0c9d72e..b31b351 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0046.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0046.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0046:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0046:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0047.h b/tools/regression/bpf/bpf_filter/tests/test0047.h
index 2561c65..4ce86da 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0047.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0047.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0047:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0047:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 2),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0048.h b/tools/regression/bpf/bpf_filter/tests/test0048.h
index a933078..04eea4f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0048.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0048.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0048:	Check boundary conditions (BPF_LDX|BPF_MSH|BPF_B)
+ * Test 0048:	Check boundary conditions (BPF_LDX+BPF_MSH+BPF_B)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_MSH|BPF_B, 2),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_MSH+BPF_B, 2),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0049.h b/tools/regression/bpf/bpf_filter/tests/test0049.h
index 47ca771..caa6500 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0049.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0049.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0049:	Check boundary conditions (BPF_LD|BPF_W|BPF_ABS)
+ * Test 0049:	Check boundary conditions (BPF_LD+BPF_W+BPF_ABS)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_W|BPF_ABS, 6),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 6),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0050.h b/tools/regression/bpf/bpf_filter/tests/test0050.h
index 4f560c9..f3c0c72 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0050.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0050.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0050:	Check boundary conditions (BPF_LD|BPF_H|BPF_ABS)
+ * Test 0050:	Check boundary conditions (BPF_LD+BPF_H+BPF_ABS)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 4),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 4),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,5 +28,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0051.h b/tools/regression/bpf/bpf_filter/tests/test0051.h
index 2036cb3..b81f30c 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0051.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0051.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0051:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0051:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 6),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 6),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0052.h b/tools/regression/bpf/bpf_filter/tests/test0052.h
index 976d1cd..dc80e9f 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0052.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0052.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0052:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0052:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 4),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 4),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0053.h b/tools/regression/bpf/bpf_filter/tests/test0053.h
index 4b4d0c1..d841a14 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0053.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0053.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0053:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0053:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 3),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 3),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0054.h b/tools/regression/bpf/bpf_filter/tests/test0054.h
index 534b7f6..9b108aa 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0054.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0054.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0054:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0054:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 6),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 6),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0055.h b/tools/regression/bpf/bpf_filter/tests/test0055.h
index 6460846..1951bee 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0055.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0055.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0055:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0055:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 4),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 4),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0056.h b/tools/regression/bpf/bpf_filter/tests/test0056.h
index 790a9b9..c812933 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0056.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0056.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0056:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0056:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0xffffffff),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0057.h b/tools/regression/bpf/bpf_filter/tests/test0057.h
index 9df3088..6c50a65 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0057.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0057.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0057:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0057:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0xffffffff),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0058.h b/tools/regression/bpf/bpf_filter/tests/test0058.h
index 419983c..e4e5f06 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0058.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0058.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0058:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0058:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0xffffffff),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0059.h b/tools/regression/bpf/bpf_filter/tests/test0059.h
index 193abd7..4af6adc 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0059.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0059.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0059:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0059:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xffffffff),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0060.h b/tools/regression/bpf/bpf_filter/tests/test0060.h
index f23bb49..8afdeb4 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0060.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0060.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0060:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0060:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xffffffff),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0061.h b/tools/regression/bpf/bpf_filter/tests/test0061.h
index f9f7dad..256e6d6 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0061.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0061.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0061:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0061:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xffffffff),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0062.h b/tools/regression/bpf/bpf_filter/tests/test0062.h
index 817305b..39cd978 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0062.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0062.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0062:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0062:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0063.h b/tools/regression/bpf/bpf_filter/tests/test0063.h
index f012323..886a206 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0063.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0063.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0063:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0063:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0064.h b/tools/regression/bpf/bpf_filter/tests/test0064.h
index 9788602..3aa7183 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0064.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0064.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0064:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0064:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0065.h b/tools/regression/bpf/bpf_filter/tests/test0065.h
index 66b1197..f5c9b09 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0065.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0065.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0065:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0065:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0066.h b/tools/regression/bpf/bpf_filter/tests/test0066.h
index 1276ac8..a2a83cb 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0066.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0066.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0066:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0066:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0067.h b/tools/regression/bpf/bpf_filter/tests/test0067.h
index 0b21c44..5bd522c 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0067.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0067.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0067:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0067:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 1),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0068.h b/tools/regression/bpf/bpf_filter/tests/test0068.h
index 62511e0..6e8df64 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0068.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0068.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0068:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0068:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0069.h b/tools/regression/bpf/bpf_filter/tests/test0069.h
index 7d12bdc..e25336c 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0069.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0069.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0069:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0069:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0070.h b/tools/regression/bpf/bpf_filter/tests/test0070.h
index a6eb7da..aff1dbc 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0070.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0070.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0070:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0070:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 1),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 1),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0071.h b/tools/regression/bpf/bpf_filter/tests/test0071.h
index d938378..d476e90 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0071.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0071.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0071:	Check boundary conditions (BPF_LD|BPF_W|BPF_IND)
+ * Test 0071:	Check boundary conditions (BPF_LD+BPF_W+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0072.h b/tools/regression/bpf/bpf_filter/tests/test0072.h
index 38ba942..bb461fd 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0072.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0072.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0072:	Check boundary conditions (BPF_LD|BPF_H|BPF_IND)
+ * Test 0072:	Check boundary conditions (BPF_LD+BPF_H+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_H|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0073.h b/tools/regression/bpf/bpf_filter/tests/test0073.h
index d9fae4a..df8f309 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0073.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0073.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0073:	Check boundary conditions (BPF_LD|BPF_B|BPF_IND)
+ * Test 0073:	Check boundary conditions (BPF_LD+BPF_B+BPF_IND)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_LD|BPF_B|BPF_IND, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0074.h b/tools/regression/bpf/bpf_filter/tests/test0074.h
index 8ab73a1..1447839 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0074.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0074.h
@@ -1,15 +1,15 @@
 /*-
- * Test 0074:	Divide by 0 (BPF_ALU|BPF_DIV|BPF_X)
+ * Test 0074:	Divide by 0 (BPF_ALU+BPF_DIV+BPF_X)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xa7c2da06),
-	BPF_STMT(BPF_LDX|BPF_IMM, 0),
-	BPF_STMT(BPF_ALU|BPF_DIV|BPF_X, 0),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xa7c2da06),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0),
+	BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -29,5 +29,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0075.h b/tools/regression/bpf/bpf_filter/tests/test0075.h
index 5c0d1f5..0d94c7a 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0075.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0075.h
@@ -1,13 +1,13 @@
 /*-
- * Test 0075:	Check boundary conditions (BPF_LD|BPF_MEM)
+ * Test 0075:	Check boundary conditions (BPF_LD+BPF_MEM)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LD|BPF_MEM, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_MEM, 0xffffffff),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -28,7 +28,7 @@ int	invalid =	1;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 #ifdef BPF_JIT_COMPILER
 int	expect_signal =	SIGSEGV;
 #else
diff --git a/tools/regression/bpf/bpf_filter/tests/test0076.h b/tools/regression/bpf/bpf_filter/tests/test0076.h
index 19dec0d..6513459 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0076.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0076.h
@@ -1,14 +1,14 @@
 /*-
- * Test 0076:	Check boundary conditions (BPF_LDX|BPF_MEM)
+ * Test 0076:	Check boundary conditions (BPF_LDX+BPF_MEM)
  *
  * $FreeBSD$
  */
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
-	BPF_STMT(BPF_LDX|BPF_MEM, 0xffffffff),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LDX+BPF_MEM, 0xffffffff),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,7 +29,7 @@ int	invalid =	1;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 #ifdef BPF_JIT_COMPILER
 int	expect_signal =	SIGSEGV;
 #else
diff --git a/tools/regression/bpf/bpf_filter/tests/test0077.h b/tools/regression/bpf/bpf_filter/tests/test0077.h
index c4224c1..6ac1e51 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0077.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0077.h
@@ -6,7 +6,7 @@
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_ST, 0xffffffff),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
@@ -28,7 +28,7 @@ int	invalid =	1;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 #ifdef BPF_JIT_COMPILER
 int	expect_signal =	SIGSEGV;
 #else
diff --git a/tools/regression/bpf/bpf_filter/tests/test0078.h b/tools/regression/bpf/bpf_filter/tests/test0078.h
index bd7ee8f..8803073 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0078.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0078.h
@@ -6,9 +6,9 @@
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LD|BPF_IMM, 0xdeadc0de),
+	BPF_STMT(BPF_LD+BPF_IMM, 0xdeadc0de),
 	BPF_STMT(BPF_STX, 0xffffffff),
-	BPF_STMT(BPF_MISC|BPF_TXA, 0),
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
 	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
@@ -29,7 +29,7 @@ int	invalid =	1;
 /* Expected return value */
 u_int	expect =	0xdeadc0de;
 
-/* Expeced signal */
+/* Expected signal */
 #ifdef BPF_JIT_COMPILER
 int	expect_signal =	SIGSEGV;
 #else
diff --git a/tools/regression/bpf/bpf_filter/tests/test0079.h b/tools/regression/bpf/bpf_filter/tests/test0079.h
index 78169e0..753661a 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0079.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0079.h
@@ -25,5 +25,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	(u_int)-1;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
diff --git a/tools/regression/bpf/bpf_filter/tests/test0080.h b/tools/regression/bpf/bpf_filter/tests/test0080.h
index 3ec60ae..55dcfea 100644
--- a/tools/regression/bpf/bpf_filter/tests/test0080.h
+++ b/tools/regression/bpf/bpf_filter/tests/test0080.h
@@ -8,39 +8,39 @@
 
 /* BPF program */
 struct bpf_insn pc[] = {
-	BPF_STMT(BPF_LDX|BPF_IMM, 0xffffffff),
-	BPF_STMT(BPF_LD|BPF_MEM, 0),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 30, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 1),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 28, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 2),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 26, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 3),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 24, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 4),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 22, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 5),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 20, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 6),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 18, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 7),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 16, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 8),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 14, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 9),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 12, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 10),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 10, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 11),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 8, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 12),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 6, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 13),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 4, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 14),
-	BPF_JUMP(BPF_JMP|BPF_JSET|BPF_X, 2, 0, 0),
-	BPF_STMT(BPF_LD|BPF_MEM, 15),
-	BPF_STMT(BPF_RET|BPF_A, 0),
+	BPF_STMT(BPF_LDX+BPF_IMM, 0xffffffff),
+	BPF_STMT(BPF_LD+BPF_MEM, 0),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 30, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 1),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 28, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 2),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 26, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 3),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 24, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 4),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 22, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 5),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 20, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 6),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 18, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 7),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 16, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 8),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 14, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 9),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 12, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 10),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 10, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 11),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 8, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 12),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 6, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 13),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 4, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 14),
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 2, 0, 0),
+	BPF_STMT(BPF_LD+BPF_MEM, 15),
+	BPF_STMT(BPF_RET+BPF_A, 0),
 };
 
 /* Packet */
@@ -60,5 +60,5 @@ int	invalid =	0;
 /* Expected return value */
 u_int	expect =	0;
 
-/* Expeced signal */
+/* Expected signal */
 int	expect_signal =	0;
-- 
cgit v1.1