opcodes/

	* ia64-gen.c (in_iclass): Handle more postinc st
	and ld variants.
	* ia64-asmtab.c: Rebuilt.
gas/testsuite/
	* gas/ia64/dv-raw-err.s: Add some new postinc tests.
	* gas/ia64/dv-raw-err.l: Updated.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 76c10c9dd10d0b880e2d7608a861feed70d08767..5e04f07120a43bb92d239ad87807d05a3a018535 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * gas/ia64/dv-raw-err.s: Add some new postinc tests.
+       * gas/ia64/dv-raw-err.l: Updated.
+
 2004-05-28  Peter Barada <peter@the-baradas.com>
 
        * gas/m68k/mode5.s: New test file.  Checks conversion of mode 5

diff --git a/gas/testsuite/gas/ia64/dv-raw-err.l b/gas/testsuite/gas/ia64/dv-raw-err.l
index 3623d0c53208fb9d524414f2d2af593732467408..7dc21f156f824aff430f756ebad57b7ebeea36a7 100644 (file)
--- a/gas/testsuite/gas/ia64/dv-raw-err.l
+++ b/gas/testsuite/gas/ia64/dv-raw-err.l
@@ -277,3 +277,17 @@
 .*:569: Warning: This is the location of the conflicting usage
 .*:573: Warning: Use of 'br.cond.sptk' may violate RAW dependency 'PR%, % in 16 - 62' \(impliedf\), specific resource number is 25
 .*:572: Warning: This is the location of the conflicting usage
+.*:581: Warning: Use of 'adds' .* RAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:580: Warning: This is the location of the conflicting usage
+.*:584: Warning: Use of 'adds' .* RAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:583: Warning: This is the location of the conflicting usage
+.*:587: Warning: Use of 'add' .* RAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:586: Warning: This is the location of the conflicting usage
+.*:590: Warning: Use of 'ld8' .* RAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:589: Warning: This is the location of the conflicting usage
+.*:590: Warning: Use of 'ld8' .* WAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:589: Warning: This is the location of the conflicting usage
+.*:593: Warning: Use of 'ldfd' .* RAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:592: Warning: This is the location of the conflicting usage
+.*:593: Warning: Use of 'ldfd' .* WAW dependency 'GR%, % in 1 - 127' \(impliedf\), specific resource number is 6
+.*:592: Warning: This is the location of the conflicting usage

diff --git a/gas/testsuite/gas/ia64/dv-raw-err.s b/gas/testsuite/gas/ia64/dv-raw-err.s
index 44fb89c485c76333d2e5f579792d8295ab5796fe..13a1d3a42542edcb3b1ff4126f7fc327e154145b 100644 (file)
--- a/gas/testsuite/gas/ia64/dv-raw-err.s
+++ b/gas/testsuite/gas/ia64/dv-raw-err.s
@@ -576,4 +576,21 @@
 (p27)  br.cond.sptk    b1      // no DV here
        ;;
        
-L:     
+// postinc
+       st8     [r6] = r8, 16
+       add     r7 = 8, r6      // impliedf
+       ;;
+       ldfd    f14 = [r6], 16
+       add     r7 = 8, r6      // impliedf
+       ;;
+       stfd    [r6] = f14, 16
+       add     r7 = r8, r6
+       ;;
+       add     r6 = 8, r7
+       ld8     r8 = [r6], 16   // impliedf, WAW
+       ;;
+       add     r6 = 8, r7
+       ldfd    f14 = [r6], 16  // impliedf, WAW
+       ;;
+
+L:

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c6394997848d0a7068f6a050d1aa7ab6eb5e4048..603fc1fbb1f030e54a9784208fa5aec9e777ba92 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * ia64-gen.c (in_iclass): Handle more postinc st
+       and ld variants.
+       * ia64-asmtab.c: Rebuilt.
+
 2004-06-01  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * s390-opc.txt: Correct architecture mask for some opcodes.

diff --git a/opcodes/ia64-asmtab.c b/opcodes/ia64-asmtab.c
index 2465d3938501c16ca5c41c1b9c7aa1ad57fa1f0a..e381d5f275d4e4eb9b408be2caa1d3b0f9e17a31 100644 (file)
--- a/opcodes/ia64-asmtab.c
+++ b/opcodes/ia64-asmtab.c
@@ -1544,36 +1544,82 @@ static const short dep235[] = {
 };
 
 static const short dep236[] = {
+  96, 267, 2135, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 18750, 
+  
+};
+
+static const short dep237[] = {
+  40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
+  139, 146, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2310, 
+  2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
+};
+
+static const short dep238[] = {
+  40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
+  138, 139, 146, 148, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
+  2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
+};
+
+static const short dep239[] = {
+  0, 96, 181, 267, 2135, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 
+  18750, 
+};
+
+static const short dep240[] = {
+  0, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
+  138, 139, 146, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
+  2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
+};
+
+static const short dep241[] = {
+  0, 40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
+  136, 138, 139, 146, 148, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 
+  2166, 2169, 2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
+  20613, 
+};
+
+static const short dep242[] = {
+  0, 96, 181, 267, 2136, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 
+  18750, 
+};
+
+static const short dep243[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 267, 274, 2134, 2135, 2136, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 4135, 16524, 16526, 20613, 
 };
 
-static const short dep237[] = {
+static const short dep244[] = {
   40, 41, 75, 96, 134, 148, 174, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep238[] = {
+static const short dep245[] = {
   40, 41, 75, 96, 134, 135, 139, 148, 174, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep239[] = {
+static const short dep246[] = {
   40, 41, 75, 96, 134, 148, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 20613, 
 };
 
-static const short dep240[] = {
+static const short dep247[] = {
   40, 41, 75, 96, 134, 135, 139, 148, 174, 267, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep241[] = {
+static const short dep248[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2310, 4135, 
   16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep242[] = {
+static const short dep249[] = {
+  0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
+  139, 146, 163, 174, 178, 181, 267, 274, 2134, 2135, 2136, 2137, 2138, 2139, 
+  2165, 2166, 2169, 2172, 2312, 4135, 16524, 16526, 20613, 
+};
+
+static const short dep250[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
   22, 24, 26, 27, 28, 29, 30, 31, 96, 182, 183, 184, 185, 186, 187, 188, 189, 
   190, 191, 192, 193, 194, 195, 197, 198, 200, 201, 203, 204, 206, 207, 208, 
@@ -1581,7 +1627,7 @@ static const short dep242[] = {
   2312, 28852, 29002, 
 };
 
-static const short dep243[] = {
+static const short dep251[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
   22, 24, 25, 26, 28, 29, 30, 31, 40, 41, 96, 134, 171, 174, 182, 183, 184, 
   185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 197, 198, 200, 201, 
@@ -1738,14 +1784,20 @@ op_dependencies[] = {
   { NELS(dep233), dep233, NELS(dep232), dep232, },
   { NELS(dep234), dep234, NELS(dep232), dep232, },
   { NELS(dep233), dep233, NELS(dep235), dep235, },
-  { NELS(dep236), dep236, NELS(dep217), dep217, },
-  { NELS(dep237), dep237, NELS(dep31), dep31, },
-  { NELS(dep238), dep238, NELS(dep31), dep31, },
-  { NELS(dep239), dep239, NELS(dep0), dep0, },
-  { NELS(dep240), dep240, NELS(dep0), dep0, },
-  { NELS(dep241), dep241, NELS(dep62), dep62, },
+  { NELS(dep237), dep237, NELS(dep236), dep236, },
+  { NELS(dep238), dep238, NELS(dep236), dep236, },
+  { NELS(dep240), dep240, NELS(dep239), dep239, },
+  { NELS(dep241), dep241, NELS(dep239), dep239, },
+  { NELS(dep240), dep240, NELS(dep242), dep242, },
+  { NELS(dep243), dep243, NELS(dep217), dep217, },
+  { NELS(dep244), dep244, NELS(dep31), dep31, },
+  { NELS(dep245), dep245, NELS(dep31), dep31, },
+  { NELS(dep246), dep246, NELS(dep0), dep0, },
+  { NELS(dep247), dep247, NELS(dep0), dep0, },
+  { NELS(dep248), dep248, NELS(dep62), dep62, },
+  { NELS(dep249), dep249, NELS(dep222), dep222, },
   { 0, NULL, 0, NULL, },
-  { NELS(dep243), dep243, NELS(dep242), dep242, },
+  { NELS(dep251), dep251, NELS(dep250), dep250, },
 };
 
 static const struct ia64_completer_table
@@ -1765,7 +1817,7 @@ completer_table[] = {
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, 455, -1, 0, 1, 6 },
   { 0x0, 0x0, 0, 518, -1, 0, 1, 17 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 151 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 157 },
   { 0x0, 0x0, 0, 617, -1, 0, 1, 17 },
   { 0x0, 0x0, 0, 1836, -1, 0, 1, 10 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 9 },
@@ -1817,7 +1869,7 @@ completer_table[] = {
   { 0x0, 0x0, 0, 1181, -1, 0, 1, 33 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 40 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 33 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 151 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 157 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 77 },
   { 0x0, 0x0, 0, 1216, -1, 0, 1, 124 },
   { 0x0, 0x0, 0, 1225, -1, 0, 1, 124 },
@@ -1833,26 +1885,26 @@ completer_table[] = {
   { 0x0, 0x0, 0, 1310, -1, 0, 1, 124 },
   { 0x0, 0x0, 0, 1320, -1, 0, 1, 124 },
   { 0x0, 0x0, 0, 1329, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1335, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1341, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1335, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1341, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1347, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1353, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1359, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1353, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1359, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1365, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1371, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1377, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1371, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1377, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1383, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1389, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1389, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1395, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1401, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1401, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1407, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1413, -1, 0, 1, 140 },
+  { 0x0, 0x0, 0, 1413, -1, 0, 1, 145 },
   { 0x0, 0x0, 0, 1419, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1425, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1431, -1, 0, 1, 140 },
-  { 0x0, 0x0, 0, 1435, -1, 0, 1, 146 },
-  { 0x0, 0x0, 0, 1439, -1, 0, 1, 148 },
-  { 0x0, 0x0, 0, 1443, -1, 0, 1, 148 },
+  { 0x0, 0x0, 0, 1425, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1431, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1435, -1, 0, 1, 151 },
+  { 0x0, 0x0, 0, 1439, -1, 0, 1, 153 },
+  { 0x0, 0x0, 0, 1443, -1, 0, 1, 153 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 79 },
   { 0x0, 0x0, 0, 253, -1, 0, 1, 40 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
@@ -1887,13 +1939,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, 152 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 152 },
-  { 0x0, 0x0, 0, -1, -1, 0, 1, 152 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 158 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 158 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 158 },
   { 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, 151 },
+  { 0x0, 0x0, 0, -1, -1, 0, 1, 157 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, 2394, -1, 0, 1, 0 },
@@ -1941,14 +1993,14 @@ completer_table[] = {
   { 0x0, 0x0, 0, 1723, -1, 0, 1, 138 },
   { 0x0, 0x0, 0, 1726, -1, 0, 1, 131 },
   { 0x0, 0x0, 0, 1729, -1, 0, 1, 138 },
-  { 0x0, 0x0, 0, 1732, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1733, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1734, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1735, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1736, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1737, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1738, -1, 0, 1, 145 },
-  { 0x0, 0x0, 0, 1739, -1, 0, 1, 145 },
+  { 0x0, 0x0, 0, 1732, -1, 0, 1, 150 },
+  { 0x0, 0x0, 0, 1733, -1, 0, 1, 156 },
+  { 0x0, 0x0, 0, 1734, -1, 0, 1, 150 },
+  { 0x0, 0x0, 0, 1735, -1, 0, 1, 156 },
+  { 0x0, 0x0, 0, 1736, -1, 0, 1, 150 },
+  { 0x0, 0x0, 0, 1737, -1, 0, 1, 156 },
+  { 0x0, 0x0, 0, 1738, -1, 0, 1, 150 },
+  { 0x0, 0x0, 0, 1739, -1, 0, 1, 156 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
   { 0x0, 0x0, 0, -1, -1, 0, 1, 0 },
@@ -1986,23 +2038,23 @@ completer_table[] = {
   { 0x1, 0x1, 3, 2295, 1302, 33, 1, 127 },
   { 0x1, 0x1, 3, 2296, 1312, 33, 1, 127 },
   { 0x1, 0x1, 3, 2297, 1325, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2298, 1331, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2299, 1337, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2298, 1331, 33, 1, 147 },
+  { 0x1, 0x1, 3, 2299, 1337, 33, 1, 147 },
   { 0x1, 0x1, 3, 2300, 1343, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2301, 1349, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2302, 1355, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2301, 1349, 33, 1, 147 },
+  { 0x1, 0x1, 3, 2302, 1355, 33, 1, 147 },
   { 0x1, 0x1, 3, 2303, 1361, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2304, 1367, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2305, 1373, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2304, 1367, 33, 1, 147 },
+  { 0x1, 0x1, 3, 2305, 1373, 33, 1, 147 },
   { 0x1, 0x1, 3, 2306, 1379, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2307, 1385, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2307, 1385, 33, 1, 147 },
   { 0x1, 0x1, 3, 2308, 1391, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2309, 1397, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2309, 1397, 33, 1, 147 },
   { 0x1, 0x1, 3, 2310, 1403, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2311, 1409, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2311, 1409, 33, 1, 147 },
   { 0x1, 0x1, 3, 2312, 1415, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2313, 1421, 33, 1, 142 },
-  { 0x1, 0x1, 3, 2314, 1427, 33, 1, 142 },
+  { 0x1, 0x1, 3, 2313, 1421, 33, 1, 147 },
+  { 0x1, 0x1, 3, 2314, 1427, 33, 1, 147 },
   { 0x1, 0x1, 3, -1, -1, 27, 1, 40 },
   { 0x0, 0x0, 4, 1850, 1194, 0, 1, 135 },
   { 0x0, 0x0, 4, 1851, 1196, 0, 1, 134 },
@@ -2419,23 +2471,23 @@ completer_table[] = {
   { 0x1, 0x1, 24, 1135, 1308, 35, 1, 130 },
   { 0x1, 0x1, 24, 1136, 1318, 35, 1, 130 },
   { 0x1, 0x1, 24, 1137, 1327, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1138, 1333, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1139, 1339, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1138, 1333, 35, 1, 149 },
+  { 0x1, 0x1, 24, 1139, 1339, 35, 1, 149 },
   { 0x1, 0x1, 24, 1140, 1345, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1141, 1351, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1142, 1357, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1141, 1351, 35, 1, 149 },
+  { 0x1, 0x1, 24, 1142, 1357, 35, 1, 149 },
   { 0x1, 0x1, 24, 1143, 1363, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1144, 1369, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1145, 1375, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1144, 1369, 35, 1, 149 },
+  { 0x1, 0x1, 24, 1145, 1375, 35, 1, 149 },
   { 0x1, 0x1, 24, 1146, 1381, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1147, 1387, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1147, 1387, 35, 1, 149 },
   { 0x1, 0x1, 24, 1148, 1393, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1149, 1399, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1149, 1399, 35, 1, 149 },
   { 0x1, 0x1, 24, 1150, 1405, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1151, 1411, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1151, 1411, 35, 1, 149 },
   { 0x1, 0x1, 24, 1152, 1417, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1153, 1423, 35, 1, 144 },
-  { 0x1, 0x1, 24, 1154, 1429, 35, 1, 144 },
+  { 0x1, 0x1, 24, 1153, 1423, 35, 1, 149 },
+  { 0x1, 0x1, 24, 1154, 1429, 35, 1, 149 },
   { 0x0, 0x0, 33, 2357, 2355, 0, 0, -1 },
   { 0x0, 0x0, 33, 2360, 2358, 0, 0, -1 },
   { 0x0, 0x0, 33, 2366, 2365, 0, 0, -1 },
@@ -2460,7 +2512,7 @@ completer_table[] = {
   { 0x0, 0x0, 38, 960, -1, 0, 1, 95 },
   { 0x0, 0x0, 38, -1, -1, 0, 1, 104 },
   { 0x0, 0x0, 38, 966, -1, 0, 1, 116 },
-  { 0x3, 0x3, 38, -1, -1, 30, 1, 150 },
+  { 0x3, 0x3, 38, -1, -1, 30, 1, 155 },
   { 0x0, 0x0, 38, 967, -1, 0, 1, 40 },
   { 0x0, 0x0, 40, -1, 825, 0, 0, -1 },
   { 0x0, 0x0, 40, -1, 833, 0, 0, -1 },
@@ -2553,21 +2605,21 @@ completer_table[] = {
   { 0x0, 0x0, 44, 942, -1, 0, 1, 0 },
   { 0x0, 0x0, 44, 943, -1, 0, 1, 0 },
   { 0x0, 0x0, 44, 944, -1, 0, 1, 0 },
-  { 0x1, 0x1, 45, -1, 1433, 30, 1, 147 },
-  { 0x1, 0x1, 45, 815, 1432, 30, 1, 146 },
-  { 0x1, 0x1, 45, -1, 1437, 30, 1, 149 },
-  { 0x1, 0x1, 45, 816, 1436, 30, 1, 148 },
-  { 0x1, 0x1, 45, -1, 1441, 30, 1, 149 },
-  { 0x1, 0x1, 45, 817, 1440, 30, 1, 148 },
+  { 0x1, 0x1, 45, -1, 1433, 30, 1, 152 },
+  { 0x1, 0x1, 45, 815, 1432, 30, 1, 151 },
+  { 0x1, 0x1, 45, -1, 1437, 30, 1, 154 },
+  { 0x1, 0x1, 45, 816, 1436, 30, 1, 153 },
+  { 0x1, 0x1, 45, -1, 1441, 30, 1, 154 },
+  { 0x1, 0x1, 45, 817, 1440, 30, 1, 153 },
   { 0x3, 0x3, 46, -1, 978, 3, 1, 22 },
   { 0x1, 0x1, 47, 1889, -1, 30, 1, 137 },
-  { 0x1, 0x1, 47, 1920, -1, 30, 1, 150 },
+  { 0x1, 0x1, 47, 1920, -1, 30, 1, 155 },
   { 0x0, 0x0, 49, -1, -1, 0, 1, 40 },
   { 0x0, 0x0, 49, -1, -1, 0, 1, 40 },
   { 0x0, 0x0, 49, -1, -1, 0, 1, 40 },
-  { 0x1, 0x1, 56, -1, 1434, 31, 1, 147 },
-  { 0x1, 0x1, 56, -1, 1438, 31, 1, 149 },
-  { 0x1, 0x1, 56, -1, 1442, 31, 1, 149 },
+  { 0x1, 0x1, 56, -1, 1434, 31, 1, 152 },
+  { 0x1, 0x1, 56, -1, 1438, 31, 1, 154 },
+  { 0x1, 0x1, 56, -1, 1442, 31, 1, 154 },
   { 0x0, 0x0, 56, -1, -1, 0, 1, 94 },
   { 0x2, 0x3, 56, -1, -1, 27, 1, 94 },
   { 0x1, 0x1, 56, -1, -1, 28, 1, 94 },
@@ -2642,8 +2694,8 @@ completer_table[] = {
   { 0x3, 0x3, 66, 423, 1306, 33, 1, 129 },
   { 0x3, 0x3, 66, 424, 1316, 33, 1, 129 },
   { 0x0, 0x0, 66, -1, 1321, 0, 1, 140 },
-  { 0x0, 0x0, 66, -1, 1322, 0, 1, 140 },
-  { 0x0, 0x0, 66, -1, 1323, 0, 1, 140 },
+  { 0x0, 0x0, 66, -1, 1322, 0, 1, 145 },
+  { 0x0, 0x0, 66, -1, 1323, 0, 1, 145 },
   { 0x0, 0x0, 107, 898, 1953, 0, 0, -1 },
   { 0x0, 0x0, 107, 899, 2400, 0, 1, 29 },
   { 0x0, 0x0, 107, 900, 1994, 0, 0, -1 },
@@ -2888,23 +2940,23 @@ completer_table[] = {
   { 0x9, 0x9, 159, -1, 1309, 32, 1, 130 },
   { 0x9, 0x9, 159, -1, 1319, 32, 1, 130 },
   { 0x9, 0x9, 159, -1, 1328, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1334, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1340, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1334, 32, 1, 149 },
+  { 0x9, 0x9, 159, -1, 1340, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1346, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1352, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1358, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1352, 32, 1, 149 },
+  { 0x9, 0x9, 159, -1, 1358, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1364, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1370, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1376, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1370, 32, 1, 149 },
+  { 0x9, 0x9, 159, -1, 1376, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1382, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1388, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1388, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1394, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1400, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1400, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1406, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1412, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1412, 32, 1, 149 },
   { 0x9, 0x9, 159, -1, 1418, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1424, 32, 1, 144 },
-  { 0x9, 0x9, 159, -1, 1430, 32, 1, 144 },
+  { 0x9, 0x9, 159, -1, 1424, 32, 1, 149 },
+  { 0x9, 0x9, 159, -1, 1430, 32, 1, 149 },
   { 0x0, 0x0, 160, 1041, 287, 0, 0, -1 },
   { 0x1, 0x1, 160, -1, 2425, 38, 1, 1 },
   { 0x0, 0x0, 160, 785, 344, 0, 0, -1 },
@@ -3072,144 +3124,144 @@ completer_table[] = {
   { 0x1, 0x1, 171, 1585, -1, 28, 1, 130 },
   { 0x1, 0x1, 171, 1586, -1, 28, 1, 124 },
   { 0x1, 0x1, 171, 1587, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1588, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1589, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1588, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1589, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1590, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1591, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1592, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1593, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1594, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1595, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1596, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1597, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1598, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1599, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1600, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1601, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1602, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1603, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1604, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1605, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1606, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1607, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1596, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1597, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1598, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1599, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1600, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1601, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1602, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1603, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1604, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1605, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1606, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1607, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1608, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1609, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1610, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1611, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1612, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1613, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1614, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1615, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1616, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1617, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1618, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1619, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1620, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1621, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1622, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1623, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1624, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1625, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1614, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1615, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1616, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1617, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1618, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1619, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1620, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1621, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1622, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1623, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1624, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1625, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1626, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1627, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1628, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1629, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1630, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1631, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1632, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1633, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1634, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1635, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1636, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1637, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1638, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1639, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1640, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1641, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1642, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1643, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1632, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1633, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1634, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1635, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1636, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1637, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1638, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1639, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1640, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1641, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1642, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1643, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1644, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1645, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1646, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1647, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1648, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1649, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1650, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1651, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1652, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1653, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1654, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1655, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1650, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1651, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1652, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1653, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1654, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1655, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1656, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1657, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1658, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1659, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1660, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1661, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1662, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1663, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1664, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1665, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1666, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1667, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1662, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1663, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1664, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1665, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1666, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1667, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1668, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1669, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1670, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1671, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1672, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1673, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1674, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1675, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1676, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1677, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1678, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1679, -1, 28, 1, 140 },
+  { 0x1, 0x1, 171, 1674, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1675, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1676, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1677, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1678, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1679, -1, 28, 1, 145 },
   { 0x1, 0x1, 171, 1680, -1, 28, 1, 141 },
   { 0x1, 0x1, 171, 1681, -1, 28, 1, 142 },
   { 0x1, 0x1, 171, 1682, -1, 28, 1, 143 },
   { 0x1, 0x1, 171, 1683, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1684, -1, 28, 1, 144 },
   { 0x1, 0x1, 171, 1685, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1686, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1687, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1688, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1689, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1690, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1691, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1692, -1, 28, 1, 141 },
-  { 0x1, 0x1, 171, 1693, -1, 28, 1, 142 },
-  { 0x1, 0x1, 171, 1694, -1, 28, 1, 143 },
-  { 0x1, 0x1, 171, 1695, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1696, -1, 28, 1, 144 },
-  { 0x1, 0x1, 171, 1697, -1, 28, 1, 140 },
-  { 0x1, 0x1, 171, 1448, -1, 28, 1, 146 },
-  { 0x1, 0x1, 171, 1449, -1, 28, 1, 147 },
-  { 0x1, 0x1, 171, 1450, -1, 28, 1, 147 },
-  { 0x1, 0x1, 171, 1451, -1, 28, 1, 146 },
-  { 0x1, 0x1, 171, 1452, -1, 28, 1, 148 },
-  { 0x1, 0x1, 171, 1453, -1, 28, 1, 149 },
-  { 0x1, 0x1, 171, 1454, -1, 28, 1, 149 },
-  { 0x1, 0x1, 171, 1455, -1, 28, 1, 148 },
-  { 0x1, 0x1, 171, 1456, -1, 28, 1, 148 },
-  { 0x1, 0x1, 171, 1457, -1, 28, 1, 149 },
-  { 0x1, 0x1, 171, 1458, -1, 28, 1, 149 },
-  { 0x1, 0x1, 171, 1459, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1686, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1687, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1688, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1689, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1690, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1691, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1692, -1, 28, 1, 146 },
+  { 0x1, 0x1, 171, 1693, -1, 28, 1, 147 },
+  { 0x1, 0x1, 171, 1694, -1, 28, 1, 148 },
+  { 0x1, 0x1, 171, 1695, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1696, -1, 28, 1, 149 },
+  { 0x1, 0x1, 171, 1697, -1, 28, 1, 145 },
+  { 0x1, 0x1, 171, 1448, -1, 28, 1, 151 },
+  { 0x1, 0x1, 171, 1449, -1, 28, 1, 152 },
+  { 0x1, 0x1, 171, 1450, -1, 28, 1, 152 },
+  { 0x1, 0x1, 171, 1451, -1, 28, 1, 151 },
+  { 0x1, 0x1, 171, 1452, -1, 28, 1, 153 },
+  { 0x1, 0x1, 171, 1453, -1, 28, 1, 154 },
+  { 0x1, 0x1, 171, 1454, -1, 28, 1, 154 },
+  { 0x1, 0x1, 171, 1455, -1, 28, 1, 153 },
+  { 0x1, 0x1, 171, 1456, -1, 28, 1, 153 },
+  { 0x1, 0x1, 171, 1457, -1, 28, 1, 154 },
+  { 0x1, 0x1, 171, 1458, -1, 28, 1, 154 },
+  { 0x1, 0x1, 171, 1459, -1, 28, 1, 153 },
   { 0x1, 0x1, 171, 1740, -1, 28, 1, 136 },
   { 0x1, 0x1, 171, 1741, -1, 28, 1, 136 },
   { 0x1, 0x1, 171, 1742, -1, 28, 1, 136 },
   { 0x1, 0x1, 171, 1743, -1, 28, 1, 136 },
-  { 0x1, 0x1, 172, 1698, -1, 29, 1, 146 },
-  { 0x1, 0x1, 172, 1699, -1, 29, 1, 147 },
-  { 0x1, 0x1, 172, 1700, -1, 29, 1, 147 },
-  { 0x1, 0x1, 172, 1701, -1, 29, 1, 146 },
-  { 0x1, 0x1, 172, 1702, -1, 29, 1, 148 },
-  { 0x1, 0x1, 172, 1703, -1, 29, 1, 149 },
-  { 0x1, 0x1, 172, 1704, -1, 29, 1, 149 },
-  { 0x1, 0x1, 172, 1705, -1, 29, 1, 148 },
-  { 0x1, 0x1, 172, 1706, -1, 29, 1, 148 },
-  { 0x1, 0x1, 172, 1707, -1, 29, 1, 149 },
-  { 0x1, 0x1, 172, 1708, -1, 29, 1, 149 },
-  { 0x1, 0x1, 172, 1709, -1, 29, 1, 148 },
+  { 0x1, 0x1, 172, 1698, -1, 29, 1, 151 },
+  { 0x1, 0x1, 172, 1699, -1, 29, 1, 152 },
+  { 0x1, 0x1, 172, 1700, -1, 29, 1, 152 },
+  { 0x1, 0x1, 172, 1701, -1, 29, 1, 151 },
+  { 0x1, 0x1, 172, 1702, -1, 29, 1, 153 },
+  { 0x1, 0x1, 172, 1703, -1, 29, 1, 154 },
+  { 0x1, 0x1, 172, 1704, -1, 29, 1, 154 },
+  { 0x1, 0x1, 172, 1705, -1, 29, 1, 153 },
+  { 0x1, 0x1, 172, 1706, -1, 29, 1, 153 },
+  { 0x1, 0x1, 172, 1707, -1, 29, 1, 154 },
+  { 0x1, 0x1, 172, 1708, -1, 29, 1, 154 },
+  { 0x1, 0x1, 172, 1709, -1, 29, 1, 153 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 135 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 135 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 134 },
@@ -3338,128 +3390,128 @@ completer_table[] = {
   { 0x3, 0x3, 173, -1, -1, 28, 1, 130 },
   { 0x3, 0x3, 173, 1901, -1, 28, 1, 124 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1902, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1903, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1904, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1903, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1904, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1905, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1906, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1907, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1906, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1907, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1908, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1909, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1910, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1909, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1910, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1911, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1912, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1912, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1913, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1914, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1914, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1915, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1916, -1, 28, 1, 140 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1916, -1, 28, 1, 145 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
   { 0x3, 0x3, 173, 1917, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1918, -1, 28, 1, 140 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 141 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 142 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 143 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 144 },
-  { 0x3, 0x3, 173, 1919, -1, 28, 1, 140 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
-  { 0x3, 0x3, 173, 803, -1, 28, 1, 147 },
-  { 0x3, 0x3, 173, 804, -1, 28, 1, 146 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
-  { 0x3, 0x3, 173, 805, -1, 28, 1, 149 },
-  { 0x3, 0x3, 173, 806, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1918, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 146 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 147 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 148 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
-  { 0x3, 0x3, 173, 807, -1, 28, 1, 149 },
-  { 0x3, 0x3, 173, 808, -1, 28, 1, 148 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 149 },
+  { 0x3, 0x3, 173, 1919, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 151 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 152 },
+  { 0x3, 0x3, 173, 803, -1, 28, 1, 152 },
+  { 0x3, 0x3, 173, 804, -1, 28, 1, 151 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 153 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 154 },
+  { 0x3, 0x3, 173, 805, -1, 28, 1, 154 },
+  { 0x3, 0x3, 173, 806, -1, 28, 1, 153 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 153 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 154 },
+  { 0x3, 0x3, 173, 807, -1, 28, 1, 154 },
+  { 0x3, 0x3, 173, 808, -1, 28, 1, 153 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 131 },
   { 0x3, 0x3, 173, 1857, -1, 28, 1, 131 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 138 },
@@ -3480,16 +3532,16 @@ completer_table[] = {
   { 0x3, 0x3, 173, -1, -1, 28, 1, 138 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 139 },
   { 0x3, 0x3, 173, 1865, -1, 28, 1, 138 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
-  { 0x3, 0x3, 173, -1, -1, 28, 1, 145 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 150 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 156 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 150 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 156 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 150 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 156 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 150 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 156 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 150 },
+  { 0x3, 0x3, 173, -1, -1, 28, 1, 156 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 136 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 136 },
   { 0x3, 0x3, 173, -1, -1, 28, 1, 136 },
@@ -3653,24 +3705,24 @@ completer_table[] = {
   { 0x1, 0x1, 219, 233, 1301, 32, 1, 126 },
   { 0x1, 0x1, 219, 234, 1311, 32, 1, 126 },
   { 0x1, 0x1, 219, 235, 1324, 32, 1, 141 },
-  { 0x1, 0x1, 219, 236, 1330, 32, 1, 141 },
-  { 0x1, 0x1, 219, 237, 1336, 32, 1, 141 },
+  { 0x1, 0x1, 219, 236, 1330, 32, 1, 146 },
+  { 0x1, 0x1, 219, 237, 1336, 32, 1, 146 },
   { 0x1, 0x1, 219, 238, 1342, 32, 1, 141 },
-  { 0x1, 0x1, 219, 239, 1348, 32, 1, 141 },
-  { 0x1, 0x1, 219, 240, 1354, 32, 1, 141 },
+  { 0x1, 0x1, 219, 239, 1348, 32, 1, 146 },
+  { 0x1, 0x1, 219, 240, 1354, 32, 1, 146 },
   { 0x1, 0x1, 219, 241, 1360, 32, 1, 141 },
-  { 0x1, 0x1, 219, 242, 1366, 32, 1, 141 },
-  { 0x1, 0x1, 219, 243, 1372, 32, 1, 141 },
+  { 0x1, 0x1, 219, 242, 1366, 32, 1, 146 },
+  { 0x1, 0x1, 219, 243, 1372, 32, 1, 146 },
   { 0x1, 0x1, 219, 244, 1378, 32, 1, 141 },
-  { 0x1, 0x1, 219, 245, 1384, 32, 1, 141 },
+  { 0x1, 0x1, 219, 245, 1384, 32, 1, 146 },
   { 0x1, 0x1, 219, 246, 1390, 32, 1, 141 },
-  { 0x1, 0x1, 219, 247, 1396, 32, 1, 141 },
+  { 0x1, 0x1, 219, 247, 1396, 32, 1, 146 },
   { 0x1, 0x1, 219, 248, 1402, 32, 1, 141 },
-  { 0x1, 0x1, 219, 249, 1408, 32, 1, 141 },
+  { 0x1, 0x1, 219, 249, 1408, 32, 1, 146 },
   { 0x1, 0x1, 219, 250, 1414, 32, 1, 141 },
-  { 0x1, 0x1, 219, 251, 1420, 32, 1, 141 },
-  { 0x1, 0x1, 219, 252, 1426, 32, 1, 141 },
-  { 0x1, 0x1, 219, 710, -1, 31, 1, 150 },
+  { 0x1, 0x1, 219, 251, 1420, 32, 1, 146 },
+  { 0x1, 0x1, 219, 252, 1426, 32, 1, 146 },
+  { 0x1, 0x1, 219, 710, -1, 31, 1, 155 },
   { 0x0, 0x0, 220, 2012, -1, 0, 1, 65 },
   { 0x0, 0x0, 220, 2013, -1, 0, 1, 28 },
   { 0x0, 0x0, 220, 24, -1, 0, 1, 28 },
@@ -4048,31 +4100,31 @@ completer_table[] = {
   { 0x3, 0x3, 224, 411, 1303, 32, 1, 128 },
   { 0x3, 0x3, 224, 412, 1313, 32, 1, 128 },
   { 0x3, 0x3, 224, 425, 1326, 32, 1, 143 },
-  { 0x3, 0x3, 224, 426, 1332, 32, 1, 143 },
-  { 0x3, 0x3, 224, 427, 1338, 32, 1, 143 },
+  { 0x3, 0x3, 224, 426, 1332, 32, 1, 148 },
+  { 0x3, 0x3, 224, 427, 1338, 32, 1, 148 },
   { 0x3, 0x3, 224, 428, 1344, 32, 1, 143 },
-  { 0x3, 0x3, 224, 429, 1350, 32, 1, 143 },
-  { 0x3, 0x3, 224, 430, 1356, 32, 1, 143 },
+  { 0x3, 0x3, 224, 429, 1350, 32, 1, 148 },
+  { 0x3, 0x3, 224, 430, 1356, 32, 1, 148 },
   { 0x3, 0x3, 224, 431, 1362, 32, 1, 143 },
-  { 0x3, 0x3, 224, 432, 1368, 32, 1, 143 },
-  { 0x3, 0x3, 224, 433, 1374, 32, 1, 143 },
+  { 0x3, 0x3, 224, 432, 1368, 32, 1, 148 },
+  { 0x3, 0x3, 224, 433, 1374, 32, 1, 148 },
   { 0x3, 0x3, 224, 434, 1380, 32, 1, 143 },
-  { 0x3, 0x3, 224, 435, 1386, 32, 1, 143 },
+  { 0x3, 0x3, 224, 435, 1386, 32, 1, 148 },
   { 0x3, 0x3, 224, 436, 1392, 32, 1, 143 },
-  { 0x3, 0x3, 224, 437, 1398, 32, 1, 143 },
+  { 0x3, 0x3, 224, 437, 1398, 32, 1, 148 },
   { 0x3, 0x3, 224, 438, 1404, 32, 1, 143 },
-  { 0x3, 0x3, 224, 439, 1410, 32, 1, 143 },
+  { 0x3, 0x3, 224, 439, 1410, 32, 1, 148 },
   { 0x3, 0x3, 224, 440, 1416, 32, 1, 143 },
-  { 0x3, 0x3, 224, 441, 1422, 32, 1, 143 },
-  { 0x3, 0x3, 224, 442, 1428, 32, 1, 143 },
+  { 0x3, 0x3, 224, 441, 1422, 32, 1, 148 },
+  { 0x3, 0x3, 224, 442, 1428, 32, 1, 148 },
   { 0x1, 0x1, 225, -1, -1, 28, 1, 33 },
   { 0x1, 0x1, 225, -1, -1, 28, 1, 33 },
   { 0x0, 0x0, 232, 810, -1, 0, 1, 137 },
-  { 0x0, 0x0, 232, 811, -1, 0, 1, 150 },
+  { 0x0, 0x0, 232, 811, -1, 0, 1, 155 },
   { 0x1, 0x1, 233, -1, 1725, 33, 1, 133 },
   { 0x1, 0x1, 233, -1, 1728, 33, 1, 139 },
-  { 0x0, 0x0, 233, -1, 1730, 0, 1, 145 },
-  { 0x0, 0x0, 233, -1, 1731, 0, 1, 145 },
+  { 0x0, 0x0, 233, -1, 1730, 0, 1, 150 },
+  { 0x0, 0x0, 233, -1, 1731, 0, 1, 156 },
   { 0x0, 0x0, 234, 744, 823, 0, 0, -1 },
   { 0x0, 0x0, 234, 745, 831, 0, 0, -1 },
   { 0x0, 0x0, 234, 746, 827, 0, 0, -1 },

diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
index a4e2cecd20bf89cd2b94483b60490e8a456fd20e..c38cc3597703f2c6b3cc01d4cfb3c9664d819c43 100644 (file)
--- a/opcodes/ia64-gen.c
+++ b/opcodes/ia64-gen.c
@@ -1134,7 +1134,13 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
           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)
+                  && (strstr (format, "M5") != NULL
+                      || strstr (format, "M10") != NULL))
+           resolved = idesc->flags & IA64_OPCODE_POSTINC;
+         else if (strncmp (idesc->name, "ld", 2) == 0
+                  && (strstr (format, "M2 M3") != NULL
+                      || strstr (format, "M12") != NULL
+                      || strstr (format, "M7 M8") != NULL))
            resolved = idesc->flags & IA64_OPCODE_POSTINC;
           else
             resolved = 0;