diff --git a/backport-Additional-fix-for-Node_elem_new.patch b/backport-Additional-fix-for-Node_elem_new.patch
deleted file mode 100644
index f5c2abad37584c80c53cf4f01654daf43ce9e835..0000000000000000000000000000000000000000
--- a/backport-Additional-fix-for-Node_elem_new.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 2848045aed5ccfd7b582808288f7fcc18d319952 Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Wed, 14 Sep 2022 22:33:39 +0300
-Subject: Additional fix for Node_elem_new.
-
-Reference:https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=2848045aed5ccfd7b582808288f7fcc18d319952
-Conflict:tailoring commit on ChangeLog
----
- interpret.h       | 14 ++++++++++----
- pc/ChangeLog      |  4 ++++
- pc/Makefile.tst   | 18 +++++++++++++++++-
- test/ChangeLog    |  5 +++--
- test/Makefile.am  |  7 ++++++-
- test/Makefile.in  | 17 ++++++++++++++++-
- test/Maketests    | 10 ++++++++++
- test/elemnew2.awk |  6 ++++++
- test/elemnew2.ok  |  2 ++
- test/elemnew3.awk |  8 ++++++++
- test/elemnew3.ok  |  0
- 11 files changed, 81 insertions(+), 9 deletions(-)
- create mode 100644 test/elemnew2.awk
- create mode 100644 test/elemnew2.ok
- create mode 100644 test/elemnew3.awk
- create mode 100644 test/elemnew3.ok
-
-diff --git a/interpret.h b/interpret.h
-index 268655b..26010ad 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -213,7 +213,7 @@ top:
- 			case Node_var_new:
- uninitialized_scalar:
- 				if (op != Op_push_arg_untyped) {
--					/* convert untyped to scalar */
-+					/* convert very original untyped to scalar */
- 					m->type = Node_var;
- 					m->var_value = dupnode(Nnull_string);
- 				}
-@@ -222,6 +222,7 @@ uninitialized_scalar:
- 						_("reference to uninitialized argument `%s'") :
- 						_("reference to uninitialized variable `%s'"),
- 								save_symbol->vname);
-+				// set up local param by value
- 				if (op != Op_push_arg_untyped)
- 					m = dupnode(Nnull_string);
- 				UPREF(m);
-@@ -230,15 +231,20 @@ uninitialized_scalar:
- 
- 			case Node_elem_new:
- 				if (op != Op_push_arg_untyped) {
--					/* convert untyped to scalar */
--					m = elem_new_to_scalar(m);
-+					/* convert very original untyped to scalar */
-+					m->type = Node_var;
-+					m->var_value = dupnode(Nnull_string);
- 				}
- 				if (do_lint)
- 					lintwarn(isparam ?
- 						_("reference to uninitialized argument `%s'") :
- 						_("reference to uninitialized variable `%s'"),
- 								save_symbol->vname);
--				UPREF(m);
-+				// set up local param by value
-+				if (op != Op_push_arg_untyped) {
-+					m = elem_new_to_scalar(m);
-+				}
-+
- 				PUSH(m);
- 				break;
- 
-diff --git a/pc/ChangeLog b/pc/ChangeLog
-index a78ccfc..67ee4d2 100644
---- a/pc/ChangeLog
-+++ b/pc/ChangeLog
-@@ -1,3 +1,7 @@
-+2022-09-14         Arnold D. Robbins     <arnold@skeeve.com>
-+
-+	* Makefile.tst: Regenerated.
-+
- 2022-09-04         Arnold D. Robbins     <arnold@skeeve.com>
- 
- 	* 5.2.0: Release tar ball made.
-diff --git a/pc/Makefile.tst b/pc/Makefile.tst
-index 269ec8a..9e40cd2 100644
---- a/pc/Makefile.tst
-+++ b/pc/Makefile.tst
-@@ -190,7 +190,8 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars errno exit fieldwdth forcenum fpat1 fpat2 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
- 	fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 \
-@@ -2735,6 +2736,21 @@ dfacheck1:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew1:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
-+elemnew2:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
-+elemnew3:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/ChangeLog b/test/ChangeLog
-index ea08ede..434cbd9 100644
---- a/test/ChangeLog
-+++ b/test/ChangeLog
-@@ -1,7 +1,8 @@
- 2022-09-14         Arnold D. Robbins     <arnold@skeeve.com>
- 
--	* Makefile.am (EXTRA_DIST): New test: elemnew1.
--	* elemnew1.awk, elemnew1.ok: New files.
-+	* Makefile.am (EXTRA_DIST): New tests: elemnew1, elemnew2, elemnew3.
-+	* elemnew1.awk, elemnew1.ok, elemnew2.awk, elemnew2.ok,
-+	elemnew3.awk, elemnew3.ok: New files.
- 
- 2022-09-04         Arnold D. Robbins     <arnold@skeeve.com>
- 
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 8a5c3c4..8b0a24e 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -284,6 +284,10 @@ EXTRA_DIST = \
- 	dynlj.ok \
- 	elemnew1.awk \
- 	elemnew1.ok \
-+	elemnew2.awk \
-+	elemnew2.ok \
-+	elemnew3.awk \
-+	elemnew3.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1482,7 +1486,8 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars elemnew1 errno exit fieldwdth forcenum fpat1 fpat2 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
- 	fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 \
-diff --git a/test/Makefile.in b/test/Makefile.in
-index a4fb1cc..9240a42 100644
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -552,6 +552,10 @@ EXTRA_DIST = \
- 	dynlj.ok \
- 	elemnew1.awk \
- 	elemnew1.ok \
-+	elemnew2.awk \
-+	elemnew2.ok \
-+	elemnew3.awk \
-+	elemnew3.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1750,7 +1754,8 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars elemnew1 errno exit fieldwdth forcenum fpat1 fpat2 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
- 	fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 \
-@@ -4483,6 +4488,16 @@ elemnew1:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew2:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
-+elemnew3:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/Maketests b/test/Maketests
-index 90828e7..f7e749c 100644
---- a/test/Maketests
-+++ b/test/Maketests
-@@ -1437,6 +1437,16 @@ elemnew1:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew2:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
-+elemnew3:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/elemnew2.awk b/test/elemnew2.awk
-new file mode 100644
-index 0000000..08e7239
---- /dev/null
-+++ b/test/elemnew2.awk
-@@ -0,0 +1,6 @@
-+function set_val(old) {
-+	old[1] = 42
-+}
-+BEGIN {
-+  a[0] = set_val(a[0])
-+}
-diff --git a/test/elemnew2.ok b/test/elemnew2.ok
-new file mode 100644
-index 0000000..d6f2d78
---- /dev/null
-+++ b/test/elemnew2.ok
-@@ -0,0 +1,2 @@
-+gawk: elemnew2.awk:5: fatal: attempt to use array `a["0"]' in a scalar context
-+EXIT CODE: 2
-diff --git a/test/elemnew3.awk b/test/elemnew3.awk
-new file mode 100644
-index 0000000..39ac9a8
---- /dev/null
-+++ b/test/elemnew3.awk
-@@ -0,0 +1,8 @@
-+function foo(x)
-+{
-+        if (x == int(x))
-+                return (int(x) != 0)
-+}
-+BEGIN {
-+        foo(P["bar"])
-+}
-diff --git a/test/elemnew3.ok b/test/elemnew3.ok
-new file mode 100644
-index 0000000..e69de29
--- 
diff --git a/backport-Code-simplification-in-interpret.h.patch b/backport-Code-simplification-in-interpret.h.patch
deleted file mode 100644
index 247d413f2a1490249f2f1478bc2a6495cca57731..0000000000000000000000000000000000000000
--- a/backport-Code-simplification-in-interpret.h.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c0c9f468b12a79ad8277f0e2b9ff7d42f48490bf Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Tue, 25 Oct 2022 07:25:20 +0300
-Subject: Code simplification in interpret.h.
-
-Reference:https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=c0c9f468b12a79ad8277f0e2b9ff7d42f48490bf
-Conflict:tailoring commits on ChangeLog
----
- interpret.h | 30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/interpret.h b/interpret.h
-index f703080..4540d30 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -212,38 +212,38 @@ top:
- 
- 			case Node_var_new:
- uninitialized_scalar:
--				if (op != Op_push_arg_untyped) {
--					/* convert very original untyped to scalar */
--					m->type = Node_var;
--					m->var_value = dupnode(Nnull_string);
--				}
--
- 				if (do_lint)
- 					lintwarn(isparam ?
- 						_("reference to uninitialized argument `%s'") :
- 						_("reference to uninitialized variable `%s'"),
- 								save_symbol->vname);
--				// set up local param by value
--				if (op != Op_push_arg_untyped)
--					m = dupnode(Nnull_string);
--				UPREF(m);
--				PUSH(m);
--				break;
- 
--			case Node_elem_new:
- 				if (op != Op_push_arg_untyped) {
--					/* convert very original untyped to scalar */
-+					// convert very original untyped to scalar
- 					m->type = Node_var;
- 					m->var_value = dupnode(Nnull_string);
-+
-+					// set up local param by value
-+					m = dupnode(Nnull_string);
- 				}
- 
-+				UPREF(m);
-+				PUSH(m);
-+				break;
-+
-+			case Node_elem_new:
- 				if (do_lint)
- 					lintwarn(isparam ?
- 						_("reference to uninitialized argument `%s'") :
- 						_("reference to uninitialized variable `%s'"),
- 								save_symbol->vname);
--				// set up local param by value
-+
- 				if (op != Op_push_arg_untyped) {
-+					// convert very original untyped to scalar
-+					m->type = Node_var;
-+					m->var_value = dupnode(Nnull_string);
-+
-+					// set up local param by value
- 					DEREF(m);
- 					m = dupnode(Nnull_string);
- 				}
---
diff --git a/backport-Fix-a-bug-with-Node_elem_new.patch b/backport-Fix-a-bug-with-Node_elem_new.patch
deleted file mode 100644
index 7e0615f4a614d803a5060e10b5460196d654adca..0000000000000000000000000000000000000000
--- a/backport-Fix-a-bug-with-Node_elem_new.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From baab183439ff4e0c6b77d62156d447e61fc1dcfb Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Wed, 14 Sep 2022 21:08:59 +0300
-Subject: Fix a bug with Node_elem_new.
-
-Reference:https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=baab183439ff4e0c6b77d62156d447e61fc1dcfb
-Conflict:tailoring commit on ChangeLog
----
- interpret.h       | 1 +
- test/ChangeLog    | 5 +++++
- test/Makefile.am  | 4 +++-
- test/Makefile.in  | 9 ++++++++-
- test/Maketests    | 5 +++++
- test/elemnew1.awk | 9 +++++++++
- test/elemnew1.ok  | 0
- 7 files changed, 31 insertions(+), 2 deletions(-)
- create mode 100644 test/elemnew1.awk
- create mode 100644 test/elemnew1.ok
-
-diff --git a/interpret.h b/interpret.h
-index 57d060e..268655b 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -238,6 +238,7 @@ uninitialized_scalar:
- 						_("reference to uninitialized argument `%s'") :
- 						_("reference to uninitialized variable `%s'"),
- 								save_symbol->vname);
-+				UPREF(m);
- 				PUSH(m);
- 				break;
- 
-diff --git a/test/ChangeLog b/test/ChangeLog
-index a73637b..ea08ede 100644
---- a/test/ChangeLog
-+++ b/test/ChangeLog
-@@ -1,3 +1,8 @@
-+2022-09-14         Arnold D. Robbins     <arnold@skeeve.com>
-+
-+	* Makefile.am (EXTRA_DIST): New test: elemnew1.
-+	* elemnew1.awk, elemnew1.ok: New files.
-+
- 2022-09-04         Arnold D. Robbins     <arnold@skeeve.com>
- 
- 	* 5.2.0: Release tar ball made.
-diff --git a/test/Makefile.am b/test/Makefile.am
-index ab06974..8a5c3c4 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -282,6 +282,8 @@ EXTRA_DIST = \
- 	dumpvars.ok \
- 	dynlj.awk \
- 	dynlj.ok \
-+	elemnew1.awk \
-+	elemnew1.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1480,7 +1482,7 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars errno exit fieldwdth forcenum fpat1 fpat2 \
-+	dfacheck1 dumpvars elemnew1 errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
- 	fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 \
-diff --git a/test/Makefile.in b/test/Makefile.in
-index 834feb0..a4fb1cc 100644
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -550,6 +550,8 @@ EXTRA_DIST = \
- 	dumpvars.ok \
- 	dynlj.awk \
- 	dynlj.ok \
-+	elemnew1.awk \
-+	elemnew1.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1748,7 +1750,7 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars errno exit fieldwdth forcenum fpat1 fpat2 \
-+	dfacheck1 dumpvars elemnew1 errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
- 	fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 \
-@@ -4476,6 +4478,11 @@ dfacheck1:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew1:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/Maketests b/test/Maketests
-index 3a667af..90828e7 100644
---- a/test/Maketests
-+++ b/test/Maketests
-@@ -1432,6 +1432,11 @@ dfacheck1:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew1:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/elemnew1.awk b/test/elemnew1.awk
-new file mode 100644
-index 0000000..58dc9fc
---- /dev/null
-+++ b/test/elemnew1.awk
-@@ -0,0 +1,9 @@
-+function add_flags(old) {
-+  if (old)
-+    return 0
-+  if (!old)
-+    return 1
-+}
-+BEGIN {
-+  a[0]=add_flags(a[0])
-+}
-diff --git a/test/elemnew1.ok b/test/elemnew1.ok
-new file mode 100644
-index 0000000..e69de29
--- 
diff --git a/backport-Fix-a-memory-leak.patch b/backport-Fix-a-memory-leak.patch
deleted file mode 100644
index 98a028b3918e320c6b4a022fd4ab437876d13f87..0000000000000000000000000000000000000000
--- a/backport-Fix-a-memory-leak.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bc8957f4f5e1aafd00c82b52f4c82997b7cfc183 Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Fri, 30 Sep 2022 12:59:47 +0300
-Subject: Fix a memory leak.
-
-Reference:https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=bc8957f4f5e1aafd00c82b52f4c82997b7cfc183
-Conflict:tailoring commit on ChangeLog
----
- interpret.h | 3 +++
- 1 files changed, 3 insertions(+)
-
-diff --git a/interpret.h b/interpret.h
-index fde02d2..f703080 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -217,6 +217,7 @@ uninitialized_scalar:
- 					m->type = Node_var;
- 					m->var_value = dupnode(Nnull_string);
- 				}
-+
- 				if (do_lint)
- 					lintwarn(isparam ?
- 						_("reference to uninitialized argument `%s'") :
-@@ -235,6 +236,7 @@ uninitialized_scalar:
- 					m->type = Node_var;
- 					m->var_value = dupnode(Nnull_string);
- 				}
-+
- 				if (do_lint)
- 					lintwarn(isparam ?
- 						_("reference to uninitialized argument `%s'") :
-@@ -242,6 +244,7 @@ uninitialized_scalar:
- 								save_symbol->vname);
- 				// set up local param by value
- 				if (op != Op_push_arg_untyped) {
-+					DEREF(m);
- 					m = dupnode(Nnull_string);
- 				}
- 
---
diff --git a/backport-Fix-negative-NaN-issue-on-RiscV.patch b/backport-Fix-negative-NaN-issue-on-RiscV.patch
deleted file mode 100644
index 6ae3e95042047ec93522ad919b8257d98f99fc78..0000000000000000000000000000000000000000
--- a/backport-Fix-negative-NaN-issue-on-RiscV.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit a3799ae3f5dd6648040d499224cc6dea61b355dd
-Author: Arnold D. Robbins <arnold@skeeve.com>
-Date:   Mon Sep 19 18:51:28 2022 +0300
-
-    Fix negative NaN issue on RiscV.
-
-diff --git a/ChangeLog b/ChangeLog
-index 35941d0a..d751baf1 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,0 +1,6 @@
-+2022-09-19         Arnold D. Robbins     <arnold@skeeve.com>
-+
-+	* eval.c (fix_nan_sign): New function. See bug list citation
-+	in the code.
-+	* interpret.h (r_interpret): Use it for plus and minus cases.
-+
-diff --git a/eval.c b/eval.c
-index 1069570b..3bfff0ca 100644
---- a/eval.c
-+++ b/eval.c
-@@ -39,6 +39,8 @@ static int num_exec_hook = 0;
- static Func_pre_exec pre_execute[MAX_EXEC_HOOKS];
- static Func_post_exec post_execute = NULL;
- 
-+static double fix_nan_sign(double left, double right, double result);
-+
- extern void frame_popped();
- 
- int OFSlen;
-@@ -1901,3 +1903,20 @@ elem_new_to_scalar(NODE *n)
- 
- 	return n;
- }
-+
-+/* fix_nan_sign --- fix NaN sign on RiscV */
-+
-+// See the thread starting at
-+// https://lists.gnu.org/archive/html/bug-gawk/2022-09/msg00005.html
-+// for why we need this function.
-+
-+static double
-+fix_nan_sign(double left, double right, double result)
-+{
-+	if (isnan(left) && signbit(left))
-+		return copysign(result, -1.0);
-+	else if (isnan(right) && signbit(right))
-+		return copysign(result, -1.0);
-+	else
-+		return result;
-+}
-diff --git a/interpret.h b/interpret.h
-index 26010ada..955d918f 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -583,6 +583,7 @@ uninitialized_scalar:
- plus:
- 			t1 = TOP_NUMBER();
- 			r = make_number(t1->numbr + x2);
-+			r->numbr = fix_nan_sign(t1->numbr, x2, r->numbr);
- 			DEREF(t1);
- 			REPLACE(r);
- 			break;
-@@ -597,6 +598,7 @@ plus:
- minus:
- 			t1 = TOP_NUMBER();
- 			r = make_number(t1->numbr - x2);
-+			r->numbr = fix_nan_sign(t1->numbr, x2, r->numbr);
- 			DEREF(t1);
- 			REPLACE(r);
- 			break;
diff --git a/backport-Yet-another-fix-and-test-for-Node_elem_new.patch b/backport-Yet-another-fix-and-test-for-Node_elem_new.patch
deleted file mode 100644
index dba6e8346e19dbe3918de430914996f26c40b2a3..0000000000000000000000000000000000000000
--- a/backport-Yet-another-fix-and-test-for-Node_elem_new.patch
+++ /dev/null
@@ -1,3550 +0,0 @@
-From 3d7178e78e523574649578593192bab2e0d08a2a Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <arnold@skeeve.com>
-Date: Fri, 23 Sep 2022 11:22:40 +0300
-Subject: Yet another fix and test for Node_elem_new.
-
-Reference:https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=3d7178e78e523574649578593192bab2e0d08a2a
-Conflict:tailoring commits on ChangeLog and test/ChangeLog
----
- interpret.h       |    2 +-
- pc/Makefile.tst   |    7 +-
- test/Makefile.am  |    5 +-
- test/Makefile.in  |   10 +-
- test/Maketests    |    5 +
- test/elemnew4.awk |  441 +++++++++++
- test/elemnew4.in  | 1188 ++++++++++++++++++++++++++++++
- test/elemnew4.ok  | 1767 +++++++++++++++++++++++++++++++++++++++++++++
- 8 files changed, 3421 insertions(+), 4 deletions(-)
- create mode 100644 test/elemnew4.awk
- create mode 100644 test/elemnew4.in
- create mode 100644 test/elemnew4.ok
-
-diff --git a/interpret.h b/interpret.h
-index 26010ad..7b12ef7 100644
---- a/interpret.h
-+++ b/interpret.h
-@@ -242,7 +242,7 @@ uninitialized_scalar:
- 								save_symbol->vname);
- 				// set up local param by value
- 				if (op != Op_push_arg_untyped) {
--					m = elem_new_to_scalar(m);
-+					m = dupnode(Nnull_string);
- 				}
- 
- 				PUSH(m);
-diff --git a/pc/Makefile.tst b/pc/Makefile.tst
-index 9e40cd2..2080c61 100644
---- a/pc/Makefile.tst
-+++ b/pc/Makefile.tst
-@@ -190,7 +190,7 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 elemnew4 \
- 	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
-@@ -2751,6 +2751,11 @@ elemnew3:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew4:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 93d8c0b..0306c04 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -288,6 +288,9 @@ EXTRA_DIST = \
- 	elemnew2.ok \
- 	elemnew3.awk \
- 	elemnew3.ok \
-+	elemnew4.wak \
-+	elemnew4.in \
-+	elemnew4.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1486,7 +1489,7 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 elemnew4 \
- 	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
-diff --git a/test/Makefile.in b/test/Makefile.in
-index 080abda..a9cf435 100644
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -556,6 +556,9 @@ EXTRA_DIST = \
- 	elemnew2.ok \
- 	elemnew3.awk \
- 	elemnew3.ok \
-+	elemnew4.awk \
-+	elemnew4.in \
-+	elemnew4.ok \
- 	escapebrace.awk \
- 	escapebrace.in \
- 	escapebrace.ok \
-@@ -1754,7 +1757,7 @@ GAWK_EXT_TESTS = \
- 	binmode1 charasbytes clos1way clos1way2 clos1way3 clos1way4 \
- 	clos1way5 clos1way6 colonwarn commas crlf dbugeval dbugeval2 \
- 	dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 \
--	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 \
-+	dfacheck1 dumpvars elemnew1 elemnew2 elemnew3 elemnew4 \
- 	errno exit fieldwdth forcenum fpat1 fpat2 \
- 	fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs functab1 \
- 	functab2 functab3 functab6 funlen fwtest fwtest2 fwtest3 fwtest4 \
-@@ -4497,6 +4500,11 @@ elemnew3:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew4:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/Maketests b/test/Maketests
-index f7e749c..c868046 100644
---- a/test/Maketests
-+++ b/test/Maketests
-@@ -1447,6 +1447,11 @@ elemnew3:
- 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
- 
-+elemnew4:
-+	@echo $@
-+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-+
- exit:
- 	@echo $@
- 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-diff --git a/test/elemnew4.awk b/test/elemnew4.awk
-new file mode 100644
-index 0000000..af38469
---- /dev/null
-+++ b/test/elemnew4.awk
-@@ -0,0 +1,441 @@
-+#!/bin/awk -f
-+# SPDX-License-Identifier: GPL-2.0
-+# gen-insn-attr-x86.awk: Instruction attribute table generator
-+# Written by Masami Hiramatsu <mhiramat@redhat.com>
-+#
-+# Usage: awk -f gen-insn-attr-x86.awk x86-opcode-map.txt > inat-tables.c
-+
-+# Awk implementation sanity check
-+function check_awk_implement() {
-+	if (sprintf("%x", 0) != "0")
-+		return "Your awk has a printf-format problem."
-+	return ""
-+}
-+
-+# Clear working vars
-+function clear_vars() {
-+	delete table
-+	delete lptable2
-+	delete lptable1
-+	delete lptable3
-+	eid = -1 # escape id
-+	gid = -1 # group id
-+	aid = -1 # AVX id
-+	tname = ""
-+}
-+
-+BEGIN {
-+	# Implementation error checking
-+	awkchecked = check_awk_implement()
-+	if (awkchecked != "") {
-+		print "Error: " awkchecked > "/dev/stderr"
-+		print "Please try to use gawk." > "/dev/stderr"
-+		exit 1
-+	}
-+
-+	# Setup generating tables
-+	print "/* x86 opcode map generated from x86-opcode-map.txt */"
-+	print "/* Do not change this code. */\n"
-+	ggid = 1
-+	geid = 1
-+	gaid = 0
-+	delete etable
-+	delete gtable
-+	delete atable
-+
-+	opnd_expr = "^[A-Za-z/]"
-+	ext_expr = "^\\("
-+	sep_expr = "^\\|$"
-+	group_expr = "^Grp[0-9A-Za-z]+"
-+
-+	imm_expr = "^[IJAOL][a-z]"
-+	imm_flag["Ib"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
-+	imm_flag["Jb"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
-+	imm_flag["Iw"] = "INAT_MAKE_IMM(INAT_IMM_WORD)"
-+	imm_flag["Id"] = "INAT_MAKE_IMM(INAT_IMM_DWORD)"
-+	imm_flag["Iq"] = "INAT_MAKE_IMM(INAT_IMM_QWORD)"
-+	imm_flag["Ap"] = "INAT_MAKE_IMM(INAT_IMM_PTR)"
-+	imm_flag["Iz"] = "INAT_MAKE_IMM(INAT_IMM_VWORD32)"
-+	imm_flag["Jz"] = "INAT_MAKE_IMM(INAT_IMM_VWORD32)"
-+	imm_flag["Iv"] = "INAT_MAKE_IMM(INAT_IMM_VWORD)"
-+	imm_flag["Ob"] = "INAT_MOFFSET"
-+	imm_flag["Ov"] = "INAT_MOFFSET"
-+	imm_flag["Lx"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
-+
-+	modrm_expr = "^([CDEGMNPQRSUVW/][a-z]+|NTA|T[012])"
-+	force64_expr = "\\([df]64\\)"
-+	rex_expr = "^REX(\\.[XRWB]+)*"
-+	fpu_expr = "^ESC" # TODO
-+
-+	lprefix1_expr = "\\((66|!F3)\\)"
-+	lprefix2_expr = "\\(F3\\)"
-+	lprefix3_expr = "\\((F2|!F3|66&F2)\\)"
-+	lprefix_expr = "\\((66|F2|F3)\\)"
-+	max_lprefix = 4
-+
-+	# All opcodes starting with lower-case 'v', 'k' or with (v1) superscript
-+	# accepts VEX prefix
-+	vexok_opcode_expr = "^[vk].*"
-+	vexok_expr = "\\(v1\\)"
-+	# All opcodes with (v) superscript supports *only* VEX prefix
-+	vexonly_expr = "\\(v\\)"
-+	# All opcodes with (ev) superscript supports *only* EVEX prefix
-+	evexonly_expr = "\\(ev\\)"
-+
-+	prefix_expr = "\\(Prefix\\)"
-+	prefix_num["Operand-Size"] = "INAT_PFX_OPNDSZ"
-+	prefix_num["REPNE"] = "INAT_PFX_REPNE"
-+	prefix_num["REP/REPE"] = "INAT_PFX_REPE"
-+	prefix_num["XACQUIRE"] = "INAT_PFX_REPNE"
-+	prefix_num["XRELEASE"] = "INAT_PFX_REPE"
-+	prefix_num["LOCK"] = "INAT_PFX_LOCK"
-+	prefix_num["SEG=CS"] = "INAT_PFX_CS"
-+	prefix_num["SEG=DS"] = "INAT_PFX_DS"
-+	prefix_num["SEG=ES"] = "INAT_PFX_ES"
-+	prefix_num["SEG=FS"] = "INAT_PFX_FS"
-+	prefix_num["SEG=GS"] = "INAT_PFX_GS"
-+	prefix_num["SEG=SS"] = "INAT_PFX_SS"
-+	prefix_num["Address-Size"] = "INAT_PFX_ADDRSZ"
-+	prefix_num["VEX+1byte"] = "INAT_PFX_VEX2"
-+	prefix_num["VEX+2byte"] = "INAT_PFX_VEX3"
-+	prefix_num["EVEX"] = "INAT_PFX_EVEX"
-+
-+	clear_vars()
-+}
-+
-+function semantic_error(msg) {
-+	print "Semantic error at " NR ": " msg > "/dev/stderr"
-+	exit 1
-+}
-+
-+function debug(msg) {
-+	print "DEBUG: " msg
-+}
-+
-+function array_size(arr,   i,c) {
-+	c = 0
-+	for (i in arr)
-+		c++
-+	return c
-+}
-+
-+/^Table:/ {
-+	print "/* " $0 " */"
-+	if (tname != "")
-+		semantic_error("Hit Table: before EndTable:.");
-+}
-+
-+/^Referrer:/ {
-+	if (NF != 1) {
-+		# escape opcode table
-+		ref = ""
-+		for (i = 2; i <= NF; i++)
-+			ref = ref $i
-+		eid = escape[ref]
-+		tname = sprintf("inat_escape_table_%d", eid)
-+	}
-+}
-+
-+/^AVXcode:/ {
-+	if (NF != 1) {
-+		# AVX/escape opcode table
-+		aid = $2
-+		if (gaid <= aid)
-+			gaid = aid + 1
-+		if (tname == "")	# AVX only opcode table
-+			tname = sprintf("inat_avx_table_%d", $2)
-+	}
-+	if (aid == -1 && eid == -1)	# primary opcode table
-+		tname = "inat_primary_table"
-+}
-+
-+/^GrpTable:/ {
-+	print "/* " $0 " */"
-+	if (!($2 in group))
-+		semantic_error("No group: " $2 )
-+	gid = group[$2]
-+	tname = "inat_group_table_" gid
-+}
-+
-+function print_table(tbl,name,fmt,n)
-+{
-+	print "const insn_attr_t " name " = {"
-+	for (i = 0; i < n; i++) {
-+		id = sprintf(fmt, i)
-+		if (tbl[id])
-+			print "	[" id "] = " tbl[id] ","
-+	}
-+	print "};"
-+}
-+
-+/^EndTable/ {
-+	if (gid != -1) {
-+		# print group tables
-+		if (array_size(table) != 0) {
-+			print_table(table, tname "[INAT_GROUP_TABLE_SIZE]",
-+				    "0x%x", 8)
-+			gtable[gid,0] = tname
-+		}
-+		if (array_size(lptable1) != 0) {
-+			print_table(lptable1, tname "_1[INAT_GROUP_TABLE_SIZE]",
-+				    "0x%x", 8)
-+			gtable[gid,1] = tname "_1"
-+		}
-+		if (array_size(lptable2) != 0) {
-+			print_table(lptable2, tname "_2[INAT_GROUP_TABLE_SIZE]",
-+				    "0x%x", 8)
-+			gtable[gid,2] = tname "_2"
-+		}
-+		if (array_size(lptable3) != 0) {
-+			print_table(lptable3, tname "_3[INAT_GROUP_TABLE_SIZE]",
-+				    "0x%x", 8)
-+			gtable[gid,3] = tname "_3"
-+		}
-+	} else {
-+		# print primary/escaped tables
-+		if (array_size(table) != 0) {
-+			print_table(table, tname "[INAT_OPCODE_TABLE_SIZE]",
-+				    "0x%02x", 256)
-+			etable[eid,0] = tname
-+			if (aid >= 0)
-+				atable[aid,0] = tname
-+		}
-+		if (array_size(lptable1) != 0) {
-+			print_table(lptable1,tname "_1[INAT_OPCODE_TABLE_SIZE]",
-+				    "0x%02x", 256)
-+			etable[eid,1] = tname "_1"
-+			if (aid >= 0)
-+				atable[aid,1] = tname "_1"
-+		}
-+		if (array_size(lptable2) != 0) {
-+			print_table(lptable2,tname "_2[INAT_OPCODE_TABLE_SIZE]",
-+				    "0x%02x", 256)
-+			etable[eid,2] = tname "_2"
-+			if (aid >= 0)
-+				atable[aid,2] = tname "_2"
-+		}
-+		if (array_size(lptable3) != 0) {
-+			print_table(lptable3,tname "_3[INAT_OPCODE_TABLE_SIZE]",
-+				    "0x%02x", 256)
-+			etable[eid,3] = tname "_3"
-+			if (aid >= 0)
-+				atable[aid,3] = tname "_3"
-+		}
-+	}
-+	print ""
-+	clear_vars()
-+}
-+
-+function add_flags(old,new) {
-+	if (old && new)
-+		return old " | " new
-+	else if (old)
-+		return old
-+	else
-+		return new
-+}
-+
-+# convert operands to flags.
-+function convert_operands(count,opnd,       i,j,imm,mod)
-+{
-+	imm = null
-+	mod = null
-+	for (j = 1; j <= count; j++) {
-+		i = opnd[j]
-+		if (match(i, imm_expr) == 1) {
-+			if (!imm_flag[i])
-+				semantic_error("Unknown imm opnd: " i)
-+			if (imm) {
-+				if (i != "Ib")
-+					semantic_error("Second IMM error")
-+				imm = add_flags(imm, "INAT_SCNDIMM")
-+			} else
-+				imm = imm_flag[i]
-+		} else if (match(i, modrm_expr))
-+			mod = "INAT_MODRM"
-+	}
-+	return add_flags(imm, mod)
-+}
-+
-+/^[0-9a-f]+:/ {
-+	if (NR == 1)
-+		next
-+	# get index
-+	idx = "0x" substr($1, 1, index($1,":") - 1)
-+	if (idx in table)
-+		semantic_error("Redefine " idx " in " tname)
-+
-+	# check if escaped opcode
-+	if ("escape" == $2) {
-+		if ($3 != "#")
-+			semantic_error("No escaped name")
-+		ref = ""
-+		for (i = 4; i <= NF; i++)
-+			ref = ref $i
-+		if (ref in escape)
-+			semantic_error("Redefine escape (" ref ")")
-+		escape[ref] = geid
-+		geid++
-+		table[idx] = "INAT_MAKE_ESCAPE(" escape[ref] ")"
-+		next
-+	}
-+
-+	variant = null
-+	# converts
-+	i = 2
-+	while (i <= NF) {
-+		opcode = $(i++)
-+		delete opnds
-+		ext = null
-+		flags = null
-+		opnd = null
-+		# parse one opcode
-+		if (match($i, opnd_expr)) {
-+			opnd = $i
-+			count = split($(i++), opnds, ",")
-+			flags = convert_operands(count, opnds)
-+		}
-+		if (match($i, ext_expr))
-+			ext = $(i++)
-+		if (match($i, sep_expr))
-+			i++
-+		else if (i < NF)
-+			semantic_error($i " is not a separator")
-+
-+		# check if group opcode
-+		if (match(opcode, group_expr)) {
-+			if (!(opcode in group)) {
-+				group[opcode] = ggid
-+				ggid++
-+			}
-+			flags = add_flags(flags, "INAT_MAKE_GROUP(" group[opcode] ")")
-+		}
-+		# check force(or default) 64bit
-+		if (match(ext, force64_expr))
-+			flags = add_flags(flags, "INAT_FORCE64")
-+
-+		# check REX prefix
-+		if (match(opcode, rex_expr))
-+			flags = add_flags(flags, "INAT_MAKE_PREFIX(INAT_PFX_REX)")
-+
-+		# check coprocessor escape : TODO
-+		if (match(opcode, fpu_expr))
-+			flags = add_flags(flags, "INAT_MODRM")
-+
-+		# check VEX codes
-+		if (match(ext, evexonly_expr))
-+			flags = add_flags(flags, "INAT_VEXOK | INAT_EVEXONLY")
-+		else if (match(ext, vexonly_expr))
-+			flags = add_flags(flags, "INAT_VEXOK | INAT_VEXONLY")
-+		else if (match(ext, vexok_expr) || match(opcode, vexok_opcode_expr))
-+			flags = add_flags(flags, "INAT_VEXOK")
-+
-+		# check prefixes
-+		if (match(ext, prefix_expr)) {
-+			if (!prefix_num[opcode])
-+				semantic_error("Unknown prefix: " opcode)
-+			flags = add_flags(flags, "INAT_MAKE_PREFIX(" prefix_num[opcode] ")")
-+		}
-+		if (length(flags) == 0)
-+			continue
-+		# check if last prefix
-+		if (match(ext, lprefix1_expr)) {
-+			lptable1[idx] = add_flags(lptable1[idx],flags)
-+			variant = "INAT_VARIANT"
-+		}
-+		if (match(ext, lprefix2_expr)) {
-+			lptable2[idx] = add_flags(lptable2[idx],flags)
-+			variant = "INAT_VARIANT"
-+		}
-+		if (match(ext, lprefix3_expr)) {
-+			lptable3[idx] = add_flags(lptable3[idx],flags)
-+			variant = "INAT_VARIANT"
-+		}
-+		if (!match(ext, lprefix_expr)){
-+			table[idx] = add_flags(table[idx],flags)
-+		}
-+	}
-+	if (variant)
-+		table[idx] = add_flags(table[idx],variant)
-+}
-+
-+END {
-+	if (awkchecked != "")
-+		exit 1
-+
-+	print "#ifndef __BOOT_COMPRESSED\n"
-+
-+	# print escape opcode map's array
-+	print "/* Escape opcode map array */"
-+	print "const insn_attr_t * const inat_escape_tables[INAT_ESC_MAX + 1]" \
-+	      "[INAT_LSTPFX_MAX + 1] = {"
-+	for (i = 0; i < geid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (etable[i,j])
-+				print "	["i"]["j"] = "etable[i,j]","
-+	print "};\n"
-+	# print group opcode map's array
-+	print "/* Group opcode map array */"
-+	print "const insn_attr_t * const inat_group_tables[INAT_GRP_MAX + 1]"\
-+	      "[INAT_LSTPFX_MAX + 1] = {"
-+	for (i = 0; i < ggid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (gtable[i,j])
-+				print "	["i"]["j"] = "gtable[i,j]","
-+	print "};\n"
-+	# print AVX opcode map's array
-+	print "/* AVX opcode map array */"
-+	print "const insn_attr_t * const inat_avx_tables[X86_VEX_M_MAX + 1]"\
-+	      "[INAT_LSTPFX_MAX + 1] = {"
-+	for (i = 0; i < gaid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (atable[i,j])
-+				print "	["i"]["j"] = "atable[i,j]","
-+	print "};\n"
-+
-+	print "#else /* !__BOOT_COMPRESSED */\n"
-+
-+	print "/* Escape opcode map array */"
-+	print "static const insn_attr_t *inat_escape_tables[INAT_ESC_MAX + 1]" \
-+	      "[INAT_LSTPFX_MAX + 1];"
-+	print ""
-+
-+	print "/* Group opcode map array */"
-+	print "static const insn_attr_t *inat_group_tables[INAT_GRP_MAX + 1]"\
-+	      "[INAT_LSTPFX_MAX + 1];"
-+	print ""
-+
-+	print "/* AVX opcode map array */"
-+	print "static const insn_attr_t *inat_avx_tables[X86_VEX_M_MAX + 1]"\
-+	      "[INAT_LSTPFX_MAX + 1];"
-+	print ""
-+
-+	print "static void inat_init_tables(void)"
-+	print "{"
-+
-+	# print escape opcode map's array
-+	print "\t/* Print Escape opcode map array */"
-+	for (i = 0; i < geid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (etable[i,j])
-+				print "\tinat_escape_tables["i"]["j"] = "etable[i,j]";"
-+	print ""
-+
-+	# print group opcode map's array
-+	print "\t/* Print Group opcode map array */"
-+	for (i = 0; i < ggid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (gtable[i,j])
-+				print "\tinat_group_tables["i"]["j"] = "gtable[i,j]";"
-+	print ""
-+	# print AVX opcode map's array
-+	print "\t/* Print AVX opcode map array */"
-+	for (i = 0; i < gaid; i++)
-+		for (j = 0; j < max_lprefix; j++)
-+			if (atable[i,j])
-+				print "\tinat_avx_tables["i"]["j"] = "atable[i,j]";"
-+
-+	print "}"
-+	print "#endif"
-+}
-+
-diff --git a/test/elemnew4.in b/test/elemnew4.in
-new file mode 100644
-index 0000000..d12d135
---- /dev/null
-+++ b/test/elemnew4.in
-@@ -0,0 +1,1188 @@
-+# x86 Opcode Maps
-+#
-+# This is (mostly) based on following documentations.
-+# - Intel(R) 64 and IA-32 Architectures Software Developer's Manual Vol.2C
-+#   (#326018-047US, June 2013)
-+#
-+#<Opcode maps>
-+# Table: table-name
-+# Referrer: escaped-name
-+# AVXcode: avx-code
-+# opcode: mnemonic|GrpXXX [operand1[,operand2...]] [(extra1)[,(extra2)...] [| 2nd-mnemonic ...]
-+# (or)
-+# opcode: escape # escaped-name
-+# EndTable
-+#
-+# mnemonics that begin with lowercase 'v' accept a VEX or EVEX prefix
-+# mnemonics that begin with lowercase 'k' accept a VEX prefix
-+#
-+#<group maps>
-+# GrpTable: GrpXXX
-+# reg:  mnemonic [operand1[,operand2...]] [(extra1)[,(extra2)...] [| 2nd-mnemonic ...]
-+# EndTable
-+#
-+# AVX Superscripts
-+#  (ev): this opcode requires EVEX prefix.
-+#  (evo): this opcode is changed by EVEX prefix (EVEX opcode)
-+#  (v): this opcode requires VEX prefix.
-+#  (v1): this opcode only supports 128bit VEX.
-+#
-+# Last Prefix Superscripts
-+#  - (66): the last prefix is 0x66
-+#  - (F3): the last prefix is 0xF3
-+#  - (F2): the last prefix is 0xF2
-+#  - (!F3) : the last prefix is not 0xF3 (including non-last prefix case)
-+#  - (66&F2): Both 0x66 and 0xF2 prefixes are specified.
-+
-+Table: one byte opcode
-+Referrer:
-+AVXcode:
-+# 0x00 - 0x0f
-+00: ADD Eb,Gb
-+01: ADD Ev,Gv
-+02: ADD Gb,Eb
-+03: ADD Gv,Ev
-+04: ADD AL,Ib
-+05: ADD rAX,Iz
-+06: PUSH ES (i64)
-+07: POP ES (i64)
-+08: OR Eb,Gb
-+09: OR Ev,Gv
-+0a: OR Gb,Eb
-+0b: OR Gv,Ev
-+0c: OR AL,Ib
-+0d: OR rAX,Iz
-+0e: PUSH CS (i64)
-+0f: escape # 2-byte escape
-+# 0x10 - 0x1f
-+10: ADC Eb,Gb
-+11: ADC Ev,Gv
-+12: ADC Gb,Eb
-+13: ADC Gv,Ev
-+14: ADC AL,Ib
-+15: ADC rAX,Iz
-+16: PUSH SS (i64)
-+17: POP SS (i64)
-+18: SBB Eb,Gb
-+19: SBB Ev,Gv
-+1a: SBB Gb,Eb
-+1b: SBB Gv,Ev
-+1c: SBB AL,Ib
-+1d: SBB rAX,Iz
-+1e: PUSH DS (i64)
-+1f: POP DS (i64)
-+# 0x20 - 0x2f
-+20: AND Eb,Gb
-+21: AND Ev,Gv
-+22: AND Gb,Eb
-+23: AND Gv,Ev
-+24: AND AL,Ib
-+25: AND rAx,Iz
-+26: SEG=ES (Prefix)
-+27: DAA (i64)
-+28: SUB Eb,Gb
-+29: SUB Ev,Gv
-+2a: SUB Gb,Eb
-+2b: SUB Gv,Ev
-+2c: SUB AL,Ib
-+2d: SUB rAX,Iz
-+2e: SEG=CS (Prefix)
-+2f: DAS (i64)
-+# 0x30 - 0x3f
-+30: XOR Eb,Gb
-+31: XOR Ev,Gv
-+32: XOR Gb,Eb
-+33: XOR Gv,Ev
-+34: XOR AL,Ib
-+35: XOR rAX,Iz
-+36: SEG=SS (Prefix)
-+37: AAA (i64)
-+38: CMP Eb,Gb
-+39: CMP Ev,Gv
-+3a: CMP Gb,Eb
-+3b: CMP Gv,Ev
-+3c: CMP AL,Ib
-+3d: CMP rAX,Iz
-+3e: SEG=DS (Prefix)
-+3f: AAS (i64)
-+# 0x40 - 0x4f
-+40: INC eAX (i64) | REX (o64)
-+41: INC eCX (i64) | REX.B (o64)
-+42: INC eDX (i64) | REX.X (o64)
-+43: INC eBX (i64) | REX.XB (o64)
-+44: INC eSP (i64) | REX.R (o64)
-+45: INC eBP (i64) | REX.RB (o64)
-+46: INC eSI (i64) | REX.RX (o64)
-+47: INC eDI (i64) | REX.RXB (o64)
-+48: DEC eAX (i64) | REX.W (o64)
-+49: DEC eCX (i64) | REX.WB (o64)
-+4a: DEC eDX (i64) | REX.WX (o64)
-+4b: DEC eBX (i64) | REX.WXB (o64)
-+4c: DEC eSP (i64) | REX.WR (o64)
-+4d: DEC eBP (i64) | REX.WRB (o64)
-+4e: DEC eSI (i64) | REX.WRX (o64)
-+4f: DEC eDI (i64) | REX.WRXB (o64)
-+# 0x50 - 0x5f
-+50: PUSH rAX/r8 (d64)
-+51: PUSH rCX/r9 (d64)
-+52: PUSH rDX/r10 (d64)
-+53: PUSH rBX/r11 (d64)
-+54: PUSH rSP/r12 (d64)
-+55: PUSH rBP/r13 (d64)
-+56: PUSH rSI/r14 (d64)
-+57: PUSH rDI/r15 (d64)
-+58: POP rAX/r8 (d64)
-+59: POP rCX/r9 (d64)
-+5a: POP rDX/r10 (d64)
-+5b: POP rBX/r11 (d64)
-+5c: POP rSP/r12 (d64)
-+5d: POP rBP/r13 (d64)
-+5e: POP rSI/r14 (d64)
-+5f: POP rDI/r15 (d64)
-+# 0x60 - 0x6f
-+60: PUSHA/PUSHAD (i64)
-+61: POPA/POPAD (i64)
-+62: BOUND Gv,Ma (i64) | EVEX (Prefix)
-+63: ARPL Ew,Gw (i64) | MOVSXD Gv,Ev (o64)
-+64: SEG=FS (Prefix)
-+65: SEG=GS (Prefix)
-+66: Operand-Size (Prefix)
-+67: Address-Size (Prefix)
-+68: PUSH Iz (d64)
-+69: IMUL Gv,Ev,Iz
-+6a: PUSH Ib (d64)
-+6b: IMUL Gv,Ev,Ib
-+6c: INS/INSB Yb,DX
-+6d: INS/INSW/INSD Yz,DX
-+6e: OUTS/OUTSB DX,Xb
-+6f: OUTS/OUTSW/OUTSD DX,Xz
-+# 0x70 - 0x7f
-+70: JO Jb
-+71: JNO Jb
-+72: JB/JNAE/JC Jb
-+73: JNB/JAE/JNC Jb
-+74: JZ/JE Jb
-+75: JNZ/JNE Jb
-+76: JBE/JNA Jb
-+77: JNBE/JA Jb
-+78: JS Jb
-+79: JNS Jb
-+7a: JP/JPE Jb
-+7b: JNP/JPO Jb
-+7c: JL/JNGE Jb
-+7d: JNL/JGE Jb
-+7e: JLE/JNG Jb
-+7f: JNLE/JG Jb
-+# 0x80 - 0x8f
-+80: Grp1 Eb,Ib (1A)
-+81: Grp1 Ev,Iz (1A)
-+82: Grp1 Eb,Ib (1A),(i64)
-+83: Grp1 Ev,Ib (1A)
-+84: TEST Eb,Gb
-+85: TEST Ev,Gv
-+86: XCHG Eb,Gb
-+87: XCHG Ev,Gv
-+88: MOV Eb,Gb
-+89: MOV Ev,Gv
-+8a: MOV Gb,Eb
-+8b: MOV Gv,Ev
-+8c: MOV Ev,Sw
-+8d: LEA Gv,M
-+8e: MOV Sw,Ew
-+8f: Grp1A (1A) | POP Ev (d64)
-+# 0x90 - 0x9f
-+90: NOP | PAUSE (F3) | XCHG r8,rAX
-+91: XCHG rCX/r9,rAX
-+92: XCHG rDX/r10,rAX
-+93: XCHG rBX/r11,rAX
-+94: XCHG rSP/r12,rAX
-+95: XCHG rBP/r13,rAX
-+96: XCHG rSI/r14,rAX
-+97: XCHG rDI/r15,rAX
-+98: CBW/CWDE/CDQE
-+99: CWD/CDQ/CQO
-+9a: CALLF Ap (i64)
-+9b: FWAIT/WAIT
-+9c: PUSHF/D/Q Fv (d64)
-+9d: POPF/D/Q Fv (d64)
-+9e: SAHF
-+9f: LAHF
-+# 0xa0 - 0xaf
-+a0: MOV AL,Ob
-+a1: MOV rAX,Ov
-+a2: MOV Ob,AL
-+a3: MOV Ov,rAX
-+a4: MOVS/B Yb,Xb
-+a5: MOVS/W/D/Q Yv,Xv
-+a6: CMPS/B Xb,Yb
-+a7: CMPS/W/D Xv,Yv
-+a8: TEST AL,Ib
-+a9: TEST rAX,Iz
-+aa: STOS/B Yb,AL
-+ab: STOS/W/D/Q Yv,rAX
-+ac: LODS/B AL,Xb
-+ad: LODS/W/D/Q rAX,Xv
-+ae: SCAS/B AL,Yb
-+# Note: The May 2011 Intel manual shows Xv for the second parameter of the
-+# next instruction but Yv is correct
-+af: SCAS/W/D/Q rAX,Yv
-+# 0xb0 - 0xbf
-+b0: MOV AL/R8L,Ib
-+b1: MOV CL/R9L,Ib
-+b2: MOV DL/R10L,Ib
-+b3: MOV BL/R11L,Ib
-+b4: MOV AH/R12L,Ib
-+b5: MOV CH/R13L,Ib
-+b6: MOV DH/R14L,Ib
-+b7: MOV BH/R15L,Ib
-+b8: MOV rAX/r8,Iv
-+b9: MOV rCX/r9,Iv
-+ba: MOV rDX/r10,Iv
-+bb: MOV rBX/r11,Iv
-+bc: MOV rSP/r12,Iv
-+bd: MOV rBP/r13,Iv
-+be: MOV rSI/r14,Iv
-+bf: MOV rDI/r15,Iv
-+# 0xc0 - 0xcf
-+c0: Grp2 Eb,Ib (1A)
-+c1: Grp2 Ev,Ib (1A)
-+c2: RETN Iw (f64)
-+c3: RETN
-+c4: LES Gz,Mp (i64) | VEX+2byte (Prefix)
-+c5: LDS Gz,Mp (i64) | VEX+1byte (Prefix)
-+c6: Grp11A Eb,Ib (1A)
-+c7: Grp11B Ev,Iz (1A)
-+c8: ENTER Iw,Ib
-+c9: LEAVE (d64)
-+ca: RETF Iw
-+cb: RETF
-+cc: INT3
-+cd: INT Ib
-+ce: INTO (i64)
-+cf: IRET/D/Q
-+# 0xd0 - 0xdf
-+d0: Grp2 Eb,1 (1A)
-+d1: Grp2 Ev,1 (1A)
-+d2: Grp2 Eb,CL (1A)
-+d3: Grp2 Ev,CL (1A)
-+d4: AAM Ib (i64)
-+d5: AAD Ib (i64)
-+d6:
-+d7: XLAT/XLATB
-+d8: ESC
-+d9: ESC
-+da: ESC
-+db: ESC
-+dc: ESC
-+dd: ESC
-+de: ESC
-+df: ESC
-+# 0xe0 - 0xef
-+# Note: "forced64" is Intel CPU behavior: they ignore 0x66 prefix
-+# in 64-bit mode. AMD CPUs accept 0x66 prefix, it causes RIP truncation
-+# to 16 bits. In 32-bit mode, 0x66 is accepted by both Intel and AMD.
-+e0: LOOPNE/LOOPNZ Jb (f64)
-+e1: LOOPE/LOOPZ Jb (f64)
-+e2: LOOP Jb (f64)
-+e3: JrCXZ Jb (f64)
-+e4: IN AL,Ib
-+e5: IN eAX,Ib
-+e6: OUT Ib,AL
-+e7: OUT Ib,eAX
-+# With 0x66 prefix in 64-bit mode, for AMD CPUs immediate offset
-+# in "near" jumps and calls is 16-bit. For CALL,
-+# push of return address is 16-bit wide, RSP is decremented by 2
-+# but is not truncated to 16 bits, unlike RIP.
-+e8: CALL Jz (f64)
-+e9: JMP-near Jz (f64)
-+ea: JMP-far Ap (i64)
-+eb: JMP-short Jb (f64)
-+ec: IN AL,DX
-+ed: IN eAX,DX
-+ee: OUT DX,AL
-+ef: OUT DX,eAX
-+# 0xf0 - 0xff
-+f0: LOCK (Prefix)
-+f1:
-+f2: REPNE (Prefix) | XACQUIRE (Prefix)
-+f3: REP/REPE (Prefix) | XRELEASE (Prefix)
-+f4: HLT
-+f5: CMC
-+f6: Grp3_1 Eb (1A)
-+f7: Grp3_2 Ev (1A)
-+f8: CLC
-+f9: STC
-+fa: CLI
-+fb: STI
-+fc: CLD
-+fd: STD
-+fe: Grp4 (1A)
-+ff: Grp5 (1A)
-+EndTable
-+
-+Table: 2-byte opcode (0x0f)
-+Referrer: 2-byte escape
-+AVXcode: 1
-+# 0x0f 0x00-0x0f
-+00: Grp6 (1A)
-+01: Grp7 (1A)
-+02: LAR Gv,Ew
-+03: LSL Gv,Ew
-+04:
-+05: SYSCALL (o64)
-+06: CLTS
-+07: SYSRET (o64)
-+08: INVD
-+09: WBINVD | WBNOINVD (F3)
-+0a:
-+0b: UD2 (1B)
-+0c:
-+# AMD's prefetch group. Intel supports prefetchw(/1) only.
-+0d: GrpP
-+0e: FEMMS
-+# 3DNow! uses the last imm byte as opcode extension.
-+0f: 3DNow! Pq,Qq,Ib
-+# 0x0f 0x10-0x1f
-+# NOTE: According to Intel SDM opcode map, vmovups and vmovupd has no operands
-+# but it actually has operands. And also, vmovss and vmovsd only accept 128bit.
-+# MOVSS/MOVSD has too many forms(3) on SDM. This map just shows a typical form.
-+# Many AVX instructions lack v1 superscript, according to Intel AVX-Prgramming
-+# Reference A.1
-+10: vmovups Vps,Wps | vmovupd Vpd,Wpd (66) | vmovss Vx,Hx,Wss (F3),(v1) | vmovsd Vx,Hx,Wsd (F2),(v1)
-+11: vmovups Wps,Vps | vmovupd Wpd,Vpd (66) | vmovss Wss,Hx,Vss (F3),(v1) | vmovsd Wsd,Hx,Vsd (F2),(v1)
-+12: vmovlps Vq,Hq,Mq (v1) | vmovhlps Vq,Hq,Uq (v1) | vmovlpd Vq,Hq,Mq (66),(v1) | vmovsldup Vx,Wx (F3) | vmovddup Vx,Wx (F2)
-+13: vmovlps Mq,Vq (v1) | vmovlpd Mq,Vq (66),(v1)
-+14: vunpcklps Vx,Hx,Wx | vunpcklpd Vx,Hx,Wx (66)
-+15: vunpckhps Vx,Hx,Wx | vunpckhpd Vx,Hx,Wx (66)
-+16: vmovhps Vdq,Hq,Mq (v1) | vmovlhps Vdq,Hq,Uq (v1) | vmovhpd Vdq,Hq,Mq (66),(v1) | vmovshdup Vx,Wx (F3)
-+17: vmovhps Mq,Vq (v1) | vmovhpd Mq,Vq (66),(v1)
-+18: Grp16 (1A)
-+19:
-+# Intel SDM opcode map does not list MPX instructions. For now using Gv for
-+# bnd registers and Ev for everything else is OK because the instruction
-+# decoder does not use the information except as an indication that there is
-+# a ModR/M byte.
-+1a: BNDCL Gv,Ev (F3) | BNDCU Gv,Ev (F2) | BNDMOV Gv,Ev (66) | BNDLDX Gv,Ev
-+1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv
-+1c: Grp20 (1A),(1C)
-+1d:
-+1e: Grp21 (1A)
-+1f: NOP Ev
-+# 0x0f 0x20-0x2f
-+20: MOV Rd,Cd
-+21: MOV Rd,Dd
-+22: MOV Cd,Rd
-+23: MOV Dd,Rd
-+24:
-+25:
-+26:
-+27:
-+28: vmovaps Vps,Wps | vmovapd Vpd,Wpd (66)
-+29: vmovaps Wps,Vps | vmovapd Wpd,Vpd (66)
-+2a: cvtpi2ps Vps,Qpi | cvtpi2pd Vpd,Qpi (66) | vcvtsi2ss Vss,Hss,Ey (F3),(v1) | vcvtsi2sd Vsd,Hsd,Ey (F2),(v1)
-+2b: vmovntps Mps,Vps | vmovntpd Mpd,Vpd (66)
-+2c: cvttps2pi Ppi,Wps | cvttpd2pi Ppi,Wpd (66) | vcvttss2si Gy,Wss (F3),(v1) | vcvttsd2si Gy,Wsd (F2),(v1)
-+2d: cvtps2pi Ppi,Wps | cvtpd2pi Qpi,Wpd (66) | vcvtss2si Gy,Wss (F3),(v1) | vcvtsd2si Gy,Wsd (F2),(v1)
-+2e: vucomiss Vss,Wss (v1) | vucomisd  Vsd,Wsd (66),(v1)
-+2f: vcomiss Vss,Wss (v1) | vcomisd  Vsd,Wsd (66),(v1)
-+# 0x0f 0x30-0x3f
-+30: WRMSR
-+31: RDTSC
-+32: RDMSR
-+33: RDPMC
-+34: SYSENTER
-+35: SYSEXIT
-+36:
-+37: GETSEC
-+38: escape # 3-byte escape 1
-+39:
-+3a: escape # 3-byte escape 2
-+3b:
-+3c:
-+3d:
-+3e:
-+3f:
-+# 0x0f 0x40-0x4f
-+40: CMOVO Gv,Ev
-+41: CMOVNO Gv,Ev | kandw/q Vk,Hk,Uk | kandb/d Vk,Hk,Uk (66)
-+42: CMOVB/C/NAE Gv,Ev | kandnw/q Vk,Hk,Uk | kandnb/d Vk,Hk,Uk (66)
-+43: CMOVAE/NB/NC Gv,Ev
-+44: CMOVE/Z Gv,Ev | knotw/q Vk,Uk | knotb/d Vk,Uk (66)
-+45: CMOVNE/NZ Gv,Ev | korw/q Vk,Hk,Uk | korb/d Vk,Hk,Uk (66)
-+46: CMOVBE/NA Gv,Ev | kxnorw/q Vk,Hk,Uk | kxnorb/d Vk,Hk,Uk (66)
-+47: CMOVA/NBE Gv,Ev | kxorw/q Vk,Hk,Uk | kxorb/d Vk,Hk,Uk (66)
-+48: CMOVS Gv,Ev
-+49: CMOVNS Gv,Ev
-+4a: CMOVP/PE Gv,Ev | kaddw/q Vk,Hk,Uk | kaddb/d Vk,Hk,Uk (66)
-+4b: CMOVNP/PO Gv,Ev | kunpckbw Vk,Hk,Uk (66) | kunpckwd/dq Vk,Hk,Uk
-+4c: CMOVL/NGE Gv,Ev
-+4d: CMOVNL/GE Gv,Ev
-+4e: CMOVLE/NG Gv,Ev
-+4f: CMOVNLE/G Gv,Ev
-+# 0x0f 0x50-0x5f
-+50: vmovmskps Gy,Ups | vmovmskpd Gy,Upd (66)
-+51: vsqrtps Vps,Wps | vsqrtpd Vpd,Wpd (66) | vsqrtss Vss,Hss,Wss (F3),(v1) | vsqrtsd Vsd,Hsd,Wsd (F2),(v1)
-+52: vrsqrtps Vps,Wps | vrsqrtss Vss,Hss,Wss (F3),(v1)
-+53: vrcpps Vps,Wps | vrcpss Vss,Hss,Wss (F3),(v1)
-+54: vandps Vps,Hps,Wps | vandpd Vpd,Hpd,Wpd (66)
-+55: vandnps Vps,Hps,Wps | vandnpd Vpd,Hpd,Wpd (66)
-+56: vorps Vps,Hps,Wps | vorpd Vpd,Hpd,Wpd (66)
-+57: vxorps Vps,Hps,Wps | vxorpd Vpd,Hpd,Wpd (66)
-+58: vaddps Vps,Hps,Wps | vaddpd Vpd,Hpd,Wpd (66) | vaddss Vss,Hss,Wss (F3),(v1) | vaddsd Vsd,Hsd,Wsd (F2),(v1)
-+59: vmulps Vps,Hps,Wps | vmulpd Vpd,Hpd,Wpd (66) | vmulss Vss,Hss,Wss (F3),(v1) | vmulsd Vsd,Hsd,Wsd (F2),(v1)
-+5a: vcvtps2pd Vpd,Wps | vcvtpd2ps Vps,Wpd (66) | vcvtss2sd Vsd,Hx,Wss (F3),(v1) | vcvtsd2ss Vss,Hx,Wsd (F2),(v1)
-+5b: vcvtdq2ps Vps,Wdq | vcvtqq2ps Vps,Wqq (evo) | vcvtps2dq Vdq,Wps (66) | vcvttps2dq Vdq,Wps (F3)
-+5c: vsubps Vps,Hps,Wps | vsubpd Vpd,Hpd,Wpd (66) | vsubss Vss,Hss,Wss (F3),(v1) | vsubsd Vsd,Hsd,Wsd (F2),(v1)
-+5d: vminps Vps,Hps,Wps | vminpd Vpd,Hpd,Wpd (66) | vminss Vss,Hss,Wss (F3),(v1) | vminsd Vsd,Hsd,Wsd (F2),(v1)
-+5e: vdivps Vps,Hps,Wps | vdivpd Vpd,Hpd,Wpd (66) | vdivss Vss,Hss,Wss (F3),(v1) | vdivsd Vsd,Hsd,Wsd (F2),(v1)
-+5f: vmaxps Vps,Hps,Wps | vmaxpd Vpd,Hpd,Wpd (66) | vmaxss Vss,Hss,Wss (F3),(v1) | vmaxsd Vsd,Hsd,Wsd (F2),(v1)
-+# 0x0f 0x60-0x6f
-+60: punpcklbw Pq,Qd | vpunpcklbw Vx,Hx,Wx (66),(v1)
-+61: punpcklwd Pq,Qd | vpunpcklwd Vx,Hx,Wx (66),(v1)
-+62: punpckldq Pq,Qd | vpunpckldq Vx,Hx,Wx (66),(v1)
-+63: packsswb Pq,Qq | vpacksswb Vx,Hx,Wx (66),(v1)
-+64: pcmpgtb Pq,Qq | vpcmpgtb Vx,Hx,Wx (66),(v1)
-+65: pcmpgtw Pq,Qq | vpcmpgtw Vx,Hx,Wx (66),(v1)
-+66: pcmpgtd Pq,Qq | vpcmpgtd Vx,Hx,Wx (66),(v1)
-+67: packuswb Pq,Qq | vpackuswb Vx,Hx,Wx (66),(v1)
-+68: punpckhbw Pq,Qd | vpunpckhbw Vx,Hx,Wx (66),(v1)
-+69: punpckhwd Pq,Qd | vpunpckhwd Vx,Hx,Wx (66),(v1)
-+6a: punpckhdq Pq,Qd | vpunpckhdq Vx,Hx,Wx (66),(v1)
-+6b: packssdw Pq,Qd | vpackssdw Vx,Hx,Wx (66),(v1)
-+6c: vpunpcklqdq Vx,Hx,Wx (66),(v1)
-+6d: vpunpckhqdq Vx,Hx,Wx (66),(v1)
-+6e: movd/q Pd,Ey | vmovd/q Vy,Ey (66),(v1)
-+6f: movq Pq,Qq | vmovdqa Vx,Wx (66) | vmovdqa32/64 Vx,Wx (66),(evo) | vmovdqu Vx,Wx (F3) | vmovdqu32/64 Vx,Wx (F3),(evo) | vmovdqu8/16 Vx,Wx (F2),(ev)
-+# 0x0f 0x70-0x7f
-+70: pshufw Pq,Qq,Ib | vpshufd Vx,Wx,Ib (66),(v1) | vpshufhw Vx,Wx,Ib (F3),(v1) | vpshuflw Vx,Wx,Ib (F2),(v1)
-+71: Grp12 (1A)
-+72: Grp13 (1A)
-+73: Grp14 (1A)
-+74: pcmpeqb Pq,Qq | vpcmpeqb Vx,Hx,Wx (66),(v1)
-+75: pcmpeqw Pq,Qq | vpcmpeqw Vx,Hx,Wx (66),(v1)
-+76: pcmpeqd Pq,Qq | vpcmpeqd Vx,Hx,Wx (66),(v1)
-+# Note: Remove (v), because vzeroall and vzeroupper becomes emms without VEX.
-+77: emms | vzeroupper | vzeroall
-+78: VMREAD Ey,Gy | vcvttps2udq/pd2udq Vx,Wpd (evo) | vcvttsd2usi Gv,Wx (F2),(ev) | vcvttss2usi Gv,Wx (F3),(ev) | vcvttps2uqq/pd2uqq Vx,Wx (66),(ev)
-+79: VMWRITE Gy,Ey | vcvtps2udq/pd2udq Vx,Wpd (evo) | vcvtsd2usi Gv,Wx (F2),(ev) | vcvtss2usi Gv,Wx (F3),(ev) | vcvtps2uqq/pd2uqq Vx,Wx (66),(ev)
-+7a: vcvtudq2pd/uqq2pd Vpd,Wx (F3),(ev) | vcvtudq2ps/uqq2ps Vpd,Wx (F2),(ev) | vcvttps2qq/pd2qq Vx,Wx (66),(ev)
-+7b: vcvtusi2sd Vpd,Hpd,Ev (F2),(ev) | vcvtusi2ss Vps,Hps,Ev (F3),(ev) | vcvtps2qq/pd2qq Vx,Wx (66),(ev)
-+7c: vhaddpd Vpd,Hpd,Wpd (66) | vhaddps Vps,Hps,Wps (F2)
-+7d: vhsubpd Vpd,Hpd,Wpd (66) | vhsubps Vps,Hps,Wps (F2)
-+7e: movd/q Ey,Pd | vmovd/q Ey,Vy (66),(v1) | vmovq Vq,Wq (F3),(v1)
-+7f: movq Qq,Pq | vmovdqa Wx,Vx (66) | vmovdqa32/64 Wx,Vx (66),(evo) | vmovdqu Wx,Vx (F3) | vmovdqu32/64 Wx,Vx (F3),(evo) | vmovdqu8/16 Wx,Vx (F2),(ev)
-+# 0x0f 0x80-0x8f
-+# Note: "forced64" is Intel CPU behavior (see comment about CALL insn).
-+80: JO Jz (f64)
-+81: JNO Jz (f64)
-+82: JB/JC/JNAE Jz (f64)
-+83: JAE/JNB/JNC Jz (f64)
-+84: JE/JZ Jz (f64)
-+85: JNE/JNZ Jz (f64)
-+86: JBE/JNA Jz (f64)
-+87: JA/JNBE Jz (f64)
-+88: JS Jz (f64)
-+89: JNS Jz (f64)
-+8a: JP/JPE Jz (f64)
-+8b: JNP/JPO Jz (f64)
-+8c: JL/JNGE Jz (f64)
-+8d: JNL/JGE Jz (f64)
-+8e: JLE/JNG Jz (f64)
-+8f: JNLE/JG Jz (f64)
-+# 0x0f 0x90-0x9f
-+90: SETO Eb | kmovw/q Vk,Wk | kmovb/d Vk,Wk (66)
-+91: SETNO Eb | kmovw/q Mv,Vk | kmovb/d Mv,Vk (66)
-+92: SETB/C/NAE Eb | kmovw Vk,Rv | kmovb Vk,Rv (66) | kmovq/d Vk,Rv (F2)
-+93: SETAE/NB/NC Eb | kmovw Gv,Uk | kmovb Gv,Uk (66) | kmovq/d Gv,Uk (F2)
-+94: SETE/Z Eb
-+95: SETNE/NZ Eb
-+96: SETBE/NA Eb
-+97: SETA/NBE Eb
-+98: SETS Eb | kortestw/q Vk,Uk | kortestb/d Vk,Uk (66)
-+99: SETNS Eb | ktestw/q Vk,Uk | ktestb/d Vk,Uk (66)
-+9a: SETP/PE Eb
-+9b: SETNP/PO Eb
-+9c: SETL/NGE Eb
-+9d: SETNL/GE Eb
-+9e: SETLE/NG Eb
-+9f: SETNLE/G Eb
-+# 0x0f 0xa0-0xaf
-+a0: PUSH FS (d64)
-+a1: POP FS (d64)
-+a2: CPUID
-+a3: BT Ev,Gv
-+a4: SHLD Ev,Gv,Ib
-+a5: SHLD Ev,Gv,CL
-+a6: GrpPDLK
-+a7: GrpRNG
-+a8: PUSH GS (d64)
-+a9: POP GS (d64)
-+aa: RSM
-+ab: BTS Ev,Gv
-+ac: SHRD Ev,Gv,Ib
-+ad: SHRD Ev,Gv,CL
-+ae: Grp15 (1A),(1C)
-+af: IMUL Gv,Ev
-+# 0x0f 0xb0-0xbf
-+b0: CMPXCHG Eb,Gb
-+b1: CMPXCHG Ev,Gv
-+b2: LSS Gv,Mp
-+b3: BTR Ev,Gv
-+b4: LFS Gv,Mp
-+b5: LGS Gv,Mp
-+b6: MOVZX Gv,Eb
-+b7: MOVZX Gv,Ew
-+b8: JMPE (!F3) | POPCNT Gv,Ev (F3)
-+b9: Grp10 (1A)
-+ba: Grp8 Ev,Ib (1A)
-+bb: BTC Ev,Gv
-+bc: BSF Gv,Ev (!F3) | TZCNT Gv,Ev (F3)
-+bd: BSR Gv,Ev (!F3) | LZCNT Gv,Ev (F3)
-+be: MOVSX Gv,Eb
-+bf: MOVSX Gv,Ew
-+# 0x0f 0xc0-0xcf
-+c0: XADD Eb,Gb
-+c1: XADD Ev,Gv
-+c2: vcmpps Vps,Hps,Wps,Ib | vcmppd Vpd,Hpd,Wpd,Ib (66) | vcmpss Vss,Hss,Wss,Ib (F3),(v1) | vcmpsd Vsd,Hsd,Wsd,Ib (F2),(v1)
-+c3: movnti My,Gy
-+c4: pinsrw Pq,Ry/Mw,Ib | vpinsrw Vdq,Hdq,Ry/Mw,Ib (66),(v1)
-+c5: pextrw Gd,Nq,Ib | vpextrw Gd,Udq,Ib (66),(v1)
-+c6: vshufps Vps,Hps,Wps,Ib | vshufpd Vpd,Hpd,Wpd,Ib (66)
-+c7: Grp9 (1A)
-+c8: BSWAP RAX/EAX/R8/R8D
-+c9: BSWAP RCX/ECX/R9/R9D
-+ca: BSWAP RDX/EDX/R10/R10D
-+cb: BSWAP RBX/EBX/R11/R11D
-+cc: BSWAP RSP/ESP/R12/R12D
-+cd: BSWAP RBP/EBP/R13/R13D
-+ce: BSWAP RSI/ESI/R14/R14D
-+cf: BSWAP RDI/EDI/R15/R15D
-+# 0x0f 0xd0-0xdf
-+d0: vaddsubpd Vpd,Hpd,Wpd (66) | vaddsubps Vps,Hps,Wps (F2)
-+d1: psrlw Pq,Qq | vpsrlw Vx,Hx,Wx (66),(v1)
-+d2: psrld Pq,Qq | vpsrld Vx,Hx,Wx (66),(v1)
-+d3: psrlq Pq,Qq | vpsrlq Vx,Hx,Wx (66),(v1)
-+d4: paddq Pq,Qq | vpaddq Vx,Hx,Wx (66),(v1)
-+d5: pmullw Pq,Qq | vpmullw Vx,Hx,Wx (66),(v1)
-+d6: vmovq Wq,Vq (66),(v1) | movq2dq Vdq,Nq (F3) | movdq2q Pq,Uq (F2)
-+d7: pmovmskb Gd,Nq | vpmovmskb Gd,Ux (66),(v1)
-+d8: psubusb Pq,Qq | vpsubusb Vx,Hx,Wx (66),(v1)
-+d9: psubusw Pq,Qq | vpsubusw Vx,Hx,Wx (66),(v1)
-+da: pminub Pq,Qq | vpminub Vx,Hx,Wx (66),(v1)
-+db: pand Pq,Qq | vpand Vx,Hx,Wx (66),(v1) | vpandd/q Vx,Hx,Wx (66),(evo)
-+dc: paddusb Pq,Qq | vpaddusb Vx,Hx,Wx (66),(v1)
-+dd: paddusw Pq,Qq | vpaddusw Vx,Hx,Wx (66),(v1)
-+de: pmaxub Pq,Qq | vpmaxub Vx,Hx,Wx (66),(v1)
-+df: pandn Pq,Qq | vpandn Vx,Hx,Wx (66),(v1) | vpandnd/q Vx,Hx,Wx (66),(evo)
-+# 0x0f 0xe0-0xef
-+e0: pavgb Pq,Qq | vpavgb Vx,Hx,Wx (66),(v1)
-+e1: psraw Pq,Qq | vpsraw Vx,Hx,Wx (66),(v1)
-+e2: psrad Pq,Qq | vpsrad Vx,Hx,Wx (66),(v1)
-+e3: pavgw Pq,Qq | vpavgw Vx,Hx,Wx (66),(v1)
-+e4: pmulhuw Pq,Qq | vpmulhuw Vx,Hx,Wx (66),(v1)
-+e5: pmulhw Pq,Qq | vpmulhw Vx,Hx,Wx (66),(v1)
-+e6: vcvttpd2dq Vx,Wpd (66) | vcvtdq2pd Vx,Wdq (F3) | vcvtdq2pd/qq2pd Vx,Wdq (F3),(evo) | vcvtpd2dq Vx,Wpd (F2)
-+e7: movntq Mq,Pq | vmovntdq Mx,Vx (66)
-+e8: psubsb Pq,Qq | vpsubsb Vx,Hx,Wx (66),(v1)
-+e9: psubsw Pq,Qq | vpsubsw Vx,Hx,Wx (66),(v1)
-+ea: pminsw Pq,Qq | vpminsw Vx,Hx,Wx (66),(v1)
-+eb: por Pq,Qq | vpor Vx,Hx,Wx (66),(v1) | vpord/q Vx,Hx,Wx (66),(evo)
-+ec: paddsb Pq,Qq | vpaddsb Vx,Hx,Wx (66),(v1)
-+ed: paddsw Pq,Qq | vpaddsw Vx,Hx,Wx (66),(v1)
-+ee: pmaxsw Pq,Qq | vpmaxsw Vx,Hx,Wx (66),(v1)
-+ef: pxor Pq,Qq | vpxor Vx,Hx,Wx (66),(v1) | vpxord/q Vx,Hx,Wx (66),(evo)
-+# 0x0f 0xf0-0xff
-+f0: vlddqu Vx,Mx (F2)
-+f1: psllw Pq,Qq | vpsllw Vx,Hx,Wx (66),(v1)
-+f2: pslld Pq,Qq | vpslld Vx,Hx,Wx (66),(v1)
-+f3: psllq Pq,Qq | vpsllq Vx,Hx,Wx (66),(v1)
-+f4: pmuludq Pq,Qq | vpmuludq Vx,Hx,Wx (66),(v1)
-+f5: pmaddwd Pq,Qq | vpmaddwd Vx,Hx,Wx (66),(v1)
-+f6: psadbw Pq,Qq | vpsadbw Vx,Hx,Wx (66),(v1)
-+f7: maskmovq Pq,Nq | vmaskmovdqu Vx,Ux (66),(v1)
-+f8: psubb Pq,Qq | vpsubb Vx,Hx,Wx (66),(v1)
-+f9: psubw Pq,Qq | vpsubw Vx,Hx,Wx (66),(v1)
-+fa: psubd Pq,Qq | vpsubd Vx,Hx,Wx (66),(v1)
-+fb: psubq Pq,Qq | vpsubq Vx,Hx,Wx (66),(v1)
-+fc: paddb Pq,Qq | vpaddb Vx,Hx,Wx (66),(v1)
-+fd: paddw Pq,Qq | vpaddw Vx,Hx,Wx (66),(v1)
-+fe: paddd Pq,Qq | vpaddd Vx,Hx,Wx (66),(v1)
-+ff: UD0
-+EndTable
-+
-+Table: 3-byte opcode 1 (0x0f 0x38)
-+Referrer: 3-byte escape 1
-+AVXcode: 2
-+# 0x0f 0x38 0x00-0x0f
-+00: pshufb Pq,Qq | vpshufb Vx,Hx,Wx (66),(v1)
-+01: phaddw Pq,Qq | vphaddw Vx,Hx,Wx (66),(v1)
-+02: phaddd Pq,Qq | vphaddd Vx,Hx,Wx (66),(v1)
-+03: phaddsw Pq,Qq | vphaddsw Vx,Hx,Wx (66),(v1)
-+04: pmaddubsw Pq,Qq | vpmaddubsw Vx,Hx,Wx (66),(v1)
-+05: phsubw Pq,Qq | vphsubw Vx,Hx,Wx (66),(v1)
-+06: phsubd Pq,Qq | vphsubd Vx,Hx,Wx (66),(v1)
-+07: phsubsw Pq,Qq | vphsubsw Vx,Hx,Wx (66),(v1)
-+08: psignb Pq,Qq | vpsignb Vx,Hx,Wx (66),(v1)
-+09: psignw Pq,Qq | vpsignw Vx,Hx,Wx (66),(v1)
-+0a: psignd Pq,Qq | vpsignd Vx,Hx,Wx (66),(v1)
-+0b: pmulhrsw Pq,Qq | vpmulhrsw Vx,Hx,Wx (66),(v1)
-+0c: vpermilps Vx,Hx,Wx (66),(v)
-+0d: vpermilpd Vx,Hx,Wx (66),(v)
-+0e: vtestps Vx,Wx (66),(v)
-+0f: vtestpd Vx,Wx (66),(v)
-+# 0x0f 0x38 0x10-0x1f
-+10: pblendvb Vdq,Wdq (66) | vpsrlvw Vx,Hx,Wx (66),(evo) | vpmovuswb Wx,Vx (F3),(ev)
-+11: vpmovusdb Wx,Vd (F3),(ev) | vpsravw Vx,Hx,Wx (66),(ev)
-+12: vpmovusqb Wx,Vq (F3),(ev) | vpsllvw Vx,Hx,Wx (66),(ev)
-+13: vcvtph2ps Vx,Wx (66),(v) | vpmovusdw Wx,Vd (F3),(ev)
-+14: blendvps Vdq,Wdq (66) | vpmovusqw Wx,Vq (F3),(ev) | vprorvd/q Vx,Hx,Wx (66),(evo)
-+15: blendvpd Vdq,Wdq (66) | vpmovusqd Wx,Vq (F3),(ev) | vprolvd/q Vx,Hx,Wx (66),(evo)
-+16: vpermps Vqq,Hqq,Wqq (66),(v) | vpermps/d Vqq,Hqq,Wqq (66),(evo)
-+17: vptest Vx,Wx (66)
-+18: vbroadcastss Vx,Wd (66),(v)
-+19: vbroadcastsd Vqq,Wq (66),(v) | vbroadcastf32x2 Vqq,Wq (66),(evo)
-+1a: vbroadcastf128 Vqq,Mdq (66),(v) | vbroadcastf32x4/64x2 Vqq,Wq (66),(evo)
-+1b: vbroadcastf32x8/64x4 Vqq,Mdq (66),(ev)
-+1c: pabsb Pq,Qq | vpabsb Vx,Wx (66),(v1)
-+1d: pabsw Pq,Qq | vpabsw Vx,Wx (66),(v1)
-+1e: pabsd Pq,Qq | vpabsd Vx,Wx (66),(v1)
-+1f: vpabsq Vx,Wx (66),(ev)
-+# 0x0f 0x38 0x20-0x2f
-+20: vpmovsxbw Vx,Ux/Mq (66),(v1) | vpmovswb Wx,Vx (F3),(ev)
-+21: vpmovsxbd Vx,Ux/Md (66),(v1) | vpmovsdb Wx,Vd (F3),(ev)
-+22: vpmovsxbq Vx,Ux/Mw (66),(v1) | vpmovsqb Wx,Vq (F3),(ev)
-+23: vpmovsxwd Vx,Ux/Mq (66),(v1) | vpmovsdw Wx,Vd (F3),(ev)
-+24: vpmovsxwq Vx,Ux/Md (66),(v1) | vpmovsqw Wx,Vq (F3),(ev)
-+25: vpmovsxdq Vx,Ux/Mq (66),(v1) | vpmovsqd Wx,Vq (F3),(ev)
-+26: vptestmb/w Vk,Hx,Wx (66),(ev) | vptestnmb/w Vk,Hx,Wx (F3),(ev)
-+27: vptestmd/q Vk,Hx,Wx (66),(ev) | vptestnmd/q Vk,Hx,Wx (F3),(ev)
-+28: vpmuldq Vx,Hx,Wx (66),(v1) | vpmovm2b/w Vx,Uk (F3),(ev)
-+29: vpcmpeqq Vx,Hx,Wx (66),(v1) | vpmovb2m/w2m Vk,Ux (F3),(ev)
-+2a: vmovntdqa Vx,Mx (66),(v1) | vpbroadcastmb2q Vx,Uk (F3),(ev)
-+2b: vpackusdw Vx,Hx,Wx (66),(v1)
-+2c: vmaskmovps Vx,Hx,Mx (66),(v) | vscalefps/d Vx,Hx,Wx (66),(evo)
-+2d: vmaskmovpd Vx,Hx,Mx (66),(v) | vscalefss/d Vx,Hx,Wx (66),(evo)
-+2e: vmaskmovps Mx,Hx,Vx (66),(v)
-+2f: vmaskmovpd Mx,Hx,Vx (66),(v)
-+# 0x0f 0x38 0x30-0x3f
-+30: vpmovzxbw Vx,Ux/Mq (66),(v1) | vpmovwb Wx,Vx (F3),(ev)
-+31: vpmovzxbd Vx,Ux/Md (66),(v1) | vpmovdb Wx,Vd (F3),(ev)
-+32: vpmovzxbq Vx,Ux/Mw (66),(v1) | vpmovqb Wx,Vq (F3),(ev)
-+33: vpmovzxwd Vx,Ux/Mq (66),(v1) | vpmovdw Wx,Vd (F3),(ev)
-+34: vpmovzxwq Vx,Ux/Md (66),(v1) | vpmovqw Wx,Vq (F3),(ev)
-+35: vpmovzxdq Vx,Ux/Mq (66),(v1) | vpmovqd Wx,Vq (F3),(ev)
-+36: vpermd Vqq,Hqq,Wqq (66),(v) | vpermd/q Vqq,Hqq,Wqq (66),(evo)
-+37: vpcmpgtq Vx,Hx,Wx (66),(v1)
-+38: vpminsb Vx,Hx,Wx (66),(v1) | vpmovm2d/q Vx,Uk (F3),(ev)
-+39: vpminsd Vx,Hx,Wx (66),(v1) | vpminsd/q Vx,Hx,Wx (66),(evo) | vpmovd2m/q2m Vk,Ux (F3),(ev)
-+3a: vpminuw Vx,Hx,Wx (66),(v1) | vpbroadcastmw2d Vx,Uk (F3),(ev)
-+3b: vpminud Vx,Hx,Wx (66),(v1) | vpminud/q Vx,Hx,Wx (66),(evo)
-+3c: vpmaxsb Vx,Hx,Wx (66),(v1)
-+3d: vpmaxsd Vx,Hx,Wx (66),(v1) | vpmaxsd/q Vx,Hx,Wx (66),(evo)
-+3e: vpmaxuw Vx,Hx,Wx (66),(v1)
-+3f: vpmaxud Vx,Hx,Wx (66),(v1) | vpmaxud/q Vx,Hx,Wx (66),(evo)
-+# 0x0f 0x38 0x40-0x8f
-+40: vpmulld Vx,Hx,Wx (66),(v1) | vpmulld/q Vx,Hx,Wx (66),(evo)
-+41: vphminposuw Vdq,Wdq (66),(v1)
-+42: vgetexpps/d Vx,Wx (66),(ev)
-+43: vgetexpss/d Vx,Hx,Wx (66),(ev)
-+44: vplzcntd/q Vx,Wx (66),(ev)
-+45: vpsrlvd/q Vx,Hx,Wx (66),(v)
-+46: vpsravd Vx,Hx,Wx (66),(v) | vpsravd/q Vx,Hx,Wx (66),(evo)
-+47: vpsllvd/q Vx,Hx,Wx (66),(v)
-+# Skip 0x48
-+49: TILERELEASE (v1),(000),(11B) | LDTILECFG Mtc (v1)(000) | STTILECFG Mtc (66),(v1),(000) | TILEZERO Vt (F2),(v1),(11B)
-+# Skip 0x4a
-+4b: TILELOADD Vt,Wsm (F2),(v1) | TILELOADDT1 Vt,Wsm (66),(v1) | TILESTORED Wsm,Vt (F3),(v)
-+4c: vrcp14ps/d Vpd,Wpd (66),(ev)
-+4d: vrcp14ss/d Vsd,Hpd,Wsd (66),(ev)
-+4e: vrsqrt14ps/d Vpd,Wpd (66),(ev)
-+4f: vrsqrt14ss/d Vsd,Hsd,Wsd (66),(ev)
-+50: vpdpbusd Vx,Hx,Wx (66),(ev)
-+51: vpdpbusds Vx,Hx,Wx (66),(ev)
-+52: vdpbf16ps Vx,Hx,Wx (F3),(ev) | vpdpwssd Vx,Hx,Wx (66),(ev) | vp4dpwssd Vdqq,Hdqq,Wdq (F2),(ev)
-+53: vpdpwssds Vx,Hx,Wx (66),(ev) | vp4dpwssds Vdqq,Hdqq,Wdq (F2),(ev)
-+54: vpopcntb/w Vx,Wx (66),(ev)
-+55: vpopcntd/q Vx,Wx (66),(ev)
-+58: vpbroadcastd Vx,Wx (66),(v)
-+59: vpbroadcastq Vx,Wx (66),(v) | vbroadcasti32x2 Vx,Wx (66),(evo)
-+5a: vbroadcasti128 Vqq,Mdq (66),(v) | vbroadcasti32x4/64x2 Vx,Wx (66),(evo)
-+5b: vbroadcasti32x8/64x4 Vqq,Mdq (66),(ev)
-+5c: TDPBF16PS Vt,Wt,Ht (F3),(v1)
-+# Skip 0x5d
-+5e: TDPBSSD Vt,Wt,Ht (F2),(v1) | TDPBSUD Vt,Wt,Ht (F3),(v1) | TDPBUSD Vt,Wt,Ht (66),(v1) | TDPBUUD Vt,Wt,Ht (v1)
-+# Skip 0x5f-0x61
-+62: vpexpandb/w Vx,Wx (66),(ev)
-+63: vpcompressb/w Wx,Vx (66),(ev)
-+64: vpblendmd/q Vx,Hx,Wx (66),(ev)
-+65: vblendmps/d Vx,Hx,Wx (66),(ev)
-+66: vpblendmb/w Vx,Hx,Wx (66),(ev)
-+68: vp2intersectd/q Kx,Hx,Wx (F2),(ev)
-+# Skip 0x69-0x6f
-+70: vpshldvw Vx,Hx,Wx (66),(ev)
-+71: vpshldvd/q Vx,Hx,Wx (66),(ev)
-+72: vcvtne2ps2bf16 Vx,Hx,Wx (F2),(ev) | vcvtneps2bf16 Vx,Wx (F3),(ev) | vpshrdvw Vx,Hx,Wx (66),(ev)
-+73: vpshrdvd/q Vx,Hx,Wx (66),(ev)
-+75: vpermi2b/w Vx,Hx,Wx (66),(ev)
-+76: vpermi2d/q Vx,Hx,Wx (66),(ev)
-+77: vpermi2ps/d Vx,Hx,Wx (66),(ev)
-+78: vpbroadcastb Vx,Wx (66),(v)
-+79: vpbroadcastw Vx,Wx (66),(v)
-+7a: vpbroadcastb Vx,Rv (66),(ev)
-+7b: vpbroadcastw Vx,Rv (66),(ev)
-+7c: vpbroadcastd/q Vx,Rv (66),(ev)
-+7d: vpermt2b/w Vx,Hx,Wx (66),(ev)
-+7e: vpermt2d/q Vx,Hx,Wx (66),(ev)
-+7f: vpermt2ps/d Vx,Hx,Wx (66),(ev)
-+80: INVEPT Gy,Mdq (66)
-+81: INVVPID Gy,Mdq (66)
-+82: INVPCID Gy,Mdq (66)
-+83: vpmultishiftqb Vx,Hx,Wx (66),(ev)
-+88: vexpandps/d Vpd,Wpd (66),(ev)
-+89: vpexpandd/q Vx,Wx (66),(ev)
-+8a: vcompressps/d Wx,Vx (66),(ev)
-+8b: vpcompressd/q Wx,Vx (66),(ev)
-+8c: vpmaskmovd/q Vx,Hx,Mx (66),(v)
-+8d: vpermb/w Vx,Hx,Wx (66),(ev)
-+8e: vpmaskmovd/q Mx,Vx,Hx (66),(v)
-+8f: vpshufbitqmb Kx,Hx,Wx (66),(ev)
-+# 0x0f 0x38 0x90-0xbf (FMA)
-+90: vgatherdd/q Vx,Hx,Wx (66),(v) | vpgatherdd/q Vx,Wx (66),(evo)
-+91: vgatherqd/q Vx,Hx,Wx (66),(v) | vpgatherqd/q Vx,Wx (66),(evo)
-+92: vgatherdps/d Vx,Hx,Wx (66),(v)
-+93: vgatherqps/d Vx,Hx,Wx (66),(v)
-+94:
-+95:
-+96: vfmaddsub132ps/d Vx,Hx,Wx (66),(v)
-+97: vfmsubadd132ps/d Vx,Hx,Wx (66),(v)
-+98: vfmadd132ps/d Vx,Hx,Wx (66),(v)
-+99: vfmadd132ss/d Vx,Hx,Wx (66),(v),(v1)
-+9a: vfmsub132ps/d Vx,Hx,Wx (66),(v) | v4fmaddps Vdqq,Hdqq,Wdq (F2),(ev)
-+9b: vfmsub132ss/d Vx,Hx,Wx (66),(v),(v1) | v4fmaddss Vdq,Hdq,Wdq (F2),(ev)
-+9c: vfnmadd132ps/d Vx,Hx,Wx (66),(v)
-+9d: vfnmadd132ss/d Vx,Hx,Wx (66),(v),(v1)
-+9e: vfnmsub132ps/d Vx,Hx,Wx (66),(v)
-+9f: vfnmsub132ss/d Vx,Hx,Wx (66),(v),(v1)
-+a0: vpscatterdd/q Wx,Vx (66),(ev)
-+a1: vpscatterqd/q Wx,Vx (66),(ev)
-+a2: vscatterdps/d Wx,Vx (66),(ev)
-+a3: vscatterqps/d Wx,Vx (66),(ev)
-+a6: vfmaddsub213ps/d Vx,Hx,Wx (66),(v)
-+a7: vfmsubadd213ps/d Vx,Hx,Wx (66),(v)
-+a8: vfmadd213ps/d Vx,Hx,Wx (66),(v)
-+a9: vfmadd213ss/d Vx,Hx,Wx (66),(v),(v1)
-+aa: vfmsub213ps/d Vx,Hx,Wx (66),(v) | v4fnmaddps Vdqq,Hdqq,Wdq (F2),(ev)
-+ab: vfmsub213ss/d Vx,Hx,Wx (66),(v),(v1) | v4fnmaddss Vdq,Hdq,Wdq (F2),(ev)
-+ac: vfnmadd213ps/d Vx,Hx,Wx (66),(v)
-+ad: vfnmadd213ss/d Vx,Hx,Wx (66),(v),(v1)
-+ae: vfnmsub213ps/d Vx,Hx,Wx (66),(v)
-+af: vfnmsub213ss/d Vx,Hx,Wx (66),(v),(v1)
-+b4: vpmadd52luq Vx,Hx,Wx (66),(ev)
-+b5: vpmadd52huq Vx,Hx,Wx (66),(ev)
-+b6: vfmaddsub231ps/d Vx,Hx,Wx (66),(v)
-+b7: vfmsubadd231ps/d Vx,Hx,Wx (66),(v)
-+b8: vfmadd231ps/d Vx,Hx,Wx (66),(v)
-+b9: vfmadd231ss/d Vx,Hx,Wx (66),(v),(v1)
-+ba: vfmsub231ps/d Vx,Hx,Wx (66),(v)
-+bb: vfmsub231ss/d Vx,Hx,Wx (66),(v),(v1)
-+bc: vfnmadd231ps/d Vx,Hx,Wx (66),(v)
-+bd: vfnmadd231ss/d Vx,Hx,Wx (66),(v),(v1)
-+be: vfnmsub231ps/d Vx,Hx,Wx (66),(v)
-+bf: vfnmsub231ss/d Vx,Hx,Wx (66),(v),(v1)
-+# 0x0f 0x38 0xc0-0xff
-+c4: vpconflictd/q Vx,Wx (66),(ev)
-+c6: Grp18 (1A)
-+c7: Grp19 (1A)
-+c8: sha1nexte Vdq,Wdq | vexp2ps/d Vx,Wx (66),(ev)
-+c9: sha1msg1 Vdq,Wdq
-+ca: sha1msg2 Vdq,Wdq | vrcp28ps/d Vx,Wx (66),(ev)
-+cb: sha256rnds2 Vdq,Wdq | vrcp28ss/d Vx,Hx,Wx (66),(ev)
-+cc: sha256msg1 Vdq,Wdq | vrsqrt28ps/d Vx,Wx (66),(ev)
-+cd: sha256msg2 Vdq,Wdq | vrsqrt28ss/d Vx,Hx,Wx (66),(ev)
-+cf: vgf2p8mulb Vx,Wx (66)
-+db: VAESIMC Vdq,Wdq (66),(v1)
-+dc: vaesenc Vx,Hx,Wx (66)
-+dd: vaesenclast Vx,Hx,Wx (66)
-+de: vaesdec Vx,Hx,Wx (66)
-+df: vaesdeclast Vx,Hx,Wx (66)
-+f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2) | CRC32 Gd,Eb (66&F2)
-+f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2) | CRC32 Gd,Ew (66&F2)
-+f2: ANDN Gy,By,Ey (v)
-+f3: Grp17 (1A)
-+f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) | WRUSSD/Q My,Gy (66)
-+f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSSD/Q My,Gy
-+f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v)
-+f8: MOVDIR64B Gv,Mdqq (66) | ENQCMD Gv,Mdqq (F2) | ENQCMDS Gv,Mdqq (F3)
-+f9: MOVDIRI My,Gy
-+EndTable
-+
-+Table: 3-byte opcode 2 (0x0f 0x3a)
-+Referrer: 3-byte escape 2
-+AVXcode: 3
-+# 0x0f 0x3a 0x00-0xff
-+00: vpermq Vqq,Wqq,Ib (66),(v)
-+01: vpermpd Vqq,Wqq,Ib (66),(v)
-+02: vpblendd Vx,Hx,Wx,Ib (66),(v)
-+03: valignd/q Vx,Hx,Wx,Ib (66),(ev)
-+04: vpermilps Vx,Wx,Ib (66),(v)
-+05: vpermilpd Vx,Wx,Ib (66),(v)
-+06: vperm2f128 Vqq,Hqq,Wqq,Ib (66),(v)
-+07:
-+08: vroundps Vx,Wx,Ib (66) | vrndscaleps Vx,Wx,Ib (66),(evo) | vrndscaleph Vx,Wx,Ib (evo)
-+09: vroundpd Vx,Wx,Ib (66) | vrndscalepd Vx,Wx,Ib (66),(evo)
-+0a: vroundss Vss,Wss,Ib (66),(v1) | vrndscaless Vx,Hx,Wx,Ib (66),(evo) | vrndscalesh Vx,Hx,Wx,Ib (evo)
-+0b: vroundsd Vsd,Wsd,Ib (66),(v1) | vrndscalesd Vx,Hx,Wx,Ib (66),(evo)
-+0c: vblendps Vx,Hx,Wx,Ib (66)
-+0d: vblendpd Vx,Hx,Wx,Ib (66)
-+0e: vpblendw Vx,Hx,Wx,Ib (66),(v1)
-+0f: palignr Pq,Qq,Ib | vpalignr Vx,Hx,Wx,Ib (66),(v1)
-+14: vpextrb Rd/Mb,Vdq,Ib (66),(v1)
-+15: vpextrw Rd/Mw,Vdq,Ib (66),(v1)
-+16: vpextrd/q Ey,Vdq,Ib (66),(v1)
-+17: vextractps Ed,Vdq,Ib (66),(v1)
-+18: vinsertf128 Vqq,Hqq,Wqq,Ib (66),(v) | vinsertf32x4/64x2 Vqq,Hqq,Wqq,Ib (66),(evo)
-+19: vextractf128 Wdq,Vqq,Ib (66),(v) | vextractf32x4/64x2 Wdq,Vqq,Ib (66),(evo)
-+1a: vinsertf32x8/64x4 Vqq,Hqq,Wqq,Ib (66),(ev)
-+1b: vextractf32x8/64x4 Wdq,Vqq,Ib (66),(ev)
-+1d: vcvtps2ph Wx,Vx,Ib (66),(v)
-+1e: vpcmpud/q Vk,Hd,Wd,Ib (66),(ev)
-+1f: vpcmpd/q Vk,Hd,Wd,Ib (66),(ev)
-+20: vpinsrb Vdq,Hdq,Ry/Mb,Ib (66),(v1)
-+21: vinsertps Vdq,Hdq,Udq/Md,Ib (66),(v1)
-+22: vpinsrd/q Vdq,Hdq,Ey,Ib (66),(v1)
-+23: vshuff32x4/64x2 Vx,Hx,Wx,Ib (66),(ev)
-+25: vpternlogd/q Vx,Hx,Wx,Ib (66),(ev)
-+26: vgetmantps/d Vx,Wx,Ib (66),(ev) | vgetmantph Vx,Wx,Ib (ev)
-+27: vgetmantss/d Vx,Hx,Wx,Ib (66),(ev) | vgetmantsh Vx,Hx,Wx,Ib (ev)
-+30: kshiftrb/w Vk,Uk,Ib (66),(v)
-+31: kshiftrd/q Vk,Uk,Ib (66),(v)
-+32: kshiftlb/w Vk,Uk,Ib (66),(v)
-+33: kshiftld/q Vk,Uk,Ib (66),(v)
-+38: vinserti128 Vqq,Hqq,Wqq,Ib (66),(v) | vinserti32x4/64x2 Vqq,Hqq,Wqq,Ib (66),(evo)
-+39: vextracti128 Wdq,Vqq,Ib (66),(v) | vextracti32x4/64x2 Wdq,Vqq,Ib (66),(evo)
-+3a: vinserti32x8/64x4 Vqq,Hqq,Wqq,Ib (66),(ev)
-+3b: vextracti32x8/64x4 Wdq,Vqq,Ib (66),(ev)
-+3e: vpcmpub/w Vk,Hk,Wx,Ib (66),(ev)
-+3f: vpcmpb/w Vk,Hk,Wx,Ib (66),(ev)
-+40: vdpps Vx,Hx,Wx,Ib (66)
-+41: vdppd Vdq,Hdq,Wdq,Ib (66),(v1)
-+42: vmpsadbw Vx,Hx,Wx,Ib (66),(v1) | vdbpsadbw Vx,Hx,Wx,Ib (66),(evo)
-+43: vshufi32x4/64x2 Vx,Hx,Wx,Ib (66),(ev)
-+44: vpclmulqdq Vx,Hx,Wx,Ib (66)
-+46: vperm2i128 Vqq,Hqq,Wqq,Ib (66),(v)
-+4a: vblendvps Vx,Hx,Wx,Lx (66),(v)
-+4b: vblendvpd Vx,Hx,Wx,Lx (66),(v)
-+4c: vpblendvb Vx,Hx,Wx,Lx (66),(v1)
-+50: vrangeps/d Vx,Hx,Wx,Ib (66),(ev)
-+51: vrangess/d Vx,Hx,Wx,Ib (66),(ev)
-+54: vfixupimmps/d Vx,Hx,Wx,Ib (66),(ev)
-+55: vfixupimmss/d Vx,Hx,Wx,Ib (66),(ev)
-+56: vreduceps/d Vx,Wx,Ib (66),(ev) | vreduceph Vx,Wx,Ib (ev)
-+57: vreducess/d Vx,Hx,Wx,Ib (66),(ev) | vreducesh Vx,Hx,Wx,Ib (ev)
-+60: vpcmpestrm Vdq,Wdq,Ib (66),(v1)
-+61: vpcmpestri Vdq,Wdq,Ib (66),(v1)
-+62: vpcmpistrm Vdq,Wdq,Ib (66),(v1)
-+63: vpcmpistri Vdq,Wdq,Ib (66),(v1)
-+66: vfpclassps/d Vk,Wx,Ib (66),(ev) | vfpclassph Vx,Wx,Ib (ev)
-+67: vfpclassss/d Vk,Wx,Ib (66),(ev) | vfpclasssh Vx,Wx,Ib (ev)
-+70: vpshldw Vx,Hx,Wx,Ib (66),(ev)
-+71: vpshldd/q Vx,Hx,Wx,Ib (66),(ev)
-+72: vpshrdw Vx,Hx,Wx,Ib (66),(ev)
-+73: vpshrdd/q Vx,Hx,Wx,Ib (66),(ev)
-+c2: vcmpph Vx,Hx,Wx,Ib (ev) | vcmpsh Vx,Hx,Wx,Ib (F3),(ev)
-+cc: sha1rnds4 Vdq,Wdq,Ib
-+ce: vgf2p8affineqb Vx,Wx,Ib (66)
-+cf: vgf2p8affineinvqb Vx,Wx,Ib (66)
-+df: VAESKEYGEN Vdq,Wdq,Ib (66),(v1)
-+f0: RORX Gy,Ey,Ib (F2),(v) | HRESET Gv,Ib (F3),(000),(11B)
-+EndTable
-+
-+Table: EVEX map 5
-+Referrer:
-+AVXcode: 5
-+10: vmovsh Vx,Hx,Wx (F3),(ev) | vmovsh Vx,Wx (F3),(ev)
-+11: vmovsh Wx,Hx,Vx (F3),(ev) | vmovsh Wx,Vx (F3),(ev)
-+1d: vcvtps2phx Vx,Wx (66),(ev) | vcvtss2sh Vx,Hx,Wx (ev)
-+2a: vcvtsi2sh Vx,Hx,Wx (F3),(ev)
-+2c: vcvttsh2si Vx,Wx (F3),(ev)
-+2d: vcvtsh2si Vx,Wx (F3),(ev)
-+2e: vucomish Vx,Wx (ev)
-+2f: vcomish Vx,Wx (ev)
-+51: vsqrtph Vx,Wx (ev) | vsqrtsh Vx,Hx,Wx (F3),(ev)
-+58: vaddph Vx,Hx,Wx (ev) | vaddsh Vx,Hx,Wx (F3),(ev)
-+59: vmulph Vx,Hx,Wx (ev) | vmulsh Vx,Hx,Wx (F3),(ev)
-+5a: vcvtpd2ph Vx,Wx (66),(ev) | vcvtph2pd Vx,Wx (ev) | vcvtsd2sh Vx,Hx,Wx (F2),(ev) | vcvtsh2sd Vx,Hx,Wx (F3),(ev)
-+5b: vcvtdq2ph Vx,Wx (ev) | vcvtph2dq Vx,Wx (66),(ev) | vcvtqq2ph Vx,Wx (ev) | vcvttph2dq Vx,Wx (F3),(ev)
-+5c: vsubph Vx,Hx,Wx (ev) | vsubsh Vx,Hx,Wx (F3),(ev)
-+5d: vminph Vx,Hx,Wx (ev) | vminsh Vx,Hx,Wx (F3),(ev)
-+5e: vdivph Vx,Hx,Wx (ev) | vdivsh Vx,Hx,Wx (F3),(ev)
-+5f: vmaxph Vx,Hx,Wx (ev) | vmaxsh Vx,Hx,Wx (F3),(ev)
-+6e: vmovw Vx,Wx (66),(ev)
-+78: vcvttph2udq Vx,Wx (ev) | vcvttph2uqq Vx,Wx (66),(ev) | vcvttsh2usi Vx,Wx (F3),(ev)
-+79: vcvtph2udq Vx,Wx (ev) | vcvtph2uqq Vx,Wx (66),(ev) | vcvtsh2usi Vx,Wx (F3),(ev)
-+7a: vcvttph2qq Vx,Wx (66),(ev) | vcvtudq2ph Vx,Wx (F2),(ev) | vcvtuqq2ph Vx,Wx (F2),(ev)
-+7b: vcvtph2qq Vx,Wx (66),(ev) | vcvtusi2sh Vx,Hx,Wx (F3),(ev)
-+7c: vcvttph2uw Vx,Wx (ev) | vcvttph2w Vx,Wx (66),(ev)
-+7d: vcvtph2uw Vx,Wx (ev) | vcvtph2w Vx,Wx (66),(ev) | vcvtuw2ph Vx,Wx (F2),(ev) | vcvtw2ph Vx,Wx (F3),(ev)
-+7e: vmovw Wx,Vx (66),(ev)
-+EndTable
-+
-+Table: EVEX map 6
-+Referrer:
-+AVXcode: 6
-+13: vcvtph2psx Vx,Wx (66),(ev) | vcvtsh2ss Vx,Hx,Wx (ev)
-+2c: vscalefph Vx,Hx,Wx (66),(ev)
-+2d: vscalefsh Vx,Hx,Wx (66),(ev)
-+42: vgetexpph Vx,Wx (66),(ev)
-+43: vgetexpsh Vx,Hx,Wx (66),(ev)
-+4c: vrcpph Vx,Wx (66),(ev)
-+4d: vrcpsh Vx,Hx,Wx (66),(ev)
-+4e: vrsqrtph Vx,Wx (66),(ev)
-+4f: vrsqrtsh Vx,Hx,Wx (66),(ev)
-+56: vfcmaddcph Vx,Hx,Wx (F2),(ev) | vfmaddcph Vx,Hx,Wx (F3),(ev)
-+57: vfcmaddcsh Vx,Hx,Wx (F2),(ev) | vfmaddcsh Vx,Hx,Wx (F3),(ev)
-+96: vfmaddsub132ph Vx,Hx,Wx (66),(ev)
-+97: vfmsubadd132ph Vx,Hx,Wx (66),(ev)
-+98: vfmadd132ph Vx,Hx,Wx (66),(ev)
-+99: vfmadd132sh Vx,Hx,Wx (66),(ev)
-+9a: vfmsub132ph Vx,Hx,Wx (66),(ev)
-+9b: vfmsub132sh Vx,Hx,Wx (66),(ev)
-+9c: vfnmadd132ph Vx,Hx,Wx (66),(ev)
-+9d: vfnmadd132sh Vx,Hx,Wx (66),(ev)
-+9e: vfnmsub132ph Vx,Hx,Wx (66),(ev)
-+9f: vfnmsub132sh Vx,Hx,Wx (66),(ev)
-+a6: vfmaddsub213ph Vx,Hx,Wx (66),(ev)
-+a7: vfmsubadd213ph Vx,Hx,Wx (66),(ev)
-+a8: vfmadd213ph Vx,Hx,Wx (66),(ev)
-+a9: vfmadd213sh Vx,Hx,Wx (66),(ev)
-+aa: vfmsub213ph Vx,Hx,Wx (66),(ev)
-+ab: vfmsub213sh Vx,Hx,Wx (66),(ev)
-+ac: vfnmadd213ph Vx,Hx,Wx (66),(ev)
-+ad: vfnmadd213sh Vx,Hx,Wx (66),(ev)
-+ae: vfnmsub213ph Vx,Hx,Wx (66),(ev)
-+af: vfnmsub213sh Vx,Hx,Wx (66),(ev)
-+b6: vfmaddsub231ph Vx,Hx,Wx (66),(ev)
-+b7: vfmsubadd231ph Vx,Hx,Wx (66),(ev)
-+b8: vfmadd231ph Vx,Hx,Wx (66),(ev)
-+b9: vfmadd231sh Vx,Hx,Wx (66),(ev)
-+ba: vfmsub231ph Vx,Hx,Wx (66),(ev)
-+bb: vfmsub231sh Vx,Hx,Wx (66),(ev)
-+bc: vfnmadd231ph Vx,Hx,Wx (66),(ev)
-+bd: vfnmadd231sh Vx,Hx,Wx (66),(ev)
-+be: vfnmsub231ph Vx,Hx,Wx (66),(ev)
-+bf: vfnmsub231sh Vx,Hx,Wx (66),(ev)
-+d6: vfcmulcph Vx,Hx,Wx (F2),(ev) | vfmulcph Vx,Hx,Wx (F3),(ev)
-+d7: vfcmulcsh Vx,Hx,Wx (F2),(ev) | vfmulcsh Vx,Hx,Wx (F3),(ev)
-+EndTable
-+
-+GrpTable: Grp1
-+0: ADD
-+1: OR
-+2: ADC
-+3: SBB
-+4: AND
-+5: SUB
-+6: XOR
-+7: CMP
-+EndTable
-+
-+GrpTable: Grp1A
-+0: POP
-+EndTable
-+
-+GrpTable: Grp2
-+0: ROL
-+1: ROR
-+2: RCL
-+3: RCR
-+4: SHL/SAL
-+5: SHR
-+6:
-+7: SAR
-+EndTable
-+
-+GrpTable: Grp3_1
-+0: TEST Eb,Ib
-+1: TEST Eb,Ib
-+2: NOT Eb
-+3: NEG Eb
-+4: MUL AL,Eb
-+5: IMUL AL,Eb
-+6: DIV AL,Eb
-+7: IDIV AL,Eb
-+EndTable
-+
-+GrpTable: Grp3_2
-+0: TEST Ev,Iz
-+1: TEST Ev,Iz
-+2: NOT Ev
-+3: NEG Ev
-+4: MUL rAX,Ev
-+5: IMUL rAX,Ev
-+6: DIV rAX,Ev
-+7: IDIV rAX,Ev
-+EndTable
-+
-+GrpTable: Grp4
-+0: INC Eb
-+1: DEC Eb
-+EndTable
-+
-+GrpTable: Grp5
-+0: INC Ev
-+1: DEC Ev
-+# Note: "forced64" is Intel CPU behavior (see comment about CALL insn).
-+2: CALLN Ev (f64)
-+3: CALLF Ep
-+4: JMPN Ev (f64)
-+5: JMPF Mp
-+6: PUSH Ev (d64)
-+7:
-+EndTable
-+
-+GrpTable: Grp6
-+0: SLDT Rv/Mw
-+1: STR Rv/Mw
-+2: LLDT Ew
-+3: LTR Ew
-+4: VERR Ew
-+5: VERW Ew
-+EndTable
-+
-+GrpTable: Grp7
-+0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B)
-+1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B)
-+2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B)
-+3: LIDT Ms
-+4: SMSW Mw/Rv
-+5: rdpkru (110),(11B) | wrpkru (111),(11B) | SAVEPREVSSP (F3),(010),(11B) | RSTORSSP Mq (F3) | SETSSBSY (F3),(000),(11B) | CLUI (F3),(110),(11B) | SERIALIZE (000),(11B) | STUI (F3),(111),(11B) | TESTUI (F3)(101)(11B) | UIRET (F3),(100),(11B) | XRESLDTRK (F2),(000),(11B) | XSUSLDTRK (F2),(001),(11B)
-+6: LMSW Ew
-+7: INVLPG Mb | SWAPGS (o64),(000),(11B) | RDTSCP (001),(11B)
-+EndTable
-+
-+GrpTable: Grp8
-+4: BT
-+5: BTS
-+6: BTR
-+7: BTC
-+EndTable
-+
-+GrpTable: Grp9
-+1: CMPXCHG8B/16B Mq/Mdq
-+3: xrstors
-+4: xsavec
-+5: xsaves
-+6: VMPTRLD Mq | VMCLEAR Mq (66) | VMXON Mq (F3) | RDRAND Rv (11B) | SENDUIPI Gq (F3)
-+7: VMPTRST Mq | VMPTRST Mq (F3) | RDSEED Rv (11B)
-+EndTable
-+
-+GrpTable: Grp10
-+# all are UD1
-+0: UD1
-+1: UD1
-+2: UD1
-+3: UD1
-+4: UD1
-+5: UD1
-+6: UD1
-+7: UD1
-+EndTable
-+
-+# Grp11A and Grp11B are expressed as Grp11 in Intel SDM
-+GrpTable: Grp11A
-+0: MOV Eb,Ib
-+7: XABORT Ib (000),(11B)
-+EndTable
-+
-+GrpTable: Grp11B
-+0: MOV Eb,Iz
-+7: XBEGIN Jz (000),(11B)
-+EndTable
-+
-+GrpTable: Grp12
-+2: psrlw Nq,Ib (11B) | vpsrlw Hx,Ux,Ib (66),(11B),(v1)
-+4: psraw Nq,Ib (11B) | vpsraw Hx,Ux,Ib (66),(11B),(v1)
-+6: psllw Nq,Ib (11B) | vpsllw Hx,Ux,Ib (66),(11B),(v1)
-+EndTable
-+
-+GrpTable: Grp13
-+0: vprord/q Hx,Wx,Ib (66),(ev)
-+1: vprold/q Hx,Wx,Ib (66),(ev)
-+2: psrld Nq,Ib (11B) | vpsrld Hx,Ux,Ib (66),(11B),(v1)
-+4: psrad Nq,Ib (11B) | vpsrad Hx,Ux,Ib (66),(11B),(v1) | vpsrad/q Hx,Ux,Ib (66),(evo)
-+6: pslld Nq,Ib (11B) | vpslld Hx,Ux,Ib (66),(11B),(v1)
-+EndTable
-+
-+GrpTable: Grp14
-+2: psrlq Nq,Ib (11B) | vpsrlq Hx,Ux,Ib (66),(11B),(v1)
-+3: vpsrldq Hx,Ux,Ib (66),(11B),(v1)
-+6: psllq Nq,Ib (11B) | vpsllq Hx,Ux,Ib (66),(11B),(v1)
-+7: vpslldq Hx,Ux,Ib (66),(11B),(v1)
-+EndTable
-+
-+GrpTable: Grp15
-+0: fxsave | RDFSBASE Ry (F3),(11B)
-+1: fxstor | RDGSBASE Ry (F3),(11B)
-+2: vldmxcsr Md (v1) | WRFSBASE Ry (F3),(11B)
-+3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B)
-+4: XSAVE | ptwrite Ey (F3),(11B)
-+5: XRSTOR | lfence (11B) | INCSSPD/Q Ry (F3),(11B)
-+6: XSAVEOPT | clwb (66) | mfence (11B) | TPAUSE Rd (66),(11B) | UMONITOR Rv (F3),(11B) | UMWAIT Rd (F2),(11B) | CLRSSBSY Mq (F3)
-+7: clflush | clflushopt (66) | sfence (11B)
-+EndTable
-+
-+GrpTable: Grp16
-+0: prefetch NTA
-+1: prefetch T0
-+2: prefetch T1
-+3: prefetch T2
-+EndTable
-+
-+GrpTable: Grp17
-+1: BLSR By,Ey (v)
-+2: BLSMSK By,Ey (v)
-+3: BLSI By,Ey (v)
-+EndTable
-+
-+GrpTable: Grp18
-+1: vgatherpf0dps/d Wx (66),(ev)
-+2: vgatherpf1dps/d Wx (66),(ev)
-+5: vscatterpf0dps/d Wx (66),(ev)
-+6: vscatterpf1dps/d Wx (66),(ev)
-+EndTable
-+
-+GrpTable: Grp19
-+1: vgatherpf0qps/d Wx (66),(ev)
-+2: vgatherpf1qps/d Wx (66),(ev)
-+5: vscatterpf0qps/d Wx (66),(ev)
-+6: vscatterpf1qps/d Wx (66),(ev)
-+EndTable
-+
-+GrpTable: Grp20
-+0: cldemote Mb
-+EndTable
-+
-+GrpTable: Grp21
-+1: RDSSPD/Q Ry (F3),(11B)
-+7: ENDBR64 (F3),(010),(11B) | ENDBR32 (F3),(011),(11B)
-+EndTable
-+
-+# AMD's Prefetch Group
-+GrpTable: GrpP
-+0: PREFETCH
-+1: PREFETCHW
-+EndTable
-+
-+GrpTable: GrpPDLK
-+0: MONTMUL
-+1: XSHA1
-+2: XSHA2
-+EndTable
-+
-+GrpTable: GrpRNG
-+0: xstore-rng
-+1: xcrypt-ecb
-+2: xcrypt-cbc
-+4: xcrypt-cfb
-+5: xcrypt-ofb
-+EndTable
-diff --git a/test/elemnew4.ok b/test/elemnew4.ok
-new file mode 100644
-index 0000000..5376e24
---- /dev/null
-+++ b/test/elemnew4.ok
-@@ -0,0 +1,1767 @@
-+/* x86 opcode map generated from x86-opcode-map.txt */
-+/* Do not change this code. */
-+
-+/* Table: one byte opcode */
-+const insn_attr_t inat_primary_table[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_MODRM,
-+	[0x01] = INAT_MODRM,
-+	[0x02] = INAT_MODRM,
-+	[0x03] = INAT_MODRM,
-+	[0x04] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x05] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x08] = INAT_MODRM,
-+	[0x09] = INAT_MODRM,
-+	[0x0a] = INAT_MODRM,
-+	[0x0b] = INAT_MODRM,
-+	[0x0c] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x0d] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x0f] = INAT_MAKE_ESCAPE(1),
-+	[0x10] = INAT_MODRM,
-+	[0x11] = INAT_MODRM,
-+	[0x12] = INAT_MODRM,
-+	[0x13] = INAT_MODRM,
-+	[0x14] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x15] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x18] = INAT_MODRM,
-+	[0x19] = INAT_MODRM,
-+	[0x1a] = INAT_MODRM,
-+	[0x1b] = INAT_MODRM,
-+	[0x1c] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x1d] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x20] = INAT_MODRM,
-+	[0x21] = INAT_MODRM,
-+	[0x22] = INAT_MODRM,
-+	[0x23] = INAT_MODRM,
-+	[0x24] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x25] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x26] = INAT_MAKE_PREFIX(INAT_PFX_ES),
-+	[0x28] = INAT_MODRM,
-+	[0x29] = INAT_MODRM,
-+	[0x2a] = INAT_MODRM,
-+	[0x2b] = INAT_MODRM,
-+	[0x2c] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x2d] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x2e] = INAT_MAKE_PREFIX(INAT_PFX_CS),
-+	[0x30] = INAT_MODRM,
-+	[0x31] = INAT_MODRM,
-+	[0x32] = INAT_MODRM,
-+	[0x33] = INAT_MODRM,
-+	[0x34] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x35] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x36] = INAT_MAKE_PREFIX(INAT_PFX_SS),
-+	[0x38] = INAT_MODRM,
-+	[0x39] = INAT_MODRM,
-+	[0x3a] = INAT_MODRM,
-+	[0x3b] = INAT_MODRM,
-+	[0x3c] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x3d] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0x3e] = INAT_MAKE_PREFIX(INAT_PFX_DS),
-+	[0x40] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x41] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x42] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x43] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x44] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x45] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x46] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x47] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x48] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x49] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4a] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4b] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4c] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4d] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4e] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x4f] = INAT_MAKE_PREFIX(INAT_PFX_REX),
-+	[0x50] = INAT_FORCE64,
-+	[0x51] = INAT_FORCE64,
-+	[0x52] = INAT_FORCE64,
-+	[0x53] = INAT_FORCE64,
-+	[0x54] = INAT_FORCE64,
-+	[0x55] = INAT_FORCE64,
-+	[0x56] = INAT_FORCE64,
-+	[0x57] = INAT_FORCE64,
-+	[0x58] = INAT_FORCE64,
-+	[0x59] = INAT_FORCE64,
-+	[0x5a] = INAT_FORCE64,
-+	[0x5b] = INAT_FORCE64,
-+	[0x5c] = INAT_FORCE64,
-+	[0x5d] = INAT_FORCE64,
-+	[0x5e] = INAT_FORCE64,
-+	[0x5f] = INAT_FORCE64,
-+	[0x62] = INAT_MODRM | INAT_MAKE_PREFIX(INAT_PFX_EVEX),
-+	[0x63] = INAT_MODRM | INAT_MODRM,
-+	[0x64] = INAT_MAKE_PREFIX(INAT_PFX_FS),
-+	[0x65] = INAT_MAKE_PREFIX(INAT_PFX_GS),
-+	[0x66] = INAT_MAKE_PREFIX(INAT_PFX_OPNDSZ),
-+	[0x67] = INAT_MAKE_PREFIX(INAT_PFX_ADDRSZ),
-+	[0x68] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x69] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM,
-+	[0x6a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0x6b] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x71] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x72] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x73] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x74] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x75] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x76] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x77] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x78] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x79] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7a] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7b] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7c] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7d] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7e] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x7f] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0x80] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(1),
-+	[0x81] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM | INAT_MAKE_GROUP(1),
-+	[0x82] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(1),
-+	[0x83] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(1),
-+	[0x84] = INAT_MODRM,
-+	[0x85] = INAT_MODRM,
-+	[0x86] = INAT_MODRM,
-+	[0x87] = INAT_MODRM,
-+	[0x88] = INAT_MODRM,
-+	[0x89] = INAT_MODRM,
-+	[0x8a] = INAT_MODRM,
-+	[0x8b] = INAT_MODRM,
-+	[0x8c] = INAT_MODRM,
-+	[0x8d] = INAT_MODRM,
-+	[0x8e] = INAT_MODRM,
-+	[0x8f] = INAT_MAKE_GROUP(2) | INAT_MODRM | INAT_FORCE64,
-+	[0x9a] = INAT_MAKE_IMM(INAT_IMM_PTR),
-+	[0x9c] = INAT_FORCE64,
-+	[0x9d] = INAT_FORCE64,
-+	[0xa0] = INAT_MOFFSET,
-+	[0xa1] = INAT_MOFFSET,
-+	[0xa2] = INAT_MOFFSET,
-+	[0xa3] = INAT_MOFFSET,
-+	[0xa8] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xa9] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+	[0xb0] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb1] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb2] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb3] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb4] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb5] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb6] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb7] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xb8] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xb9] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xba] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xbb] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xbc] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xbd] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xbe] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xbf] = INAT_MAKE_IMM(INAT_IMM_VWORD),
-+	[0xc0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xc1] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_WORD) | INAT_FORCE64,
-+	[0xc4] = INAT_MODRM | INAT_MAKE_PREFIX(INAT_PFX_VEX3),
-+	[0xc5] = INAT_MODRM | INAT_MAKE_PREFIX(INAT_PFX_VEX2),
-+	[0xc6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(4),
-+	[0xc7] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM | INAT_MAKE_GROUP(5),
-+	[0xc8] = INAT_MAKE_IMM(INAT_IMM_WORD) | INAT_SCNDIMM,
-+	[0xc9] = INAT_FORCE64,
-+	[0xca] = INAT_MAKE_IMM(INAT_IMM_WORD),
-+	[0xcd] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xd0] = INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xd1] = INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xd2] = INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xd3] = INAT_MODRM | INAT_MAKE_GROUP(3),
-+	[0xd4] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xd5] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xd8] = INAT_MODRM,
-+	[0xd9] = INAT_MODRM,
-+	[0xda] = INAT_MODRM,
-+	[0xdb] = INAT_MODRM,
-+	[0xdc] = INAT_MODRM,
-+	[0xdd] = INAT_MODRM,
-+	[0xde] = INAT_MODRM,
-+	[0xdf] = INAT_MODRM,
-+	[0xe0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0xe1] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0xe2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0xe3] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0xe4] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xe5] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xe6] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xe7] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+	[0xe8] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0xe9] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0xea] = INAT_MAKE_IMM(INAT_IMM_PTR),
-+	[0xeb] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_FORCE64,
-+	[0xf0] = INAT_MAKE_PREFIX(INAT_PFX_LOCK),
-+	[0xf2] = INAT_MAKE_PREFIX(INAT_PFX_REPNE) | INAT_MAKE_PREFIX(INAT_PFX_REPNE),
-+	[0xf3] = INAT_MAKE_PREFIX(INAT_PFX_REPE) | INAT_MAKE_PREFIX(INAT_PFX_REPE),
-+	[0xf6] = INAT_MODRM | INAT_MAKE_GROUP(6),
-+	[0xf7] = INAT_MODRM | INAT_MAKE_GROUP(7),
-+	[0xfe] = INAT_MAKE_GROUP(8),
-+	[0xff] = INAT_MAKE_GROUP(9),
-+};
-+
-+/* Table: 2-byte opcode (0x0f) */
-+const insn_attr_t inat_escape_table_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_MAKE_GROUP(10),
-+	[0x01] = INAT_MAKE_GROUP(11),
-+	[0x02] = INAT_MODRM,
-+	[0x03] = INAT_MODRM,
-+	[0x0d] = INAT_MAKE_GROUP(12),
-+	[0x0f] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0x10] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x11] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x12] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x13] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x14] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x15] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x16] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x17] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x18] = INAT_MAKE_GROUP(13),
-+	[0x1a] = INAT_MODRM | INAT_VARIANT,
-+	[0x1b] = INAT_MODRM | INAT_VARIANT,
-+	[0x1c] = INAT_MAKE_GROUP(14),
-+	[0x1e] = INAT_MAKE_GROUP(15),
-+	[0x1f] = INAT_MODRM,
-+	[0x20] = INAT_MODRM,
-+	[0x21] = INAT_MODRM,
-+	[0x22] = INAT_MODRM,
-+	[0x23] = INAT_MODRM,
-+	[0x28] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x29] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x2a] = INAT_MODRM | INAT_VARIANT,
-+	[0x2b] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x2c] = INAT_MODRM | INAT_VARIANT,
-+	[0x2d] = INAT_MODRM | INAT_VARIANT,
-+	[0x2e] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x2f] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x38] = INAT_MAKE_ESCAPE(2),
-+	[0x3a] = INAT_MAKE_ESCAPE(3),
-+	[0x40] = INAT_MODRM,
-+	[0x41] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x42] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x43] = INAT_MODRM,
-+	[0x44] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x45] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x46] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x47] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x48] = INAT_MODRM,
-+	[0x49] = INAT_MODRM,
-+	[0x4a] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x4b] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x4c] = INAT_MODRM,
-+	[0x4d] = INAT_MODRM,
-+	[0x4e] = INAT_MODRM,
-+	[0x4f] = INAT_MODRM,
-+	[0x50] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x51] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x52] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x53] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x54] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x55] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x56] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x57] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x58] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x59] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x60] = INAT_MODRM | INAT_VARIANT,
-+	[0x61] = INAT_MODRM | INAT_VARIANT,
-+	[0x62] = INAT_MODRM | INAT_VARIANT,
-+	[0x63] = INAT_MODRM | INAT_VARIANT,
-+	[0x64] = INAT_MODRM | INAT_VARIANT,
-+	[0x65] = INAT_MODRM | INAT_VARIANT,
-+	[0x66] = INAT_MODRM | INAT_VARIANT,
-+	[0x67] = INAT_MODRM | INAT_VARIANT,
-+	[0x68] = INAT_MODRM | INAT_VARIANT,
-+	[0x69] = INAT_MODRM | INAT_VARIANT,
-+	[0x6a] = INAT_MODRM | INAT_VARIANT,
-+	[0x6b] = INAT_MODRM | INAT_VARIANT,
-+	[0x6c] = INAT_VARIANT,
-+	[0x6d] = INAT_VARIANT,
-+	[0x6e] = INAT_MODRM | INAT_VARIANT,
-+	[0x6f] = INAT_MODRM | INAT_VARIANT,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x71] = INAT_MAKE_GROUP(16),
-+	[0x72] = INAT_MAKE_GROUP(17),
-+	[0x73] = INAT_MAKE_GROUP(18),
-+	[0x74] = INAT_MODRM | INAT_VARIANT,
-+	[0x75] = INAT_MODRM | INAT_VARIANT,
-+	[0x76] = INAT_MODRM | INAT_VARIANT,
-+	[0x77] = INAT_VEXOK | INAT_VEXOK,
-+	[0x78] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x79] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x7a] = INAT_VARIANT,
-+	[0x7b] = INAT_VARIANT,
-+	[0x7c] = INAT_VARIANT,
-+	[0x7d] = INAT_VARIANT,
-+	[0x7e] = INAT_MODRM | INAT_VARIANT,
-+	[0x7f] = INAT_MODRM | INAT_VARIANT,
-+	[0x80] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x81] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x82] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x83] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x84] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x85] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x86] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x87] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x88] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x89] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8a] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8b] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8c] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8d] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8e] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x8f] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64,
-+	[0x90] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x91] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x92] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x93] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x94] = INAT_MODRM,
-+	[0x95] = INAT_MODRM,
-+	[0x96] = INAT_MODRM,
-+	[0x97] = INAT_MODRM,
-+	[0x98] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x99] = INAT_MODRM | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x9a] = INAT_MODRM,
-+	[0x9b] = INAT_MODRM,
-+	[0x9c] = INAT_MODRM,
-+	[0x9d] = INAT_MODRM,
-+	[0x9e] = INAT_MODRM,
-+	[0x9f] = INAT_MODRM,
-+	[0xa0] = INAT_FORCE64,
-+	[0xa1] = INAT_FORCE64,
-+	[0xa3] = INAT_MODRM,
-+	[0xa4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0xa5] = INAT_MODRM,
-+	[0xa6] = INAT_MAKE_GROUP(19),
-+	[0xa7] = INAT_MAKE_GROUP(20),
-+	[0xa8] = INAT_FORCE64,
-+	[0xa9] = INAT_FORCE64,
-+	[0xab] = INAT_MODRM,
-+	[0xac] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0xad] = INAT_MODRM,
-+	[0xae] = INAT_MAKE_GROUP(21),
-+	[0xaf] = INAT_MODRM,
-+	[0xb0] = INAT_MODRM,
-+	[0xb1] = INAT_MODRM,
-+	[0xb2] = INAT_MODRM,
-+	[0xb3] = INAT_MODRM,
-+	[0xb4] = INAT_MODRM,
-+	[0xb5] = INAT_MODRM,
-+	[0xb6] = INAT_MODRM,
-+	[0xb7] = INAT_MODRM,
-+	[0xb8] = INAT_VARIANT,
-+	[0xb9] = INAT_MAKE_GROUP(22),
-+	[0xba] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_MAKE_GROUP(23),
-+	[0xbb] = INAT_MODRM,
-+	[0xbc] = INAT_MODRM | INAT_VARIANT,
-+	[0xbd] = INAT_MODRM | INAT_VARIANT,
-+	[0xbe] = INAT_MODRM,
-+	[0xbf] = INAT_MODRM,
-+	[0xc0] = INAT_MODRM,
-+	[0xc1] = INAT_MODRM,
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0xc3] = INAT_MODRM,
-+	[0xc4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0xc5] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0xc6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0xc7] = INAT_MAKE_GROUP(24),
-+	[0xd0] = INAT_VARIANT,
-+	[0xd1] = INAT_MODRM | INAT_VARIANT,
-+	[0xd2] = INAT_MODRM | INAT_VARIANT,
-+	[0xd3] = INAT_MODRM | INAT_VARIANT,
-+	[0xd4] = INAT_MODRM | INAT_VARIANT,
-+	[0xd5] = INAT_MODRM | INAT_VARIANT,
-+	[0xd6] = INAT_VARIANT,
-+	[0xd7] = INAT_MODRM | INAT_VARIANT,
-+	[0xd8] = INAT_MODRM | INAT_VARIANT,
-+	[0xd9] = INAT_MODRM | INAT_VARIANT,
-+	[0xda] = INAT_MODRM | INAT_VARIANT,
-+	[0xdb] = INAT_MODRM | INAT_VARIANT,
-+	[0xdc] = INAT_MODRM | INAT_VARIANT,
-+	[0xdd] = INAT_MODRM | INAT_VARIANT,
-+	[0xde] = INAT_MODRM | INAT_VARIANT,
-+	[0xdf] = INAT_MODRM | INAT_VARIANT,
-+	[0xe0] = INAT_MODRM | INAT_VARIANT,
-+	[0xe1] = INAT_MODRM | INAT_VARIANT,
-+	[0xe2] = INAT_MODRM | INAT_VARIANT,
-+	[0xe3] = INAT_MODRM | INAT_VARIANT,
-+	[0xe4] = INAT_MODRM | INAT_VARIANT,
-+	[0xe5] = INAT_MODRM | INAT_VARIANT,
-+	[0xe6] = INAT_VARIANT,
-+	[0xe7] = INAT_MODRM | INAT_VARIANT,
-+	[0xe8] = INAT_MODRM | INAT_VARIANT,
-+	[0xe9] = INAT_MODRM | INAT_VARIANT,
-+	[0xea] = INAT_MODRM | INAT_VARIANT,
-+	[0xeb] = INAT_MODRM | INAT_VARIANT,
-+	[0xec] = INAT_MODRM | INAT_VARIANT,
-+	[0xed] = INAT_MODRM | INAT_VARIANT,
-+	[0xee] = INAT_MODRM | INAT_VARIANT,
-+	[0xef] = INAT_MODRM | INAT_VARIANT,
-+	[0xf0] = INAT_VARIANT,
-+	[0xf1] = INAT_MODRM | INAT_VARIANT,
-+	[0xf2] = INAT_MODRM | INAT_VARIANT,
-+	[0xf3] = INAT_MODRM | INAT_VARIANT,
-+	[0xf4] = INAT_MODRM | INAT_VARIANT,
-+	[0xf5] = INAT_MODRM | INAT_VARIANT,
-+	[0xf6] = INAT_MODRM | INAT_VARIANT,
-+	[0xf7] = INAT_MODRM | INAT_VARIANT,
-+	[0xf8] = INAT_MODRM | INAT_VARIANT,
-+	[0xf9] = INAT_MODRM | INAT_VARIANT,
-+	[0xfa] = INAT_MODRM | INAT_VARIANT,
-+	[0xfb] = INAT_MODRM | INAT_VARIANT,
-+	[0xfc] = INAT_MODRM | INAT_VARIANT,
-+	[0xfd] = INAT_MODRM | INAT_VARIANT,
-+	[0xfe] = INAT_MODRM | INAT_VARIANT,
-+};
-+const insn_attr_t inat_escape_table_1_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_MODRM | INAT_VEXOK,
-+	[0x11] = INAT_MODRM | INAT_VEXOK,
-+	[0x12] = INAT_MODRM | INAT_VEXOK,
-+	[0x13] = INAT_MODRM | INAT_VEXOK,
-+	[0x14] = INAT_MODRM | INAT_VEXOK,
-+	[0x15] = INAT_MODRM | INAT_VEXOK,
-+	[0x16] = INAT_MODRM | INAT_VEXOK,
-+	[0x17] = INAT_MODRM | INAT_VEXOK,
-+	[0x1a] = INAT_MODRM,
-+	[0x1b] = INAT_MODRM,
-+	[0x28] = INAT_MODRM | INAT_VEXOK,
-+	[0x29] = INAT_MODRM | INAT_VEXOK,
-+	[0x2a] = INAT_MODRM,
-+	[0x2b] = INAT_MODRM | INAT_VEXOK,
-+	[0x2c] = INAT_MODRM,
-+	[0x2d] = INAT_MODRM,
-+	[0x2e] = INAT_MODRM | INAT_VEXOK,
-+	[0x2f] = INAT_MODRM | INAT_VEXOK,
-+	[0x41] = INAT_MODRM | INAT_VEXOK,
-+	[0x42] = INAT_MODRM | INAT_VEXOK,
-+	[0x44] = INAT_MODRM | INAT_VEXOK,
-+	[0x45] = INAT_MODRM | INAT_VEXOK,
-+	[0x46] = INAT_MODRM | INAT_VEXOK,
-+	[0x47] = INAT_MODRM | INAT_VEXOK,
-+	[0x4a] = INAT_MODRM | INAT_VEXOK,
-+	[0x4b] = INAT_MODRM | INAT_VEXOK,
-+	[0x50] = INAT_MODRM | INAT_VEXOK,
-+	[0x51] = INAT_MODRM | INAT_VEXOK,
-+	[0x54] = INAT_MODRM | INAT_VEXOK,
-+	[0x55] = INAT_MODRM | INAT_VEXOK,
-+	[0x56] = INAT_MODRM | INAT_VEXOK,
-+	[0x57] = INAT_MODRM | INAT_VEXOK,
-+	[0x58] = INAT_MODRM | INAT_VEXOK,
-+	[0x59] = INAT_MODRM | INAT_VEXOK,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK,
-+	[0x60] = INAT_MODRM | INAT_VEXOK,
-+	[0x61] = INAT_MODRM | INAT_VEXOK,
-+	[0x62] = INAT_MODRM | INAT_VEXOK,
-+	[0x63] = INAT_MODRM | INAT_VEXOK,
-+	[0x64] = INAT_MODRM | INAT_VEXOK,
-+	[0x65] = INAT_MODRM | INAT_VEXOK,
-+	[0x66] = INAT_MODRM | INAT_VEXOK,
-+	[0x67] = INAT_MODRM | INAT_VEXOK,
-+	[0x68] = INAT_MODRM | INAT_VEXOK,
-+	[0x69] = INAT_MODRM | INAT_VEXOK,
-+	[0x6a] = INAT_MODRM | INAT_VEXOK,
-+	[0x6b] = INAT_MODRM | INAT_VEXOK,
-+	[0x6c] = INAT_MODRM | INAT_VEXOK,
-+	[0x6d] = INAT_MODRM | INAT_VEXOK,
-+	[0x6e] = INAT_MODRM | INAT_VEXOK,
-+	[0x6f] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x74] = INAT_MODRM | INAT_VEXOK,
-+	[0x75] = INAT_MODRM | INAT_VEXOK,
-+	[0x76] = INAT_MODRM | INAT_VEXOK,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7c] = INAT_MODRM | INAT_VEXOK,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK,
-+	[0x7e] = INAT_MODRM | INAT_VEXOK,
-+	[0x7f] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x90] = INAT_MODRM | INAT_VEXOK,
-+	[0x91] = INAT_MODRM | INAT_VEXOK,
-+	[0x92] = INAT_MODRM | INAT_VEXOK,
-+	[0x93] = INAT_MODRM | INAT_VEXOK,
-+	[0x98] = INAT_MODRM | INAT_VEXOK,
-+	[0x99] = INAT_MODRM | INAT_VEXOK,
-+	[0xbc] = INAT_MODRM,
-+	[0xbd] = INAT_MODRM,
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xc4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xc5] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xc6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xd0] = INAT_MODRM | INAT_VEXOK,
-+	[0xd1] = INAT_MODRM | INAT_VEXOK,
-+	[0xd2] = INAT_MODRM | INAT_VEXOK,
-+	[0xd3] = INAT_MODRM | INAT_VEXOK,
-+	[0xd4] = INAT_MODRM | INAT_VEXOK,
-+	[0xd5] = INAT_MODRM | INAT_VEXOK,
-+	[0xd6] = INAT_MODRM | INAT_VEXOK,
-+	[0xd7] = INAT_MODRM | INAT_VEXOK,
-+	[0xd8] = INAT_MODRM | INAT_VEXOK,
-+	[0xd9] = INAT_MODRM | INAT_VEXOK,
-+	[0xda] = INAT_MODRM | INAT_VEXOK,
-+	[0xdb] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0xdc] = INAT_MODRM | INAT_VEXOK,
-+	[0xdd] = INAT_MODRM | INAT_VEXOK,
-+	[0xde] = INAT_MODRM | INAT_VEXOK,
-+	[0xdf] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0xe0] = INAT_MODRM | INAT_VEXOK,
-+	[0xe1] = INAT_MODRM | INAT_VEXOK,
-+	[0xe2] = INAT_MODRM | INAT_VEXOK,
-+	[0xe3] = INAT_MODRM | INAT_VEXOK,
-+	[0xe4] = INAT_MODRM | INAT_VEXOK,
-+	[0xe5] = INAT_MODRM | INAT_VEXOK,
-+	[0xe6] = INAT_MODRM | INAT_VEXOK,
-+	[0xe7] = INAT_MODRM | INAT_VEXOK,
-+	[0xe8] = INAT_MODRM | INAT_VEXOK,
-+	[0xe9] = INAT_MODRM | INAT_VEXOK,
-+	[0xea] = INAT_MODRM | INAT_VEXOK,
-+	[0xeb] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0xec] = INAT_MODRM | INAT_VEXOK,
-+	[0xed] = INAT_MODRM | INAT_VEXOK,
-+	[0xee] = INAT_MODRM | INAT_VEXOK,
-+	[0xef] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0xf1] = INAT_MODRM | INAT_VEXOK,
-+	[0xf2] = INAT_MODRM | INAT_VEXOK,
-+	[0xf3] = INAT_MODRM | INAT_VEXOK,
-+	[0xf4] = INAT_MODRM | INAT_VEXOK,
-+	[0xf5] = INAT_MODRM | INAT_VEXOK,
-+	[0xf6] = INAT_MODRM | INAT_VEXOK,
-+	[0xf7] = INAT_MODRM | INAT_VEXOK,
-+	[0xf8] = INAT_MODRM | INAT_VEXOK,
-+	[0xf9] = INAT_MODRM | INAT_VEXOK,
-+	[0xfa] = INAT_MODRM | INAT_VEXOK,
-+	[0xfb] = INAT_MODRM | INAT_VEXOK,
-+	[0xfc] = INAT_MODRM | INAT_VEXOK,
-+	[0xfd] = INAT_MODRM | INAT_VEXOK,
-+	[0xfe] = INAT_MODRM | INAT_VEXOK,
-+};
-+const insn_attr_t inat_escape_table_1_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_MODRM | INAT_VEXOK,
-+	[0x11] = INAT_MODRM | INAT_VEXOK,
-+	[0x12] = INAT_MODRM | INAT_VEXOK,
-+	[0x16] = INAT_MODRM | INAT_VEXOK,
-+	[0x1a] = INAT_MODRM,
-+	[0x1b] = INAT_MODRM,
-+	[0x2a] = INAT_MODRM | INAT_VEXOK,
-+	[0x2c] = INAT_MODRM | INAT_VEXOK,
-+	[0x2d] = INAT_MODRM | INAT_VEXOK,
-+	[0x51] = INAT_MODRM | INAT_VEXOK,
-+	[0x52] = INAT_MODRM | INAT_VEXOK,
-+	[0x53] = INAT_MODRM | INAT_VEXOK,
-+	[0x58] = INAT_MODRM | INAT_VEXOK,
-+	[0x59] = INAT_MODRM | INAT_VEXOK,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK,
-+	[0x6f] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7e] = INAT_MODRM | INAT_VEXOK,
-+	[0x7f] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0xb8] = INAT_MODRM,
-+	[0xbc] = INAT_MODRM,
-+	[0xbd] = INAT_MODRM,
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xd6] = INAT_MODRM,
-+	[0xe6] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+};
-+const insn_attr_t inat_escape_table_1_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_MODRM | INAT_VEXOK,
-+	[0x11] = INAT_MODRM | INAT_VEXOK,
-+	[0x12] = INAT_MODRM | INAT_VEXOK,
-+	[0x1a] = INAT_MODRM,
-+	[0x1b] = INAT_MODRM,
-+	[0x2a] = INAT_MODRM | INAT_VEXOK,
-+	[0x2c] = INAT_MODRM | INAT_VEXOK,
-+	[0x2d] = INAT_MODRM | INAT_VEXOK,
-+	[0x51] = INAT_MODRM | INAT_VEXOK,
-+	[0x58] = INAT_MODRM | INAT_VEXOK,
-+	[0x59] = INAT_MODRM | INAT_VEXOK,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK,
-+	[0x6f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7c] = INAT_MODRM | INAT_VEXOK,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK,
-+	[0x7f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x92] = INAT_MODRM | INAT_VEXOK,
-+	[0x93] = INAT_MODRM | INAT_VEXOK,
-+	[0xbc] = INAT_MODRM,
-+	[0xbd] = INAT_MODRM,
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xd0] = INAT_MODRM | INAT_VEXOK,
-+	[0xd6] = INAT_MODRM,
-+	[0xe6] = INAT_MODRM | INAT_VEXOK,
-+	[0xf0] = INAT_MODRM | INAT_VEXOK,
-+};
-+
-+/* Table: 3-byte opcode 1 (0x0f 0x38) */
-+const insn_attr_t inat_escape_table_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_MODRM | INAT_VARIANT,
-+	[0x01] = INAT_MODRM | INAT_VARIANT,
-+	[0x02] = INAT_MODRM | INAT_VARIANT,
-+	[0x03] = INAT_MODRM | INAT_VARIANT,
-+	[0x04] = INAT_MODRM | INAT_VARIANT,
-+	[0x05] = INAT_MODRM | INAT_VARIANT,
-+	[0x06] = INAT_MODRM | INAT_VARIANT,
-+	[0x07] = INAT_MODRM | INAT_VARIANT,
-+	[0x08] = INAT_MODRM | INAT_VARIANT,
-+	[0x09] = INAT_MODRM | INAT_VARIANT,
-+	[0x0a] = INAT_MODRM | INAT_VARIANT,
-+	[0x0b] = INAT_MODRM | INAT_VARIANT,
-+	[0x0c] = INAT_VARIANT,
-+	[0x0d] = INAT_VARIANT,
-+	[0x0e] = INAT_VARIANT,
-+	[0x0f] = INAT_VARIANT,
-+	[0x10] = INAT_VARIANT,
-+	[0x11] = INAT_VARIANT,
-+	[0x12] = INAT_VARIANT,
-+	[0x13] = INAT_VARIANT,
-+	[0x14] = INAT_VARIANT,
-+	[0x15] = INAT_VARIANT,
-+	[0x16] = INAT_VARIANT,
-+	[0x17] = INAT_VARIANT,
-+	[0x18] = INAT_VARIANT,
-+	[0x19] = INAT_VARIANT,
-+	[0x1a] = INAT_VARIANT,
-+	[0x1b] = INAT_VARIANT,
-+	[0x1c] = INAT_MODRM | INAT_VARIANT,
-+	[0x1d] = INAT_MODRM | INAT_VARIANT,
-+	[0x1e] = INAT_MODRM | INAT_VARIANT,
-+	[0x1f] = INAT_VARIANT,
-+	[0x20] = INAT_VARIANT,
-+	[0x21] = INAT_VARIANT,
-+	[0x22] = INAT_VARIANT,
-+	[0x23] = INAT_VARIANT,
-+	[0x24] = INAT_VARIANT,
-+	[0x25] = INAT_VARIANT,
-+	[0x26] = INAT_VARIANT,
-+	[0x27] = INAT_VARIANT,
-+	[0x28] = INAT_VARIANT,
-+	[0x29] = INAT_VARIANT,
-+	[0x2a] = INAT_VARIANT,
-+	[0x2b] = INAT_VARIANT,
-+	[0x2c] = INAT_VARIANT,
-+	[0x2d] = INAT_VARIANT,
-+	[0x2e] = INAT_VARIANT,
-+	[0x2f] = INAT_VARIANT,
-+	[0x30] = INAT_VARIANT,
-+	[0x31] = INAT_VARIANT,
-+	[0x32] = INAT_VARIANT,
-+	[0x33] = INAT_VARIANT,
-+	[0x34] = INAT_VARIANT,
-+	[0x35] = INAT_VARIANT,
-+	[0x36] = INAT_VARIANT,
-+	[0x37] = INAT_VARIANT,
-+	[0x38] = INAT_VARIANT,
-+	[0x39] = INAT_VARIANT,
-+	[0x3a] = INAT_VARIANT,
-+	[0x3b] = INAT_VARIANT,
-+	[0x3c] = INAT_VARIANT,
-+	[0x3d] = INAT_VARIANT,
-+	[0x3e] = INAT_VARIANT,
-+	[0x3f] = INAT_VARIANT,
-+	[0x40] = INAT_VARIANT,
-+	[0x41] = INAT_VARIANT,
-+	[0x42] = INAT_VARIANT,
-+	[0x43] = INAT_VARIANT,
-+	[0x44] = INAT_VARIANT,
-+	[0x45] = INAT_VARIANT,
-+	[0x46] = INAT_VARIANT,
-+	[0x47] = INAT_VARIANT,
-+	[0x49] = INAT_VEXOK | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x4b] = INAT_VARIANT,
-+	[0x4c] = INAT_VARIANT,
-+	[0x4d] = INAT_VARIANT,
-+	[0x4e] = INAT_VARIANT,
-+	[0x4f] = INAT_VARIANT,
-+	[0x50] = INAT_VARIANT,
-+	[0x51] = INAT_VARIANT,
-+	[0x52] = INAT_VARIANT,
-+	[0x53] = INAT_VARIANT,
-+	[0x54] = INAT_VARIANT,
-+	[0x55] = INAT_VARIANT,
-+	[0x58] = INAT_VARIANT,
-+	[0x59] = INAT_VARIANT,
-+	[0x5a] = INAT_VARIANT,
-+	[0x5b] = INAT_VARIANT,
-+	[0x5c] = INAT_VARIANT,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x62] = INAT_VARIANT,
-+	[0x63] = INAT_VARIANT,
-+	[0x64] = INAT_VARIANT,
-+	[0x65] = INAT_VARIANT,
-+	[0x66] = INAT_VARIANT,
-+	[0x68] = INAT_VARIANT,
-+	[0x70] = INAT_VARIANT,
-+	[0x71] = INAT_VARIANT,
-+	[0x72] = INAT_VARIANT,
-+	[0x73] = INAT_VARIANT,
-+	[0x75] = INAT_VARIANT,
-+	[0x76] = INAT_VARIANT,
-+	[0x77] = INAT_VARIANT,
-+	[0x78] = INAT_VARIANT,
-+	[0x79] = INAT_VARIANT,
-+	[0x7a] = INAT_VARIANT,
-+	[0x7b] = INAT_VARIANT,
-+	[0x7c] = INAT_VARIANT,
-+	[0x7d] = INAT_VARIANT,
-+	[0x7e] = INAT_VARIANT,
-+	[0x7f] = INAT_VARIANT,
-+	[0x80] = INAT_VARIANT,
-+	[0x81] = INAT_VARIANT,
-+	[0x82] = INAT_VARIANT,
-+	[0x83] = INAT_VARIANT,
-+	[0x88] = INAT_VARIANT,
-+	[0x89] = INAT_VARIANT,
-+	[0x8a] = INAT_VARIANT,
-+	[0x8b] = INAT_VARIANT,
-+	[0x8c] = INAT_VARIANT,
-+	[0x8d] = INAT_VARIANT,
-+	[0x8e] = INAT_VARIANT,
-+	[0x8f] = INAT_VARIANT,
-+	[0x90] = INAT_VARIANT,
-+	[0x91] = INAT_VARIANT,
-+	[0x92] = INAT_VARIANT,
-+	[0x93] = INAT_VARIANT,
-+	[0x96] = INAT_VARIANT,
-+	[0x97] = INAT_VARIANT,
-+	[0x98] = INAT_VARIANT,
-+	[0x99] = INAT_VARIANT,
-+	[0x9a] = INAT_VARIANT,
-+	[0x9b] = INAT_VARIANT,
-+	[0x9c] = INAT_VARIANT,
-+	[0x9d] = INAT_VARIANT,
-+	[0x9e] = INAT_VARIANT,
-+	[0x9f] = INAT_VARIANT,
-+	[0xa0] = INAT_VARIANT,
-+	[0xa1] = INAT_VARIANT,
-+	[0xa2] = INAT_VARIANT,
-+	[0xa3] = INAT_VARIANT,
-+	[0xa6] = INAT_VARIANT,
-+	[0xa7] = INAT_VARIANT,
-+	[0xa8] = INAT_VARIANT,
-+	[0xa9] = INAT_VARIANT,
-+	[0xaa] = INAT_VARIANT,
-+	[0xab] = INAT_VARIANT,
-+	[0xac] = INAT_VARIANT,
-+	[0xad] = INAT_VARIANT,
-+	[0xae] = INAT_VARIANT,
-+	[0xaf] = INAT_VARIANT,
-+	[0xb4] = INAT_VARIANT,
-+	[0xb5] = INAT_VARIANT,
-+	[0xb6] = INAT_VARIANT,
-+	[0xb7] = INAT_VARIANT,
-+	[0xb8] = INAT_VARIANT,
-+	[0xb9] = INAT_VARIANT,
-+	[0xba] = INAT_VARIANT,
-+	[0xbb] = INAT_VARIANT,
-+	[0xbc] = INAT_VARIANT,
-+	[0xbd] = INAT_VARIANT,
-+	[0xbe] = INAT_VARIANT,
-+	[0xbf] = INAT_VARIANT,
-+	[0xc4] = INAT_VARIANT,
-+	[0xc6] = INAT_MAKE_GROUP(25),
-+	[0xc7] = INAT_MAKE_GROUP(26),
-+	[0xc8] = INAT_MODRM | INAT_VARIANT,
-+	[0xc9] = INAT_MODRM,
-+	[0xca] = INAT_MODRM | INAT_VARIANT,
-+	[0xcb] = INAT_MODRM | INAT_VARIANT,
-+	[0xcc] = INAT_MODRM | INAT_VARIANT,
-+	[0xcd] = INAT_MODRM | INAT_VARIANT,
-+	[0xcf] = INAT_VARIANT,
-+	[0xdb] = INAT_VARIANT,
-+	[0xdc] = INAT_VARIANT,
-+	[0xdd] = INAT_VARIANT,
-+	[0xde] = INAT_VARIANT,
-+	[0xdf] = INAT_VARIANT,
-+	[0xf0] = INAT_MODRM | INAT_MODRM | INAT_VARIANT,
-+	[0xf1] = INAT_MODRM | INAT_MODRM | INAT_VARIANT,
-+	[0xf2] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf3] = INAT_MAKE_GROUP(27),
-+	[0xf5] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_VARIANT,
-+	[0xf6] = INAT_MODRM | INAT_VARIANT,
-+	[0xf7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_VARIANT,
-+	[0xf8] = INAT_VARIANT,
-+	[0xf9] = INAT_MODRM,
-+};
-+const insn_attr_t inat_escape_table_2_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_MODRM | INAT_VEXOK,
-+	[0x01] = INAT_MODRM | INAT_VEXOK,
-+	[0x02] = INAT_MODRM | INAT_VEXOK,
-+	[0x03] = INAT_MODRM | INAT_VEXOK,
-+	[0x04] = INAT_MODRM | INAT_VEXOK,
-+	[0x05] = INAT_MODRM | INAT_VEXOK,
-+	[0x06] = INAT_MODRM | INAT_VEXOK,
-+	[0x07] = INAT_MODRM | INAT_VEXOK,
-+	[0x08] = INAT_MODRM | INAT_VEXOK,
-+	[0x09] = INAT_MODRM | INAT_VEXOK,
-+	[0x0a] = INAT_MODRM | INAT_VEXOK,
-+	[0x0b] = INAT_MODRM | INAT_VEXOK,
-+	[0x0c] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x0d] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x0e] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x0f] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x10] = INAT_MODRM | INAT_MODRM | INAT_VEXOK,
-+	[0x11] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x12] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x13] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x14] = INAT_MODRM | INAT_MODRM | INAT_VEXOK,
-+	[0x15] = INAT_MODRM | INAT_MODRM | INAT_VEXOK,
-+	[0x16] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x17] = INAT_MODRM | INAT_VEXOK,
-+	[0x18] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x19] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x1a] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x1b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x1c] = INAT_MODRM | INAT_VEXOK,
-+	[0x1d] = INAT_MODRM | INAT_VEXOK,
-+	[0x1e] = INAT_MODRM | INAT_VEXOK,
-+	[0x1f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x20] = INAT_MODRM | INAT_VEXOK,
-+	[0x21] = INAT_MODRM | INAT_VEXOK,
-+	[0x22] = INAT_MODRM | INAT_VEXOK,
-+	[0x23] = INAT_MODRM | INAT_VEXOK,
-+	[0x24] = INAT_MODRM | INAT_VEXOK,
-+	[0x25] = INAT_MODRM | INAT_VEXOK,
-+	[0x26] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x27] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x28] = INAT_MODRM | INAT_VEXOK,
-+	[0x29] = INAT_MODRM | INAT_VEXOK,
-+	[0x2a] = INAT_MODRM | INAT_VEXOK,
-+	[0x2b] = INAT_MODRM | INAT_VEXOK,
-+	[0x2c] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x2d] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x2e] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x2f] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x30] = INAT_MODRM | INAT_VEXOK,
-+	[0x31] = INAT_MODRM | INAT_VEXOK,
-+	[0x32] = INAT_MODRM | INAT_VEXOK,
-+	[0x33] = INAT_MODRM | INAT_VEXOK,
-+	[0x34] = INAT_MODRM | INAT_VEXOK,
-+	[0x35] = INAT_MODRM | INAT_VEXOK,
-+	[0x36] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x37] = INAT_MODRM | INAT_VEXOK,
-+	[0x38] = INAT_MODRM | INAT_VEXOK,
-+	[0x39] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x3a] = INAT_MODRM | INAT_VEXOK,
-+	[0x3b] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x3c] = INAT_MODRM | INAT_VEXOK,
-+	[0x3d] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x3e] = INAT_MODRM | INAT_VEXOK,
-+	[0x3f] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x40] = INAT_MODRM | INAT_VEXOK | INAT_MODRM | INAT_VEXOK,
-+	[0x41] = INAT_MODRM | INAT_VEXOK,
-+	[0x42] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x43] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x44] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x45] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x46] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x47] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x49] = INAT_MODRM | INAT_VEXOK,
-+	[0x4b] = INAT_MODRM | INAT_VEXOK,
-+	[0x4c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x50] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x51] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x52] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x53] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x54] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x55] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x58] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x59] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x62] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x63] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x64] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x65] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x66] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x70] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x71] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x72] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x73] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x75] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x76] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x77] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x80] = INAT_MODRM,
-+	[0x81] = INAT_MODRM,
-+	[0x82] = INAT_MODRM,
-+	[0x83] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x88] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x89] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x8a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x8b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x8c] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x8d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x8e] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x8f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x90] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x91] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MODRM | INAT_VEXOK,
-+	[0x92] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x93] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x96] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x97] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x98] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x99] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9a] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9b] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9c] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9d] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9e] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x9f] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xa0] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa1] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa2] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa3] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa6] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xa7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xa8] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xa9] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xaa] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xab] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xac] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xad] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xae] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xaf] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xb4] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb5] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb6] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xb7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xb8] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xb9] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xba] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xbb] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xbc] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xbd] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xbe] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xbf] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xc4] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xc8] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xca] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xcb] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xcc] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xcd] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xcf] = INAT_MODRM | INAT_VEXOK,
-+	[0xdb] = INAT_MODRM | INAT_VEXOK,
-+	[0xdc] = INAT_MODRM | INAT_VEXOK,
-+	[0xdd] = INAT_MODRM | INAT_VEXOK,
-+	[0xde] = INAT_MODRM | INAT_VEXOK,
-+	[0xdf] = INAT_MODRM | INAT_VEXOK,
-+	[0xf0] = INAT_MODRM,
-+	[0xf1] = INAT_MODRM,
-+	[0xf5] = INAT_MODRM,
-+	[0xf6] = INAT_MODRM,
-+	[0xf7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf8] = INAT_MODRM,
-+};
-+const insn_attr_t inat_escape_table_2_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x11] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x12] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x13] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x14] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x15] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x20] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x21] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x22] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x23] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x24] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x25] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x26] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x27] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x28] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x29] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x30] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x31] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x32] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x33] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x34] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x35] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x38] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x39] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x3a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4b] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x52] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x72] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xf5] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf6] = INAT_MODRM,
-+	[0xf7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf8] = INAT_MODRM,
-+};
-+const insn_attr_t inat_escape_table_2_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x49] = INAT_MODRM | INAT_VEXOK,
-+	[0x4b] = INAT_MODRM | INAT_VEXOK,
-+	[0x52] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x53] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK,
-+	[0x68] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x72] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xaa] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xab] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xf0] = INAT_MODRM | INAT_MODRM,
-+	[0xf1] = INAT_MODRM | INAT_MODRM,
-+	[0xf5] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf6] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf7] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0xf8] = INAT_MODRM,
-+};
-+
-+/* Table: 3-byte opcode 2 (0x0f 0x3a) */
-+const insn_attr_t inat_escape_table_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_VARIANT,
-+	[0x01] = INAT_VARIANT,
-+	[0x02] = INAT_VARIANT,
-+	[0x03] = INAT_VARIANT,
-+	[0x04] = INAT_VARIANT,
-+	[0x05] = INAT_VARIANT,
-+	[0x06] = INAT_VARIANT,
-+	[0x08] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x09] = INAT_VARIANT,
-+	[0x0a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x0b] = INAT_VARIANT,
-+	[0x0c] = INAT_VARIANT,
-+	[0x0d] = INAT_VARIANT,
-+	[0x0e] = INAT_VARIANT,
-+	[0x0f] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x14] = INAT_VARIANT,
-+	[0x15] = INAT_VARIANT,
-+	[0x16] = INAT_VARIANT,
-+	[0x17] = INAT_VARIANT,
-+	[0x18] = INAT_VARIANT,
-+	[0x19] = INAT_VARIANT,
-+	[0x1a] = INAT_VARIANT,
-+	[0x1b] = INAT_VARIANT,
-+	[0x1d] = INAT_VARIANT,
-+	[0x1e] = INAT_VARIANT,
-+	[0x1f] = INAT_VARIANT,
-+	[0x20] = INAT_VARIANT,
-+	[0x21] = INAT_VARIANT,
-+	[0x22] = INAT_VARIANT,
-+	[0x23] = INAT_VARIANT,
-+	[0x25] = INAT_VARIANT,
-+	[0x26] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x27] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x30] = INAT_VARIANT,
-+	[0x31] = INAT_VARIANT,
-+	[0x32] = INAT_VARIANT,
-+	[0x33] = INAT_VARIANT,
-+	[0x38] = INAT_VARIANT,
-+	[0x39] = INAT_VARIANT,
-+	[0x3a] = INAT_VARIANT,
-+	[0x3b] = INAT_VARIANT,
-+	[0x3e] = INAT_VARIANT,
-+	[0x3f] = INAT_VARIANT,
-+	[0x40] = INAT_VARIANT,
-+	[0x41] = INAT_VARIANT,
-+	[0x42] = INAT_VARIANT,
-+	[0x43] = INAT_VARIANT,
-+	[0x44] = INAT_VARIANT,
-+	[0x46] = INAT_VARIANT,
-+	[0x4a] = INAT_VARIANT,
-+	[0x4b] = INAT_VARIANT,
-+	[0x4c] = INAT_VARIANT,
-+	[0x50] = INAT_VARIANT,
-+	[0x51] = INAT_VARIANT,
-+	[0x54] = INAT_VARIANT,
-+	[0x55] = INAT_VARIANT,
-+	[0x56] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x57] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x60] = INAT_VARIANT,
-+	[0x61] = INAT_VARIANT,
-+	[0x62] = INAT_VARIANT,
-+	[0x63] = INAT_VARIANT,
-+	[0x66] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x67] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x70] = INAT_VARIANT,
-+	[0x71] = INAT_VARIANT,
-+	[0x72] = INAT_VARIANT,
-+	[0x73] = INAT_VARIANT,
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0xcc] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0xce] = INAT_VARIANT,
-+	[0xcf] = INAT_VARIANT,
-+	[0xdf] = INAT_VARIANT,
-+	[0xf0] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_escape_table_3_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x00] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x01] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x02] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x03] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x04] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x05] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x06] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x08] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x09] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0b] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0c] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0d] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0e] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x0f] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x14] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x15] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x16] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x17] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x18] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x19] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x1a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x1b] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x1d] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x1e] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x1f] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x20] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x21] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x22] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x23] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x25] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x26] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x27] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x30] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x31] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x32] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x33] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x38] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x39] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x3a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x3b] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x3e] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x3f] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x40] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x41] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x42] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x43] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x44] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x46] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x4a] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x4b] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x4c] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x50] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x51] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x54] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x55] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x56] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x57] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x60] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x61] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x62] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x63] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x66] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x67] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x70] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x71] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x72] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x73] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xce] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xcf] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0xdf] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+};
-+const insn_attr_t inat_escape_table_3_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0xc2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xf0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+};
-+const insn_attr_t inat_escape_table_3_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0xf0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+};
-+
-+/* Table: EVEX map 5 */
-+const insn_attr_t inat_avx_table_5[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_VARIANT,
-+	[0x11] = INAT_VARIANT,
-+	[0x1d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x2a] = INAT_VARIANT,
-+	[0x2c] = INAT_VARIANT,
-+	[0x2d] = INAT_VARIANT,
-+	[0x2e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x51] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x58] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x59] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x6e] = INAT_VARIANT,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x7a] = INAT_VARIANT,
-+	[0x7b] = INAT_VARIANT,
-+	[0x7c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x7e] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_avx_table_5_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x1d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x6e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+const insn_attr_t inat_avx_table_5_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x10] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x11] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x51] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x58] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x59] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x78] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x79] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+const insn_attr_t inat_avx_table_5_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x5a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x7d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+
-+/* Table: EVEX map 6 */
-+const insn_attr_t inat_avx_table_6[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x13] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY | INAT_VARIANT,
-+	[0x2c] = INAT_VARIANT,
-+	[0x2d] = INAT_VARIANT,
-+	[0x42] = INAT_VARIANT,
-+	[0x43] = INAT_VARIANT,
-+	[0x4c] = INAT_VARIANT,
-+	[0x4d] = INAT_VARIANT,
-+	[0x4e] = INAT_VARIANT,
-+	[0x4f] = INAT_VARIANT,
-+	[0x56] = INAT_VARIANT,
-+	[0x57] = INAT_VARIANT,
-+	[0x96] = INAT_VARIANT,
-+	[0x97] = INAT_VARIANT,
-+	[0x98] = INAT_VARIANT,
-+	[0x99] = INAT_VARIANT,
-+	[0x9a] = INAT_VARIANT,
-+	[0x9b] = INAT_VARIANT,
-+	[0x9c] = INAT_VARIANT,
-+	[0x9d] = INAT_VARIANT,
-+	[0x9e] = INAT_VARIANT,
-+	[0x9f] = INAT_VARIANT,
-+	[0xa6] = INAT_VARIANT,
-+	[0xa7] = INAT_VARIANT,
-+	[0xa8] = INAT_VARIANT,
-+	[0xa9] = INAT_VARIANT,
-+	[0xaa] = INAT_VARIANT,
-+	[0xab] = INAT_VARIANT,
-+	[0xac] = INAT_VARIANT,
-+	[0xad] = INAT_VARIANT,
-+	[0xae] = INAT_VARIANT,
-+	[0xaf] = INAT_VARIANT,
-+	[0xb6] = INAT_VARIANT,
-+	[0xb7] = INAT_VARIANT,
-+	[0xb8] = INAT_VARIANT,
-+	[0xb9] = INAT_VARIANT,
-+	[0xba] = INAT_VARIANT,
-+	[0xbb] = INAT_VARIANT,
-+	[0xbc] = INAT_VARIANT,
-+	[0xbd] = INAT_VARIANT,
-+	[0xbe] = INAT_VARIANT,
-+	[0xbf] = INAT_VARIANT,
-+	[0xd6] = INAT_VARIANT,
-+	[0xd7] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_avx_table_6_1[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x13] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x42] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x43] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x4f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x96] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x97] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x98] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x99] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9a] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9b] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9c] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9d] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9e] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x9f] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa7] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa8] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xa9] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xaa] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xab] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xac] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xad] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xae] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xaf] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb7] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb8] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xb9] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xba] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xbb] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xbc] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xbd] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xbe] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xbf] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+const insn_attr_t inat_avx_table_6_2[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x56] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x57] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xd6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xd7] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+const insn_attr_t inat_avx_table_6_3[INAT_OPCODE_TABLE_SIZE] = {
-+	[0x56] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x57] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xd6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0xd7] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+
-+/* GrpTable: Grp1 */
-+
-+/* GrpTable: Grp1A */
-+
-+/* GrpTable: Grp2 */
-+
-+/* GrpTable: Grp3_1 */
-+const insn_attr_t inat_group_table_6[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0x1] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM,
-+	[0x5] = INAT_MODRM,
-+	[0x6] = INAT_MODRM,
-+	[0x7] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp3_2 */
-+const insn_attr_t inat_group_table_7[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM,
-+	[0x1] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM,
-+	[0x5] = INAT_MODRM,
-+	[0x6] = INAT_MODRM,
-+	[0x7] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp4 */
-+const insn_attr_t inat_group_table_8[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp5 */
-+const insn_attr_t inat_group_table_9[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+	[0x2] = INAT_MODRM | INAT_FORCE64,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM | INAT_FORCE64,
-+	[0x5] = INAT_MODRM,
-+	[0x6] = INAT_MODRM | INAT_FORCE64,
-+};
-+
-+/* GrpTable: Grp6 */
-+const insn_attr_t inat_group_table_10[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM,
-+	[0x5] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp7 */
-+const insn_attr_t inat_group_table_11[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM,
-+	[0x5] = INAT_VARIANT,
-+	[0x6] = INAT_MODRM,
-+	[0x7] = INAT_MODRM,
-+};
-+const insn_attr_t inat_group_table_11_2[INAT_GROUP_TABLE_SIZE] = {
-+	[0x5] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp8 */
-+
-+/* GrpTable: Grp9 */
-+const insn_attr_t inat_group_table_24[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_MODRM,
-+	[0x6] = INAT_MODRM | INAT_MODRM | INAT_VARIANT,
-+	[0x7] = INAT_MODRM | INAT_MODRM | INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_24_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x6] = INAT_MODRM,
-+};
-+const insn_attr_t inat_group_table_24_2[INAT_GROUP_TABLE_SIZE] = {
-+	[0x6] = INAT_MODRM | INAT_MODRM,
-+	[0x7] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp10 */
-+
-+/* GrpTable: Grp11A */
-+const insn_attr_t inat_group_table_4[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM,
-+	[0x7] = INAT_MAKE_IMM(INAT_IMM_BYTE),
-+};
-+
-+/* GrpTable: Grp11B */
-+const insn_attr_t inat_group_table_5[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_MODRM,
-+	[0x7] = INAT_MAKE_IMM(INAT_IMM_VWORD32),
-+};
-+
-+/* GrpTable: Grp12 */
-+const insn_attr_t inat_group_table_16[INAT_GROUP_TABLE_SIZE] = {
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_16_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+};
-+
-+/* GrpTable: Grp13 */
-+const insn_attr_t inat_group_table_17[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_VARIANT,
-+	[0x1] = INAT_VARIANT,
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_17_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x1] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x4] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK | INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+};
-+
-+/* GrpTable: Grp14 */
-+const insn_attr_t inat_group_table_18[INAT_GROUP_TABLE_SIZE] = {
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x3] = INAT_VARIANT,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VARIANT,
-+	[0x7] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_18_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x2] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x3] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x6] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+	[0x7] = INAT_MAKE_IMM(INAT_IMM_BYTE) | INAT_MODRM | INAT_VEXOK,
-+};
-+
-+/* GrpTable: Grp15 */
-+const insn_attr_t inat_group_table_21[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_VARIANT,
-+	[0x1] = INAT_VARIANT,
-+	[0x2] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x3] = INAT_MODRM | INAT_VEXOK | INAT_VARIANT,
-+	[0x4] = INAT_VARIANT,
-+	[0x5] = INAT_VARIANT,
-+	[0x6] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_21_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x6] = INAT_MODRM,
-+};
-+const insn_attr_t inat_group_table_21_2[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+	[0x4] = INAT_MODRM,
-+	[0x5] = INAT_MODRM,
-+	[0x6] = INAT_MODRM | INAT_MODRM,
-+};
-+const insn_attr_t inat_group_table_21_3[INAT_GROUP_TABLE_SIZE] = {
-+	[0x6] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp16 */
-+const insn_attr_t inat_group_table_13[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+	[0x1] = INAT_MODRM,
-+	[0x2] = INAT_MODRM,
-+	[0x3] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp17 */
-+const insn_attr_t inat_group_table_27[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x2] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+	[0x3] = INAT_MODRM | INAT_VEXOK | INAT_VEXONLY,
-+};
-+
-+/* GrpTable: Grp18 */
-+const insn_attr_t inat_group_table_25[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_VARIANT,
-+	[0x2] = INAT_VARIANT,
-+	[0x5] = INAT_VARIANT,
-+	[0x6] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_25_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+
-+/* GrpTable: Grp19 */
-+const insn_attr_t inat_group_table_26[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_VARIANT,
-+	[0x2] = INAT_VARIANT,
-+	[0x5] = INAT_VARIANT,
-+	[0x6] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_26_1[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x2] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x5] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+	[0x6] = INAT_MODRM | INAT_VEXOK | INAT_EVEXONLY,
-+};
-+
-+/* GrpTable: Grp20 */
-+const insn_attr_t inat_group_table_14[INAT_GROUP_TABLE_SIZE] = {
-+	[0x0] = INAT_MODRM,
-+};
-+
-+/* GrpTable: Grp21 */
-+const insn_attr_t inat_group_table_15[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_VARIANT,
-+};
-+const insn_attr_t inat_group_table_15_2[INAT_GROUP_TABLE_SIZE] = {
-+	[0x1] = INAT_MODRM,
-+};
-+
-+/* GrpTable: GrpP */
-+
-+/* GrpTable: GrpPDLK */
-+
-+/* GrpTable: GrpRNG */
-+
-+#ifndef __BOOT_COMPRESSED
-+
-+/* Escape opcode map array */
-+const insn_attr_t * const inat_escape_tables[INAT_ESC_MAX + 1][INAT_LSTPFX_MAX + 1] = {
-+	[1][0] = inat_escape_table_1,
-+	[1][1] = inat_escape_table_1_1,
-+	[1][2] = inat_escape_table_1_2,
-+	[1][3] = inat_escape_table_1_3,
-+	[2][0] = inat_escape_table_2,
-+	[2][1] = inat_escape_table_2_1,
-+	[2][2] = inat_escape_table_2_2,
-+	[2][3] = inat_escape_table_2_3,
-+	[3][0] = inat_escape_table_3,
-+	[3][1] = inat_escape_table_3_1,
-+	[3][2] = inat_escape_table_3_2,
-+	[3][3] = inat_escape_table_3_3,
-+};
-+
-+/* Group opcode map array */
-+const insn_attr_t * const inat_group_tables[INAT_GRP_MAX + 1][INAT_LSTPFX_MAX + 1] = {
-+	[4][0] = inat_group_table_4,
-+	[5][0] = inat_group_table_5,
-+	[6][0] = inat_group_table_6,
-+	[7][0] = inat_group_table_7,
-+	[8][0] = inat_group_table_8,
-+	[9][0] = inat_group_table_9,
-+	[10][0] = inat_group_table_10,
-+	[11][0] = inat_group_table_11,
-+	[11][2] = inat_group_table_11_2,
-+	[13][0] = inat_group_table_13,
-+	[14][0] = inat_group_table_14,
-+	[15][0] = inat_group_table_15,
-+	[15][2] = inat_group_table_15_2,
-+	[16][0] = inat_group_table_16,
-+	[16][1] = inat_group_table_16_1,
-+	[17][0] = inat_group_table_17,
-+	[17][1] = inat_group_table_17_1,
-+	[18][0] = inat_group_table_18,
-+	[18][1] = inat_group_table_18_1,
-+	[21][0] = inat_group_table_21,
-+	[21][1] = inat_group_table_21_1,
-+	[21][2] = inat_group_table_21_2,
-+	[21][3] = inat_group_table_21_3,
-+	[24][0] = inat_group_table_24,
-+	[24][1] = inat_group_table_24_1,
-+	[24][2] = inat_group_table_24_2,
-+	[25][0] = inat_group_table_25,
-+	[25][1] = inat_group_table_25_1,
-+	[26][0] = inat_group_table_26,
-+	[26][1] = inat_group_table_26_1,
-+	[27][0] = inat_group_table_27,
-+};
-+
-+/* AVX opcode map array */
-+const insn_attr_t * const inat_avx_tables[X86_VEX_M_MAX + 1][INAT_LSTPFX_MAX + 1] = {
-+	[1][0] = inat_escape_table_1,
-+	[1][1] = inat_escape_table_1_1,
-+	[1][2] = inat_escape_table_1_2,
-+	[1][3] = inat_escape_table_1_3,
-+	[2][0] = inat_escape_table_2,
-+	[2][1] = inat_escape_table_2_1,
-+	[2][2] = inat_escape_table_2_2,
-+	[2][3] = inat_escape_table_2_3,
-+	[3][0] = inat_escape_table_3,
-+	[3][1] = inat_escape_table_3_1,
-+	[3][2] = inat_escape_table_3_2,
-+	[3][3] = inat_escape_table_3_3,
-+	[5][0] = inat_avx_table_5,
-+	[5][1] = inat_avx_table_5_1,
-+	[5][2] = inat_avx_table_5_2,
-+	[5][3] = inat_avx_table_5_3,
-+	[6][0] = inat_avx_table_6,
-+	[6][1] = inat_avx_table_6_1,
-+	[6][2] = inat_avx_table_6_2,
-+	[6][3] = inat_avx_table_6_3,
-+};
-+
-+#else /* !__BOOT_COMPRESSED */
-+
-+/* Escape opcode map array */
-+static const insn_attr_t *inat_escape_tables[INAT_ESC_MAX + 1][INAT_LSTPFX_MAX + 1];
-+
-+/* Group opcode map array */
-+static const insn_attr_t *inat_group_tables[INAT_GRP_MAX + 1][INAT_LSTPFX_MAX + 1];
-+
-+/* AVX opcode map array */
-+static const insn_attr_t *inat_avx_tables[X86_VEX_M_MAX + 1][INAT_LSTPFX_MAX + 1];
-+
-+static void inat_init_tables(void)
-+{
-+	/* Print Escape opcode map array */
-+	inat_escape_tables[1][0] = inat_escape_table_1;
-+	inat_escape_tables[1][1] = inat_escape_table_1_1;
-+	inat_escape_tables[1][2] = inat_escape_table_1_2;
-+	inat_escape_tables[1][3] = inat_escape_table_1_3;
-+	inat_escape_tables[2][0] = inat_escape_table_2;
-+	inat_escape_tables[2][1] = inat_escape_table_2_1;
-+	inat_escape_tables[2][2] = inat_escape_table_2_2;
-+	inat_escape_tables[2][3] = inat_escape_table_2_3;
-+	inat_escape_tables[3][0] = inat_escape_table_3;
-+	inat_escape_tables[3][1] = inat_escape_table_3_1;
-+	inat_escape_tables[3][2] = inat_escape_table_3_2;
-+	inat_escape_tables[3][3] = inat_escape_table_3_3;
-+
-+	/* Print Group opcode map array */
-+	inat_group_tables[4][0] = inat_group_table_4;
-+	inat_group_tables[5][0] = inat_group_table_5;
-+	inat_group_tables[6][0] = inat_group_table_6;
-+	inat_group_tables[7][0] = inat_group_table_7;
-+	inat_group_tables[8][0] = inat_group_table_8;
-+	inat_group_tables[9][0] = inat_group_table_9;
-+	inat_group_tables[10][0] = inat_group_table_10;
-+	inat_group_tables[11][0] = inat_group_table_11;
-+	inat_group_tables[11][2] = inat_group_table_11_2;
-+	inat_group_tables[13][0] = inat_group_table_13;
-+	inat_group_tables[14][0] = inat_group_table_14;
-+	inat_group_tables[15][0] = inat_group_table_15;
-+	inat_group_tables[15][2] = inat_group_table_15_2;
-+	inat_group_tables[16][0] = inat_group_table_16;
-+	inat_group_tables[16][1] = inat_group_table_16_1;
-+	inat_group_tables[17][0] = inat_group_table_17;
-+	inat_group_tables[17][1] = inat_group_table_17_1;
-+	inat_group_tables[18][0] = inat_group_table_18;
-+	inat_group_tables[18][1] = inat_group_table_18_1;
-+	inat_group_tables[21][0] = inat_group_table_21;
-+	inat_group_tables[21][1] = inat_group_table_21_1;
-+	inat_group_tables[21][2] = inat_group_table_21_2;
-+	inat_group_tables[21][3] = inat_group_table_21_3;
-+	inat_group_tables[24][0] = inat_group_table_24;
-+	inat_group_tables[24][1] = inat_group_table_24_1;
-+	inat_group_tables[24][2] = inat_group_table_24_2;
-+	inat_group_tables[25][0] = inat_group_table_25;
-+	inat_group_tables[25][1] = inat_group_table_25_1;
-+	inat_group_tables[26][0] = inat_group_table_26;
-+	inat_group_tables[26][1] = inat_group_table_26_1;
-+	inat_group_tables[27][0] = inat_group_table_27;
-+
-+	/* Print AVX opcode map array */
-+	inat_avx_tables[1][0] = inat_escape_table_1;
-+	inat_avx_tables[1][1] = inat_escape_table_1_1;
-+	inat_avx_tables[1][2] = inat_escape_table_1_2;
-+	inat_avx_tables[1][3] = inat_escape_table_1_3;
-+	inat_avx_tables[2][0] = inat_escape_table_2;
-+	inat_avx_tables[2][1] = inat_escape_table_2_1;
-+	inat_avx_tables[2][2] = inat_escape_table_2_2;
-+	inat_avx_tables[2][3] = inat_escape_table_2_3;
-+	inat_avx_tables[3][0] = inat_escape_table_3;
-+	inat_avx_tables[3][1] = inat_escape_table_3_1;
-+	inat_avx_tables[3][2] = inat_escape_table_3_2;
-+	inat_avx_tables[3][3] = inat_escape_table_3_3;
-+	inat_avx_tables[5][0] = inat_avx_table_5;
-+	inat_avx_tables[5][1] = inat_avx_table_5_1;
-+	inat_avx_tables[5][2] = inat_avx_table_5_2;
-+	inat_avx_tables[5][3] = inat_avx_table_5_3;
-+	inat_avx_tables[6][0] = inat_avx_table_6;
-+	inat_avx_tables[6][1] = inat_avx_table_6_1;
-+	inat_avx_tables[6][2] = inat_avx_table_6_2;
-+	inat_avx_tables[6][3] = inat_avx_table_6_3;
-+}
-+#endif
--- 
-2.33.0
-
diff --git a/gawk-5.2.0.tar.xz b/gawk-5.2.2.tar.xz
similarity index 32%
rename from gawk-5.2.0.tar.xz
rename to gawk-5.2.2.tar.xz
index db4aeb5947f960dad1aabef1685e9d7bcd37112e..663b9f912d77e717509585dfb73b5cc5d43abb95 100644
Binary files a/gawk-5.2.0.tar.xz and b/gawk-5.2.2.tar.xz differ
diff --git a/gawk.spec b/gawk.spec
index 6264f4dec93bd1c5e3fe3f06748c8899d188240a..1053fef90cec0a3fbb4faa797d2d061d7faf8d2b 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -3,8 +3,8 @@
 %global gawk_api_minor %%(tar -xf %{name}-%{version}.tar.xz %{name}-%{version}/gawkapi.h --to-stdout |\
 			 egrep -i "gawk_api_minor.*[0-9]+" | egrep -o "[0-9]")
 Name:		gawk
-Version:	5.2.0
-Release:	3
+Version:	5.2.2
+Release:	1
 License:	GPLv3+ and GPLv2+ and LGPLv2+ and BSD
 Summary:	The GNU version of the AWK text processing utility
 URL:		https://www.gnu.org/software/gawk/
@@ -13,18 +13,10 @@ Source0:	https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 #Patch1:         Disable-racy-test-in-test-iolint.awk.patch
 #Patch2:         Restore-removed-test-in-test-iolint.awk.patch
 #Patch3:         Reorder-statements-in-iolint-to-try-to-eliminate-a-r.patch
-Patch4:         pma.patch
 Patch5:         Disable-pma-test.awk.patch
 
-Patch6:         backport-Fix-a-bug-with-Node_elem_new.patch
-Patch7:         backport-Additional-fix-for-Node_elem_new.patch
-Patch8:         backport-Yet-another-fix-and-test-for-Node_elem_new.patch
-Patch9:         backport-Fix-a-memory-leak.patch
-Patch10:        backport-Code-simplification-in-interpret.h.patch
-Patch11:        backport-Fix-negative-NaN-issue-on-RiscV.patch
-
 BuildRequires:	gcc automake grep
-BuildRequires:	bison texinfo texinfo-tex ghostscript texlive-ec texlive-cm-super glibc-all-langpacks
+BuildRequires:	bison texinfo >= 7.0.1 texinfo-tex >= 7.0.1 ghostscript texlive-ec texlive-cm-super glibc-all-langpacks
 BuildRequires:	libsigsegv-devel mpfr-devel readline-devel
 Requires:	filesystem >= 3
 
@@ -112,11 +104,15 @@ install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
 %doc %{_docdir}/%{name}/html
 %{_mandir}/man{1/*,3/*}
 %{_infodir}/*awk*.info*
+%{_infodir}/gawk_*
 
 %files lang
 %{_datadir}/locale/*
 
 %changelog
+* Mon Oct 9 2023 huyubiao <huyubiao@huawei.com> - 5.2.2-1
+- update gawk to 5.2.2
+
 * Thu Jan 19 2023 laokz <zhangkai@iscas.ac.cn> - 5.2.0-3
 - Type:bugfix
 - ID:NA
diff --git a/pma.patch b/pma.patch
deleted file mode 100644
index 1369ed329053b262fd48ea7391f33a15c056c33a..0000000000000000000000000000000000000000
--- a/pma.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: gawk-5.2.0/support/pma.c
-===================================================================
---- gawk-5.2.0.orig/support/pma.c
-+++ gawk-5.2.0/support/pma.c
-@@ -340,16 +340,20 @@ static void flr(ao_t *p) {  // remove ao
- #define MMAP(N) mmap(NULL, (N), PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0)
- #define MUNMAP(A, N) do { if (0 != munmap((A), (N))) { ERR("munmap()" ERN); SERN; } } while (0)
- static void * addrgap(off_t n) {  // find big gap in address space to map n bytes
--  void *A, *Amax = NULL;  size_t L = 0, U, Max = 0, N = (size_t)n;  char *r;
-+  void *A, *Amax = NULL;  size_t L, U, Max = 0, N = (size_t)n;  char *r;
-   FYI("addrgap(%jd)\n", (intmax_t)n);  // TODO: better way to handle off_t
-   if (N < sizeof(pma_hdr_t) + 40960) { ERR("file size %zu too small\n", N); SERN; }
--  for (U = 1; ; U *= 2)  // double upper bound until failure
--    if (MAP_FAILED == (A = MMAP(U))) break;
--    else                   MUNMAP(A, U);
--  while (1 + L < U) {  // binary search between bounds
-+  // Binary search to find max length of successfull mmap().
-+  // Invariants:
-+  //   Larger max might lie in range [L,U] inclusive.
-+  //   If a previous max has been found, it must lie in [1,L-1].
-+  //   A larger max cannot lie in [U+1,UINT64_MAX].
-+  L = 1;  // mmap fails if length == 0 (SUSv3)
-+  U = UINT64_MAX;
-+  while (L <= U) {
-     size_t M = L + (U - L) / 2;  // avoid overflow
--    if (MAP_FAILED == (A = MMAP(M))) {      U = M; }
--    else { Amax = A; Max = M; MUNMAP(A, M); L = M; }
-+    if (MAP_FAILED != (A = MMAP(M))) { assert(Max < M); Max = M; Amax = A; MUNMAP(A, M); if (UINT64_MAX == M) break; L = M + 1; }
-+    else                             { assert(0   < M);                                                              U = M - 1; }
-   }
-   FYI("max gap: %zu bytes at %p\n", Max, Amax);
-   if (Max < N + (size_t)ALGN * 2) {  // safety margin
-@@ -392,6 +396,7 @@ int pma_init(int verbose, const char *fi
-   assert((himask | lomask) == ~((uintptr_t)0));
-   if (! (WDSZ == sizeof(void *) && // in C11 we'd static_assert()
-          WDSZ == sizeof(size_t) &&
-+         WDSZ == sizeof(off_t)  &&
-          WDSZ == sizeof(unsigned long))) { ERR("word size not 64 bits\n"); SERL; }
-   assert(0 == sizeof(pma_hdr_t) % WDSZ);
-   if (NULL == file) {