* config/tc-d30v.c (parallel_ok): Use FLAG_NOT_WITH_ADDSUBppp to

        determine if an instruction can be used in parallel with an ADDppp
        or SUBppp instruction.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 218e2180ecb1176dea0ec5609ac8c494487f8731..d52aec7294f3df732e29daddd023ef0f1de0d78a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-19  Michael Meissner  <meissner@redhat.com>
+
+       * config/tc-d30v.c (parallel_ok): Use FLAG_NOT_WITH_ADDSUBppp to
+       determine if an instruction can be used in parallel with an ADDppp
+       or SUBppp instruction.
+
 2000-02-22  Andrew Haley  <aph@cygnus.com>
 
        * doc/c-mips.texi (MIPS Opts): Document -mgp32 and -mgp64.

diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index 25c541242425beee48d776439b9683b871f44853..c894e2bd1ed11b16bcbdb379a2561fb6727a4d32 100644 (file)
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -1,5 +1,5 @@
 /* tc-d30v.c -- Assembler code for the Mitsubishi D30V
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation.
+   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -1146,10 +1146,10 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
   flags_used1 = op1->op->flags_used;
   flags_used2 = op2->op->flags_used;
 
-  /* ST2W/ST4HB combined with ADDppp/SUBppp is illegal.  */
-  if (((flags_set1 & (FLAG_MEM | FLAG_2WORD)) == (FLAG_MEM | FLAG_2WORD)
+  /* Check for illegal combinations with ADDppp/SUBppp.  */
+  if (((flags_set1 & FLAG_NOT_WITH_ADDSUBppp) != 0
        && (flags_used2 & FLAG_ADDSUBppp) != 0)
-      || ((flags_set2 & (FLAG_MEM | FLAG_2WORD)) == (FLAG_MEM | FLAG_2WORD)
+      || ((flags_set2 & FLAG_NOT_WITH_ADDSUBppp) != 0
          && (flags_used1 & FLAG_ADDSUBppp) != 0))
     return 0;