Fix 2 bugs with parsing the resource dependency tables.

	* ia64-gen.c (fetch_insn_class): If xsect, then ignore comment and
	notestr if larger than xsect.
	(in_class): Handle format M5.
	* ia64-asmtab.c: Regnerate.

3 files changed, 437 insertions, 396 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 32185d83946..3bbe593a939 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-19  Jim Wilson  <wilson@redhat.com>
+
+	* ia64-gen.c (fetch_insn_class): If xsect, then ignore comment and
+	notestr if larger than xsect.
+	(in_class): Handle format M5.
+	* ia64-asmtab.c: Regnerate.
+
 2001-03-19  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* vax-dis.c (print_insn_vax): Only fetch two bytes if the info buffer
diff --git a/opcodes/ia64-asmtab.c b/opcodes/ia64-asmtab.c
index a159526dfa6..45f60eba580 100644
--- a/opcodes/ia64-asmtab.c
+++ b/opcodes/ia64-asmtab.c
@@ -1445,70 +1445,86 @@ static const short dep222[] = {
 };
 
 static const short dep223[] = {
+  0, 32, 33, 67, 68, 73, 75, 88, 102, 119, 120, 122, 123, 126, 127, 128, 130, 
+  131, 138, 155, 166, 170, 173, 252, 259, 2129, 2130, 2131, 2157, 2158, 2161, 
+  2164, 2297, 4127, 20605, 
+};
+
+static const short dep224[] = {
+  0, 23, 88, 100, 173, 204, 252, 259, 2131, 2297, 
+};
+
+static const short dep225[] = {
+  0, 32, 33, 67, 68, 73, 75, 88, 102, 119, 120, 122, 123, 126, 127, 128, 130, 
+  131, 138, 155, 166, 170, 173, 204, 252, 259, 2129, 2130, 2131, 2157, 2158, 
+  2161, 2164, 2297, 4127, 20605, 
+};
+
+static const short dep226[] = {
   32, 33, 67, 68, 73, 75, 88, 100, 102, 119, 120, 122, 123, 126, 127, 128, 130, 
   131, 138, 155, 166, 170, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2295, 
   4127, 16516, 16518, 18731, 18733, 18734, 18736, 20605, 
 };
 
-static const short dep224[] = {
+static const short dep227[] = {
   32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 119, 120, 122, 123, 126, 127, 128, 
   130, 131, 138, 140, 155, 166, 170, 252, 2129, 2130, 2131, 2157, 2158, 2161, 
   2164, 2295, 4127, 16516, 16518, 18731, 18733, 18734, 18736, 20605, 
 };
 
-static const short dep225[] = {
+static const short dep228[] = {
   0, 88, 173, 252, 2127, 2295, 18585, 18586, 18731, 18732, 18734, 18735, 
 };
 
-static const short dep226[] = {
+static const short dep229[] = {
   0, 32, 33, 67, 68, 73, 75, 88, 100, 102, 119, 120, 122, 123, 126, 127, 128, 
   130, 131, 138, 155, 166, 170, 173, 252, 2129, 2130, 2131, 2157, 2158, 2161, 
   2164, 2295, 4127, 16516, 16518, 18731, 18733, 18734, 18736, 20605, 
 };
 
-static const short dep227[] = {
+static const short dep230[] = {
   0, 32, 33, 36, 67, 68, 73, 75, 88, 100, 102, 119, 120, 122, 123, 126, 127, 
   128, 130, 131, 138, 140, 155, 166, 170, 173, 252, 2129, 2130, 2131, 2157, 
   2158, 2161, 2164, 2295, 4127, 16516, 16518, 18731, 18733, 18734, 18736, 20605, 
   
 };
 
-static const short dep228[] = {
+static const short dep231[] = {
   0, 88, 173, 252, 2128, 2295, 18585, 18586, 18731, 18732, 18734, 18735, 
 };
 
-static const short dep229[] = {
+static const short dep232[] = {
   32, 33, 67, 88, 126, 140, 166, 252, 2157, 2158, 2161, 2164, 4127, 
 };
 
-static const short dep230[] = {
+static const short dep233[] = {
   32, 33, 67, 88, 126, 127, 131, 140, 166, 252, 2157, 2158, 2161, 2164, 4127, 
   
 };
 
-static const short dep231[] = {
+static const short dep234[] = {
   32, 33, 67, 88, 126, 140, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 
   2297, 4127, 20605, 
 };
 
-static const short dep232[] = {
+static const short dep235[] = {
   32, 33, 67, 88, 126, 127, 131, 140, 166, 252, 2129, 2130, 2131, 2157, 2158, 
   2161, 2164, 2297, 4127, 20605, 
 };
 
-static const short dep233[] = {
+static const short dep236[] = {
   32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2295, 4127, 
   16516, 16518, 18731, 18733, 18734, 18736, 20605, 
 };
 
-static const short dep234[] = {
+static const short dep237[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 20, 21, 22, 23, 
   88, 174, 175, 176, 177, 178, 179, 180, 181, 183, 184, 186, 187, 189, 190, 
   192, 193, 194, 195, 196, 198, 201, 202, 203, 204, 252, 2064, 2073, 2131, 2245, 
   2254, 2297, 28844, 28987, 
 };
 
-static const short dep235[] = {
+static const short dep238[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 21, 22, 23, 
   32, 33, 88, 126, 163, 166, 174, 175, 176, 177, 178, 179, 180, 181, 183, 184, 
   186, 187, 189, 190, 192, 193, 194, 195, 196, 198, 200, 202, 203, 204, 252, 
@@ -1654,18 +1670,20 @@ op_dependencies[] = {
   { NELS(dep220), dep220, NELS(dep219), dep219, },
   { NELS(dep221), dep221, NELS(dep219), dep219, },
   { NELS(dep222), dep222, NELS(dep0), dep0, },
-  { NELS(dep223), dep223, NELS(dep62), dep62, },
-  { NELS(dep224), dep224, NELS(dep62), dep62, },
-  { NELS(dep226), dep226, NELS(dep225), dep225, },
-  { NELS(dep227), dep227, NELS(dep225), dep225, },
-  { NELS(dep226), dep226, NELS(dep228), dep228, },
-  { NELS(dep229), dep229, NELS(dep31), dep31, },
-  { NELS(dep230), dep230, NELS(dep31), dep31, },
-  { NELS(dep231), dep231, NELS(dep0), dep0, },
-  { NELS(dep232), dep232, NELS(dep0), dep0, },
-  { NELS(dep233), dep233, NELS(dep62), dep62, },
+  { NELS(dep223), dep223, NELS(dep219), dep219, },
+  { NELS(dep225), dep225, NELS(dep224), dep224, },
+  { NELS(dep226), dep226, NELS(dep62), dep62, },
+  { NELS(dep227), dep227, NELS(dep62), dep62, },
+  { NELS(dep229), dep229, NELS(dep228), dep228, },
+  { NELS(dep230), dep230, NELS(dep228), dep228, },
+  { NELS(dep229), dep229, NELS(dep231), dep231, },
+  { NELS(dep232), dep232, NELS(dep31), dep31, },
+  { NELS(dep233), dep233, NELS(dep31), dep31, },
+  { NELS(dep234), dep234, NELS(dep0), dep0, },
+  { NELS(dep235), dep235, NELS(dep0), dep0, },
+  { NELS(dep236), dep236, NELS(dep62), dep62, },
   { 0, NULL, 0, NULL, },
-  { NELS(dep235), dep235, NELS(dep234), dep234, },
+  { NELS(dep238), dep238, NELS(dep237), dep237, },
 };
 
 static const struct ia64_completer_table
@@ -1685,12 +1703,12 @@ completer_table[] = {
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, 449, -1, 0, 1, 6 },
   { 0x0, 0x0, 0, 512, -1, 0, 1, 17 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 147 },
   { 0x0, 0x0, 0, 611, -1, 0, 1, 17 },
   { 0x0, 0x0, 0, 1815, -1, 0, 1, 10 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 9 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 71 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 71 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 13 },
   { 0x1, 0x1, 0, -1, -1, 13, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 33 },
@@ -1750,27 +1768,27 @@ completer_table[] = {
   { 0x0, 0x0, 0, 1285, -1, 0, 1, 124 },
   { 0x0, 0x0, 0, 1295, -1, 0, 1, 124 },
   { 0x0, 0x0, 0, 1305, -1, 0, 1, 124 },
-  { 0x0, 0x0, 0, 1314, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1320, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1326, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1332, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1338, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1344, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1350, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1356, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1362, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1368, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1374, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1380, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1386, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1392, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1398, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1404, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1410, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1416, -1, 0, 1, 135 },
-  { 0x0, 0x0, 0, 1420, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1424, -1, 0, 1, 142 },
-  { 0x0, 0x0, 0, 1428, -1, 0, 1, 142 },
+  { 0x0, 0x0, 0, 1314, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1320, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1326, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1332, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1338, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1344, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1350, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1356, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1362, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1368, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1374, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1380, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1386, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1392, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1398, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1404, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1410, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1416, -1, 0, 1, 137 },
+  { 0x0, 0x0, 0, 1420, -1, 0, 1, 142 },
+  { 0x0, 0x0, 0, 1424, -1, 0, 1, 144 },
+  { 0x0, 0x0, 0, 1428, -1, 0, 1, 144 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 79 },
   { 0x0, 0x0, 0, 250, -1, 0, 1, 40 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
@@ -1805,13 +1823,13 @@ completer_table[] = {
   { 0x0, 0x0, 0, -1, -1, 0, 1, 111 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 112 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 113 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 146 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 146 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 146 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 148 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 148 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 148 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 71 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 147 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, 2371, -1, 0, 1, 0 },
@@ -1851,13 +1869,13 @@ completer_table[] = {
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 84 },
   { 0x0, 0x0, 0, 1692, -1, 0, 1, 130 },
-  { 0x0, 0x0, 0, 1694, -1, 0, 1, 130 },
+  { 0x0, 0x0, 0, 1694, -1, 0, 1, 135 },
   { 0x0, 0x0, 0, 1696, -1, 0, 1, 130 },
-  { 0x0, 0x0, 0, 1698, -1, 0, 1, 130 },
+  { 0x0, 0x0, 0, 1698, -1, 0, 1, 135 },
   { 0x0, 0x0, 0, 1700, -1, 0, 1, 130 },
-  { 0x0, 0x0, 0, 1702, -1, 0, 1, 130 },
+  { 0x0, 0x0, 0, 1702, -1, 0, 1, 135 },
   { 0x0, 0x0, 0, 1705, -1, 0, 1, 130 },
-  { 0x0, 0x0, 0, 1708, -1, 0, 1, 130 },
+  { 0x0, 0x0, 0, 1708, -1, 0, 1, 135 },
   { 0x0, 0x0, 0, 1711, -1, 0, 1, 130 },
   { 0x0, 0x0, 0, 1712, -1, 0, 1, 130 },
   { 0x0, 0x0, 0, 1713, -1, 0, 1, 130 },
@@ -1902,24 +1920,24 @@ completer_table[] = {
   { 0x1, 0x1, 3, 2271, 1277, 33, 1, 126 },
   { 0x1, 0x1, 3, 2272, 1287, 33, 1, 126 },
   { 0x1, 0x1, 3, 2273, 1297, 33, 1, 126 },
-  { 0x1, 0x1, 3, 2274, 1310, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2275, 1316, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2276, 1322, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2277, 1328, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2278, 1334, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2279, 1340, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2280, 1346, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2281, 1352, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2282, 1358, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2283, 1364, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2284, 1370, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2285, 1376, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2286, 1382, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2287, 1388, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2288, 1394, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2289, 1400, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2290, 1406, 33, 1, 137 },
-  { 0x1, 0x1, 3, 2291, 1412, 33, 1, 137 },
+  { 0x1, 0x1, 3, 2274, 1310, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2275, 1316, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2276, 1322, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2277, 1328, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2278, 1334, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2279, 1340, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2280, 1346, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2281, 1352, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2282, 1358, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2283, 1364, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2284, 1370, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2285, 1376, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2286, 1382, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2287, 1388, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2288, 1394, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2289, 1400, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2290, 1406, 33, 1, 139 },
+  { 0x1, 0x1, 3, 2291, 1412, 33, 1, 139 },
   { 0x1, 0x1, 3, -1, -1, 27, 1, 40 },
   { 0x0, 0x0, 4, 1829, 1183, 0, 1, 132 },
   { 0x0, 0x0, 4, 1830, 1185, 0, 1, 132 },
@@ -2332,24 +2350,24 @@ completer_table[] = {
   { 0x1, 0x1, 24, 1123, 1283, 35, 1, 129 },
   { 0x1, 0x1, 24, 1124, 1293, 35, 1, 129 },
   { 0x1, 0x1, 24, 1125, 1303, 35, 1, 129 },
-  { 0x1, 0x1, 24, 1126, 1312, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1127, 1318, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1128, 1324, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1129, 1330, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1130, 1336, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1131, 1342, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1132, 1348, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1133, 1354, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1134, 1360, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1135, 1366, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1136, 1372, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1137, 1378, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1138, 1384, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1139, 1390, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1140, 1396, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1141, 1402, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1142, 1408, 35, 1, 139 },
-  { 0x1, 0x1, 24, 1143, 1414, 35, 1, 139 },
+  { 0x1, 0x1, 24, 1126, 1312, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1127, 1318, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1128, 1324, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1129, 1330, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1130, 1336, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1131, 1342, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1132, 1348, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1133, 1354, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1134, 1360, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1135, 1366, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1136, 1372, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1137, 1378, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1138, 1384, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1139, 1390, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1140, 1396, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1141, 1402, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1142, 1408, 35, 1, 141 },
+  { 0x1, 0x1, 24, 1143, 1414, 35, 1, 141 },
   { 0x0, 0x0, 32, 2334, 2332, 0, 0, -1 },
   { 0x0, 0x0, 32, 2337, 2335, 0, 0, -1 },
   { 0x0, 0x0, 32, 2343, 2342, 0, 0, -1 },
@@ -2374,7 +2392,7 @@ completer_table[] = {
   { 0x0, 0x0, 37, 951, -1, 0, 1, 95 },
   { 0x0, 0x0, 37, -1, -1, 0, 1, 104 },
   { 0x0, 0x0, 37, 957, -1, 0, 1, 116 },
-  { 0x3, 0x3, 37, -1, -1, 30, 1, 144 },
+  { 0x3, 0x3, 37, -1, -1, 30, 1, 146 },
   { 0x0, 0x0, 37, 958, -1, 0, 1, 40 },
   { 0x0, 0x0, 39, -1, 818, 0, 0, -1 },
   { 0x0, 0x0, 39, -1, 826, 0, 0, -1 },
@@ -2467,20 +2485,20 @@ completer_table[] = {
   { 0x0, 0x0, 43, 935, -1, 0, 1, 0 },
   { 0x0, 0x0, 43, 936, -1, 0, 1, 0 },
   { 0x0, 0x0, 43, 937, -1, 0, 1, 0 },
-  { 0x1, 0x1, 44, -1, 1418, 30, 1, 141 },
-  { 0x1, 0x1, 44, 808, 1417, 30, 1, 140 },
-  { 0x1, 0x1, 44, -1, 1422, 30, 1, 143 },
-  { 0x1, 0x1, 44, 809, 1421, 30, 1, 142 },
-  { 0x1, 0x1, 44, -1, 1426, 30, 1, 143 },
-  { 0x1, 0x1, 44, 810, 1425, 30, 1, 142 },
+  { 0x1, 0x1, 44, -1, 1418, 30, 1, 143 },
+  { 0x1, 0x1, 44, 808, 1417, 30, 1, 142 },
+  { 0x1, 0x1, 44, -1, 1422, 30, 1, 145 },
+  { 0x1, 0x1, 44, 809, 1421, 30, 1, 144 },
+  { 0x1, 0x1, 44, -1, 1426, 30, 1, 145 },
+  { 0x1, 0x1, 44, 810, 1425, 30, 1, 144 },
   { 0x3, 0x3, 45, -1, 969, 3, 1, 22 },
   { 0x1, 0x1, 46, 1866, -1, 30, 1, 134 },
-  { 0x1, 0x1, 46, 1897, -1, 30, 1, 144 },
+  { 0x1, 0x1, 46, 1897, -1, 30, 1, 146 },
   { 0x0, 0x0, 48, -1, -1, 0, 1, 40 },
   { 0x0, 0x0, 48, -1, -1, 0, 1, 40 },
-  { 0x1, 0x1, 55, -1, 1419, 31, 1, 141 },
-  { 0x1, 0x1, 55, -1, 1423, 31, 1, 143 },
-  { 0x1, 0x1, 55, -1, 1427, 31, 1, 143 },
+  { 0x1, 0x1, 55, -1, 1419, 31, 1, 143 },
+  { 0x1, 0x1, 55, -1, 1423, 31, 1, 145 },
+  { 0x1, 0x1, 55, -1, 1427, 31, 1, 145 },
   { 0x0, 0x0, 55, -1, -1, 0, 1, 94 },
   { 0x2, 0x3, 55, -1, -1, 27, 1, 94 },
   { 0x1, 0x1, 55, -1, -1, 28, 1, 94 },
@@ -2554,9 +2572,9 @@ completer_table[] = {
   { 0x3, 0x3, 65, 416, 1281, 33, 1, 128 },
   { 0x3, 0x3, 65, 417, 1291, 33, 1, 128 },
   { 0x3, 0x3, 65, 418, 1301, 33, 1, 128 },
-  { 0x0, 0x0, 65, -1, 1306, 0, 1, 135 },
-  { 0x0, 0x0, 65, -1, 1307, 0, 1, 135 },
-  { 0x0, 0x0, 65, -1, 1308, 0, 1, 135 },
+  { 0x0, 0x0, 65, -1, 1306, 0, 1, 137 },
+  { 0x0, 0x0, 65, -1, 1307, 0, 1, 137 },
+  { 0x0, 0x0, 65, -1, 1308, 0, 1, 137 },
   { 0x0, 0x0, 106, 891, 1930, 0, 0, -1 },
   { 0x0, 0x0, 106, 892, 2377, 0, 1, 29 },
   { 0x0, 0x0, 106, 893, 1971, 0, 0, -1 },
@@ -2796,24 +2814,24 @@ completer_table[] = {
   { 0x9, 0x9, 156, -1, 1284, 32, 1, 129 },
   { 0x9, 0x9, 156, -1, 1294, 32, 1, 129 },
   { 0x9, 0x9, 156, -1, 1304, 32, 1, 129 },
-  { 0x9, 0x9, 156, -1, 1313, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1319, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1325, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1331, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1337, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1343, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1349, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1355, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1361, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1367, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1373, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1379, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1385, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1391, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1397, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1403, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1409, 32, 1, 139 },
-  { 0x9, 0x9, 156, -1, 1415, 32, 1, 139 },
+  { 0x9, 0x9, 156, -1, 1313, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1319, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1325, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1331, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1337, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1343, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1349, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1355, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1361, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1367, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1373, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1379, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1385, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1391, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1397, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1403, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1409, 32, 1, 141 },
+  { 0x9, 0x9, 156, -1, 1415, 32, 1, 141 },
   { 0x0, 0x0, 157, 1032, 282, 0, 0, -1 },
   { 0x1, 0x1, 157, -1, 2402, 38, 1, 1 },
   { 0x0, 0x0, 157, 779, 339, 0, 0, -1 },
@@ -2976,145 +2994,145 @@ completer_table[] = {
   { 0x1, 0x1, 168, 1565, -1, 28, 1, 129 },
   { 0x1, 0x1, 168, 1566, -1, 28, 1, 129 },
   { 0x1, 0x1, 168, 1567, -1, 28, 1, 124 },
-  { 0x1, 0x1, 168, 1568, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1569, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1570, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1571, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1572, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1573, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1574, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1575, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1576, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1577, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1578, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1579, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1580, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1581, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1582, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1583, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1584, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1585, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1586, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1587, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1588, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1589, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1590, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1591, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1592, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1593, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1594, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1595, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1596, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1597, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1598, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1599, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1600, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1601, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1602, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1603, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1604, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1605, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1606, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1607, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1608, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1609, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1610, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1611, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1612, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1613, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1614, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1615, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1616, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1617, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1618, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1619, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1620, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1621, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1622, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1623, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1624, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1625, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1626, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1627, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1628, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1629, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1630, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1631, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1632, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1633, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1634, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1635, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1636, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1637, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1638, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1639, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1640, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1641, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1642, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1643, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1644, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1645, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1646, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1647, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1648, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1649, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1650, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1651, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1652, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1653, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1654, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1655, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1656, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1657, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1658, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1659, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1660, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1661, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1662, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1663, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1664, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1665, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1666, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1667, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1668, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1669, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1670, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1671, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1672, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1673, -1, 28, 1, 136 },
-  { 0x1, 0x1, 168, 1674, -1, 28, 1, 137 },
-  { 0x1, 0x1, 168, 1675, -1, 28, 1, 138 },
-  { 0x1, 0x1, 168, 1676, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1677, -1, 28, 1, 139 },
-  { 0x1, 0x1, 168, 1678, -1, 28, 1, 135 },
-  { 0x1, 0x1, 168, 1433, -1, 28, 1, 140 },
-  { 0x1, 0x1, 168, 1434, -1, 28, 1, 141 },
-  { 0x1, 0x1, 168, 1435, -1, 28, 1, 141 },
-  { 0x1, 0x1, 168, 1436, -1, 28, 1, 140 },
-  { 0x1, 0x1, 168, 1437, -1, 28, 1, 142 },
-  { 0x1, 0x1, 168, 1438, -1, 28, 1, 143 },
-  { 0x1, 0x1, 168, 1439, -1, 28, 1, 143 },
-  { 0x1, 0x1, 168, 1440, -1, 28, 1, 142 },
-  { 0x1, 0x1, 168, 1441, -1, 28, 1, 142 },
-  { 0x1, 0x1, 168, 1442, -1, 28, 1, 143 },
-  { 0x1, 0x1, 168, 1443, -1, 28, 1, 143 },
-  { 0x1, 0x1, 168, 1444, -1, 28, 1, 142 },
+  { 0x1, 0x1, 168, 1568, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1569, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1570, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1571, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1572, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1573, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1574, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1575, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1576, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1577, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1578, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1579, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1580, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1581, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1582, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1583, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1584, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1585, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1586, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1587, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1588, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1589, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1590, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1591, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1592, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1593, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1594, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1595, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1596, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1597, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1598, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1599, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1600, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1601, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1602, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1603, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1604, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1605, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1606, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1607, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1608, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1609, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1610, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1611, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1612, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1613, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1614, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1615, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1616, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1617, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1618, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1619, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1620, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1621, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1622, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1623, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1624, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1625, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1626, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1627, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1628, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1629, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1630, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1631, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1632, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1633, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1634, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1635, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1636, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1637, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1638, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1639, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1640, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1641, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1642, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1643, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1644, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1645, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1646, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1647, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1648, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1649, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1650, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1651, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1652, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1653, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1654, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1655, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1656, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1657, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1658, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1659, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1660, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1661, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1662, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1663, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1664, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1665, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1666, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1667, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1668, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1669, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1670, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1671, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1672, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1673, -1, 28, 1, 138 },
+  { 0x1, 0x1, 168, 1674, -1, 28, 1, 139 },
+  { 0x1, 0x1, 168, 1675, -1, 28, 1, 140 },
+  { 0x1, 0x1, 168, 1676, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1677, -1, 28, 1, 141 },
+  { 0x1, 0x1, 168, 1678, -1, 28, 1, 137 },
+  { 0x1, 0x1, 168, 1433, -1, 28, 1, 142 },
+  { 0x1, 0x1, 168, 1434, -1, 28, 1, 143 },
+  { 0x1, 0x1, 168, 1435, -1, 28, 1, 143 },
+  { 0x1, 0x1, 168, 1436, -1, 28, 1, 142 },
+  { 0x1, 0x1, 168, 1437, -1, 28, 1, 144 },
+  { 0x1, 0x1, 168, 1438, -1, 28, 1, 145 },
+  { 0x1, 0x1, 168, 1439, -1, 28, 1, 145 },
+  { 0x1, 0x1, 168, 1440, -1, 28, 1, 144 },
+  { 0x1, 0x1, 168, 1441, -1, 28, 1, 144 },
+  { 0x1, 0x1, 168, 1442, -1, 28, 1, 145 },
+  { 0x1, 0x1, 168, 1443, -1, 28, 1, 145 },
+  { 0x1, 0x1, 168, 1444, -1, 28, 1, 144 },
   { 0x1, 0x1, 168, 1719, -1, 28, 1, 133 },
   { 0x1, 0x1, 168, 1720, -1, 28, 1, 133 },
   { 0x1, 0x1, 168, 1721, -1, 28, 1, 133 },
   { 0x1, 0x1, 168, 1722, -1, 28, 1, 133 },
-  { 0x1, 0x1, 169, 1679, -1, 29, 1, 140 },
-  { 0x1, 0x1, 169, 1680, -1, 29, 1, 141 },
-  { 0x1, 0x1, 169, 1681, -1, 29, 1, 141 },
-  { 0x1, 0x1, 169, 1682, -1, 29, 1, 140 },
-  { 0x1, 0x1, 169, 1683, -1, 29, 1, 142 },
-  { 0x1, 0x1, 169, 1684, -1, 29, 1, 143 },
-  { 0x1, 0x1, 169, 1685, -1, 29, 1, 143 },
-  { 0x1, 0x1, 169, 1686, -1, 29, 1, 142 },
-  { 0x1, 0x1, 169, 1687, -1, 29, 1, 142 },
-  { 0x1, 0x1, 169, 1688, -1, 29, 1, 143 },
-  { 0x1, 0x1, 169, 1689, -1, 29, 1, 143 },
-  { 0x1, 0x1, 169, 1690, -1, 29, 1, 142 },
+  { 0x1, 0x1, 169, 1679, -1, 29, 1, 142 },
+  { 0x1, 0x1, 169, 1680, -1, 29, 1, 143 },
+  { 0x1, 0x1, 169, 1681, -1, 29, 1, 143 },
+  { 0x1, 0x1, 169, 1682, -1, 29, 1, 142 },
+  { 0x1, 0x1, 169, 1683, -1, 29, 1, 144 },
+  { 0x1, 0x1, 169, 1684, -1, 29, 1, 145 },
+  { 0x1, 0x1, 169, 1685, -1, 29, 1, 145 },
+  { 0x1, 0x1, 169, 1686, -1, 29, 1, 144 },
+  { 0x1, 0x1, 169, 1687, -1, 29, 1, 144 },
+  { 0x1, 0x1, 169, 1688, -1, 29, 1, 145 },
+  { 0x1, 0x1, 169, 1689, -1, 29, 1, 145 },
+  { 0x1, 0x1, 169, 1690, -1, 29, 1, 144 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 132 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 132 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 132 },
@@ -3238,147 +3256,147 @@ completer_table[] = {
   { 0x3, 0x3, 170, 279, -1, 28, 1, 129 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 129 },
   { 0x3, 0x3, 170, 1878, -1, 28, 1, 124 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1879, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1880, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1881, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1879, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1882, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1880, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1883, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1881, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1884, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1882, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1885, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1883, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1886, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1884, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1887, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1885, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1888, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1886, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1889, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1887, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1890, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1888, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1891, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1889, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1892, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1890, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1893, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1891, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1894, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1892, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1893, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1895, -1, 28, 1, 135 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1894, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1895, -1, 28, 1, 137 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 139 },
-  { 0x3, 0x3, 170, 1896, -1, 28, 1, 135 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 140 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 170, 797, -1, 28, 1, 141 },
-  { 0x3, 0x3, 170, 798, -1, 28, 1, 140 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 170, 799, -1, 28, 1, 143 },
-  { 0x3, 0x3, 170, 800, -1, 28, 1, 142 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 141 },
+  { 0x3, 0x3, 170, 1896, -1, 28, 1, 137 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 170, 801, -1, 28, 1, 143 },
-  { 0x3, 0x3, 170, 802, -1, 28, 1, 142 },
+  { 0x3, 0x3, 170, 797, -1, 28, 1, 143 },
+  { 0x3, 0x3, 170, 798, -1, 28, 1, 142 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 144 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 145 },
+  { 0x3, 0x3, 170, 799, -1, 28, 1, 145 },
+  { 0x3, 0x3, 170, 800, -1, 28, 1, 144 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 144 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 145 },
+  { 0x3, 0x3, 170, 801, -1, 28, 1, 145 },
+  { 0x3, 0x3, 170, 802, -1, 28, 1, 144 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, 1835, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, 1836, -1, 28, 1, 130 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
+  { 0x3, 0x3, 170, 1836, -1, 28, 1, 135 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, 1837, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, 1838, -1, 28, 1, 130 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
+  { 0x3, 0x3, 170, 1838, -1, 28, 1, 135 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, 1839, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, 1840, -1, 28, 1, 130 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
+  { 0x3, 0x3, 170, 1840, -1, 28, 1, 135 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 131 },
   { 0x3, 0x3, 170, 1841, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
-  { 0x3, 0x3, 170, -1, -1, 28, 1, 131 },
-  { 0x3, 0x3, 170, 1842, -1, 28, 1, 130 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 135 },
+  { 0x3, 0x3, 170, -1, -1, 28, 1, 136 },
+  { 0x3, 0x3, 170, 1842, -1, 28, 1, 135 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 170, -1, -1, 28, 1, 130 },
@@ -3506,13 +3524,13 @@ completer_table[] = {
   { 0x1, 0x1, 210, -1, 1192, 32, 1, 133 },
   { 0x1, 0x1, 210, -1, 1194, 32, 1, 133 },
   { 0x1, 0x1, 210, -1, 1691, 32, 1, 130 },
-  { 0x1, 0x1, 210, -1, 1693, 32, 1, 130 },
+  { 0x1, 0x1, 210, -1, 1693, 32, 1, 135 },
   { 0x1, 0x1, 210, -1, 1695, 32, 1, 130 },
-  { 0x1, 0x1, 210, -1, 1697, 32, 1, 130 },
+  { 0x1, 0x1, 210, -1, 1697, 32, 1, 135 },
   { 0x1, 0x1, 210, -1, 1699, 32, 1, 130 },
-  { 0x1, 0x1, 210, -1, 1701, 32, 1, 130 },
+  { 0x1, 0x1, 210, -1, 1701, 32, 1, 135 },
   { 0x1, 0x1, 210, 2296, 1703, 32, 1, 130 },
-  { 0x1, 0x1, 210, 2297, 1706, 32, 1, 130 },
+  { 0x1, 0x1, 210, 2297, 1706, 32, 1, 135 },
   { 0x0, 0x0, 211, -1, 2338, 0, 0, -1 },
   { 0x0, 0x0, 211, -1, 2339, 0, 0, -1 },
   { 0x0, 0x0, 211, -1, 2364, 0, 0, -1 },
@@ -3549,25 +3567,25 @@ completer_table[] = {
   { 0x1, 0x1, 216, 229, 1276, 32, 1, 125 },
   { 0x1, 0x1, 216, 230, 1286, 32, 1, 125 },
   { 0x1, 0x1, 216, 231, 1296, 32, 1, 125 },
-  { 0x1, 0x1, 216, 232, 1309, 32, 1, 136 },
-  { 0x1, 0x1, 216, 233, 1315, 32, 1, 136 },
-  { 0x1, 0x1, 216, 234, 1321, 32, 1, 136 },
-  { 0x1, 0x1, 216, 235, 1327, 32, 1, 136 },
-  { 0x1, 0x1, 216, 236, 1333, 32, 1, 136 },
-  { 0x1, 0x1, 216, 237, 1339, 32, 1, 136 },
-  { 0x1, 0x1, 216, 238, 1345, 32, 1, 136 },
-  { 0x1, 0x1, 216, 239, 1351, 32, 1, 136 },
-  { 0x1, 0x1, 216, 240, 1357, 32, 1, 136 },
-  { 0x1, 0x1, 216, 241, 1363, 32, 1, 136 },
-  { 0x1, 0x1, 216, 242, 1369, 32, 1, 136 },
-  { 0x1, 0x1, 216, 243, 1375, 32, 1, 136 },
-  { 0x1, 0x1, 216, 244, 1381, 32, 1, 136 },
-  { 0x1, 0x1, 216, 245, 1387, 32, 1, 136 },
-  { 0x1, 0x1, 216, 246, 1393, 32, 1, 136 },
-  { 0x1, 0x1, 216, 247, 1399, 32, 1, 136 },
-  { 0x1, 0x1, 216, 248, 1405, 32, 1, 136 },
-  { 0x1, 0x1, 216, 249, 1411, 32, 1, 136 },
-  { 0x1, 0x1, 216, 704, -1, 31, 1, 144 },
+  { 0x1, 0x1, 216, 232, 1309, 32, 1, 138 },
+  { 0x1, 0x1, 216, 233, 1315, 32, 1, 138 },
+  { 0x1, 0x1, 216, 234, 1321, 32, 1, 138 },
+  { 0x1, 0x1, 216, 235, 1327, 32, 1, 138 },
+  { 0x1, 0x1, 216, 236, 1333, 32, 1, 138 },
+  { 0x1, 0x1, 216, 237, 1339, 32, 1, 138 },
+  { 0x1, 0x1, 216, 238, 1345, 32, 1, 138 },
+  { 0x1, 0x1, 216, 239, 1351, 32, 1, 138 },
+  { 0x1, 0x1, 216, 240, 1357, 32, 1, 138 },
+  { 0x1, 0x1, 216, 241, 1363, 32, 1, 138 },
+  { 0x1, 0x1, 216, 242, 1369, 32, 1, 138 },
+  { 0x1, 0x1, 216, 243, 1375, 32, 1, 138 },
+  { 0x1, 0x1, 216, 244, 1381, 32, 1, 138 },
+  { 0x1, 0x1, 216, 245, 1387, 32, 1, 138 },
+  { 0x1, 0x1, 216, 246, 1393, 32, 1, 138 },
+  { 0x1, 0x1, 216, 247, 1399, 32, 1, 138 },
+  { 0x1, 0x1, 216, 248, 1405, 32, 1, 138 },
+  { 0x1, 0x1, 216, 249, 1411, 32, 1, 138 },
+  { 0x1, 0x1, 216, 704, -1, 31, 1, 146 },
   { 0x0, 0x0, 217, 1989, -1, 0, 1, 65 },
   { 0x0, 0x0, 217, 1990, -1, 0, 1, 28 },
   { 0x0, 0x0, 217, 24, -1, 0, 1, 28 },
@@ -3944,30 +3962,30 @@ completer_table[] = {
   { 0x3, 0x3, 221, 404, 1278, 32, 1, 127 },
   { 0x3, 0x3, 221, 405, 1288, 32, 1, 127 },
   { 0x3, 0x3, 221, 406, 1298, 32, 1, 127 },
-  { 0x3, 0x3, 221, 419, 1311, 32, 1, 138 },
-  { 0x3, 0x3, 221, 420, 1317, 32, 1, 138 },
-  { 0x3, 0x3, 221, 421, 1323, 32, 1, 138 },
-  { 0x3, 0x3, 221, 422, 1329, 32, 1, 138 },
-  { 0x3, 0x3, 221, 423, 1335, 32, 1, 138 },
-  { 0x3, 0x3, 221, 424, 1341, 32, 1, 138 },
-  { 0x3, 0x3, 221, 425, 1347, 32, 1, 138 },
-  { 0x3, 0x3, 221, 426, 1353, 32, 1, 138 },
-  { 0x3, 0x3, 221, 427, 1359, 32, 1, 138 },
-  { 0x3, 0x3, 221, 428, 1365, 32, 1, 138 },
-  { 0x3, 0x3, 221, 429, 1371, 32, 1, 138 },
-  { 0x3, 0x3, 221, 430, 1377, 32, 1, 138 },
-  { 0x3, 0x3, 221, 431, 1383, 32, 1, 138 },
-  { 0x3, 0x3, 221, 432, 1389, 32, 1, 138 },
-  { 0x3, 0x3, 221, 433, 1395, 32, 1, 138 },
-  { 0x3, 0x3, 221, 434, 1401, 32, 1, 138 },
-  { 0x3, 0x3, 221, 435, 1407, 32, 1, 138 },
-  { 0x3, 0x3, 221, 436, 1413, 32, 1, 138 },
+  { 0x3, 0x3, 221, 419, 1311, 32, 1, 140 },
+  { 0x3, 0x3, 221, 420, 1317, 32, 1, 140 },
+  { 0x3, 0x3, 221, 421, 1323, 32, 1, 140 },
+  { 0x3, 0x3, 221, 422, 1329, 32, 1, 140 },
+  { 0x3, 0x3, 221, 423, 1335, 32, 1, 140 },
+  { 0x3, 0x3, 221, 424, 1341, 32, 1, 140 },
+  { 0x3, 0x3, 221, 425, 1347, 32, 1, 140 },
+  { 0x3, 0x3, 221, 426, 1353, 32, 1, 140 },
+  { 0x3, 0x3, 221, 427, 1359, 32, 1, 140 },
+  { 0x3, 0x3, 221, 428, 1365, 32, 1, 140 },
+  { 0x3, 0x3, 221, 429, 1371, 32, 1, 140 },
+  { 0x3, 0x3, 221, 430, 1377, 32, 1, 140 },
+  { 0x3, 0x3, 221, 431, 1383, 32, 1, 140 },
+  { 0x3, 0x3, 221, 432, 1389, 32, 1, 140 },
+  { 0x3, 0x3, 221, 433, 1395, 32, 1, 140 },
+  { 0x3, 0x3, 221, 434, 1401, 32, 1, 140 },
+  { 0x3, 0x3, 221, 435, 1407, 32, 1, 140 },
+  { 0x3, 0x3, 221, 436, 1413, 32, 1, 140 },
   { 0x1, 0x1, 222, -1, -1, 28, 1, 33 },
   { 0x1, 0x1, 222, -1, -1, 28, 1, 33 },
   { 0x0, 0x0, 229, 804, -1, 0, 1, 134 },
-  { 0x0, 0x0, 229, 805, -1, 0, 1, 144 },
+  { 0x0, 0x0, 229, 805, -1, 0, 1, 146 },
   { 0x1, 0x1, 230, -1, 1704, 33, 1, 131 },
-  { 0x1, 0x1, 230, -1, 1707, 33, 1, 131 },
+  { 0x1, 0x1, 230, -1, 1707, 33, 1, 136 },
   { 0x0, 0x0, 230, -1, 1709, 0, 1, 130 },
   { 0x0, 0x0, 230, -1, 1710, 0, 1, 130 },
   { 0x0, 0x0, 231, 738, 816, 0, 0, -1 },
@@ -4157,7 +4175,7 @@ completer_table[] = {
   { 0x0, 0x0, 270, -1, -1, 0, 1, 40 },
   { 0x0, 0x0, 275, -1, -1, 0, 1, 33 },
   { 0x0, 0x0, 279, -1, 1935, 0, 1, 29 },
-  { 0x0, 0x0, 280, -1, -1, 0, 1, 71 },
+  { 0x0, 0x0, 280, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 280, -1, -1, 0, 1, 71 },
   { 0x0, 0x0, 280, 1723, 2459, 0, 1, 1 },
   { 0x0, 0x0, 280, -1, 388, 0, 0, -1 },
diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
index ee4acbec481..4b4b1970f57 100644
--- a/opcodes/ia64-gen.c
+++ b/opcodes/ia64-gen.c
@@ -399,9 +399,21 @@ fetch_insn_class(const char *full_name, int create)
   if ((comment = strchr(name, '[')) != NULL)
     is_class = 1;
   if ((notestr = strchr(name, '+')) != NULL)
+    is_class = 1;
+
+  /* If it is a composite class, then ignore comments and notes that come after
+     the '\\', since they don't apply to the part we are decoding now.  */
+  if (xsect)
+    {
+      if (comment > xsect)
+	comment = 0;
+      if (notestr > xsect)
+	notestr = 0;
+    }
+
+  if (notestr)
     {
       char *nextnotestr;
-      is_class = 1;
       note = atoi (notestr + 1);
       if ((nextnotestr = strchr (notestr + 1, '+')) != NULL)
         {
@@ -413,8 +425,9 @@ fetch_insn_class(const char *full_name, int create)
         }
     }
 
-  /* if it's a composite class, leave the notes and comments in place so that
-     we have a unique name for the composite class */
+  /* If it's a composite class, leave the notes and comments in place so that
+     we have a unique name for the composite class.  Otherwise, we remove
+     them.  */
   if (!xsect)
     {
       if (notestr)
@@ -1055,6 +1068,9 @@ in_iclass(struct ia64_opcode *idesc, struct iclass *ic,
             resolved = idesc->operands[0] == IA64_OPND_B2;
           else if (strcmp (ic->name, "invala") == 0)
             resolved = strcmp (idesc->name, ic->name) == 0;
+	  else if (strncmp (idesc->name, "st", 2) == 0
+		   && strstr (format, "M5") != NULL)
+	    resolved = idesc->flags & IA64_OPCODE_POSTINC;
           else
             resolved = 0;
         }