Minor DV table update, minor DV checking bug fix.

	* config/tc-ia64.c (resources_match): Handle IA64_RS_PRr.
	* ia64-ic.tbl: Update from Intel.
	* ia64-asmtab.c: Regenerate.

5 files changed, 26 insertions, 13 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index dbc725a..ff9c3b8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-05  Jim Wilson  <wilson@cygnus.com>
+
+	* config/tc-ia64.c (resources_match): Handle IA64_RS_PRr.
+
 2000-10-05  Alan Modra  <alan@linuxcare.com.au>
 
 	* config/tc-i386.c: Delete some useless comments, reformat others.
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 21cf83a..065a0ee 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -8077,6 +8077,7 @@ resources_match (rs, idesc, note, qp_regno, path)
       /* Skip apparent PR write conflicts where both writes are an AND or both
 	 writes are an OR.  */
       if (rs->dependency->specifier == IA64_RS_PR
+	  || rs->dependency->specifier == IA64_RS_PRr
 	  || rs->dependency->specifier == IA64_RS_PR63)
 	{
 	  if (specs[count].cmp_type != CMP_NONE
@@ -8085,7 +8086,7 @@ resources_match (rs, idesc, note, qp_regno, path)
 	      if (md.debug_dv)
 		fprintf (stderr, "  %s on parallel compare allowed (PR%d)\n",
 			 dv_mode[rs->dependency->mode],
-			 rs->dependency->specifier == IA64_RS_PR ?
+			 rs->dependency->specifier != IA64_RS_PR63 ?
 			 specs[count].index : 63);
 	      continue;
 	    }
@@ -8095,7 +8096,7 @@ resources_match (rs, idesc, note, qp_regno, path)
 		     dv_mode[rs->dependency->mode],
 		     dv_cmp_type[rs->cmp_type],
 		     dv_cmp_type[specs[count].cmp_type],
-		     rs->dependency->specifier == IA64_RS_PR ?
+		     rs->dependency->specifier != IA64_RS_PR63 ?
 		     specs[count].index : 63);
 
 	}
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 2e81fc3..9bb0b72 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-05  Jim Wilson  <wilson@cygnus.com>
+
+	* ia64-ic.tbl: Update from Intel.
+	* ia64-asmtab.c: Regenerate.
+	
 2000-10-04  Kazu Hirata  <kazu@hxi.com>
 
 	* ia64-gen.c: Convert C++-style comments to C-style comments.
diff --git a/opcodes/ia64-asmtab.c b/opcodes/ia64-asmtab.c
index 8a13559..d08119d 100644
--- a/opcodes/ia64-asmtab.c
+++ b/opcodes/ia64-asmtab.c
@@ -385,31 +385,34 @@ static const short dep5[] = {
 };
 
 static const short dep6[] = {
-  88, 252, 2315, 2317, 2319, 2321, 2323, 2325, 
+  88, 252, 2157, 2158, 2160, 2161, 2163, 2164, 2166, 2314, 2315, 2317, 2319, 
+  2321, 2323, 2325, 
 };
 
 static const short dep7[] = {
-  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2315, 2318, 
-  2319, 2322, 2323, 2326, 4127, 20605, 
+  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2314, 2315, 
+  2318, 2319, 2322, 2323, 2326, 4127, 20605, 
 };
 
 static const short dep8[] = {
-  88, 252, 2316, 2318, 2320, 2322, 2324, 2326, 
+  88, 252, 2157, 2158, 2160, 2161, 2163, 2164, 2166, 2314, 2316, 2318, 2320, 
+  2322, 2324, 2326, 
 };
 
 static const short dep9[] = {
-  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2316, 2317, 
-  2320, 2321, 2324, 2325, 4127, 20605, 
+  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2314, 2316, 
+  2317, 2320, 2321, 2324, 2325, 4127, 20605, 
 };
 
 static const short dep10[] = {
-  88, 252, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 
-  2326, 
+  88, 252, 2157, 2158, 2160, 2161, 2163, 2164, 2166, 2314, 2315, 2316, 2317, 
+  2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 
 };
 
 static const short dep11[] = {
-  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2315, 2316, 
-  2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 4127, 20605, 
+  32, 33, 88, 166, 252, 2129, 2130, 2131, 2157, 2158, 2161, 2164, 2314, 2315, 
+  2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 4127, 20605, 
+  
 };
 
 static const short dep12[] = {
diff --git a/opcodes/ia64-ic.tbl b/opcodes/ia64-ic.tbl
index 15a02bb..bae3433 100644
--- a/opcodes/ia64-ic.tbl
+++ b/opcodes/ia64-ic.tbl
@@ -206,7 +206,7 @@ pr-unc-writers-fp;	IC:pr-gen-writers-fp[Field(ctype)==unc]+11, fprcpa+11, fprsqr
 pr-unc-writers-int;	IC:pr-gen-writers-int[Field(ctype)==unc]+11
 pr-writers;	IC:pr-writers-int, IC:pr-writers-fp
 pr-writers-fp;	IC:pr-norm-writers-fp, IC:pr-unc-writers-fp
-pr-writers-int;	IC:pr-norm-writers-int, IC:pr-unc-writers-int
+pr-writers-int;	IC:pr-norm-writers-int, IC:pr-unc-writers-int, IC:pr-and-writers, IC:pr-or-writers
 predicatable-instructions;	IC:mov-from-PR, IC:mov-to-PR, IC:pr-readers-br, IC:pr-readers-nobr-nomovpr
 priv-ops;	IC:mov-to-IND-priv, bsw, itc.i, itc.d, itr.i, itr.d, IC:mov-to-CR, IC:mov-from-CR, IC:mov-to-PSR-l, IC:mov-from-PSR, IC:mov-from-IND-priv, ptc.e, ptc.g, ptc.ga, ptc.l, ptr.i, ptr.d, rfi, rsm, ssm, tak, tpa
 probe-all;	IC:probe-fault, IC:probe-nofault