Merged revisions 196607-196608,196611-196614,196625,196629-196634,196636,196639,196645-196647,196649-196650,196654-196659,196666,196669,196671-196675,196682-196683,196694-196695,196697-196698,196700-196701,196704-196706,196709,196721-196748,196750-196751,196753,196755-196758,196762,196764-196765,196767-196771,196773-196779,196781-196784,196788-196792,196795-196797,196799-196800,196804-196807,196810-196814,196821,196823-196825,196828-196829,196831-196832,196834,196841-196842,196847-196853,196855-196856,196858,196860-196861,196864-196866,196868,196870-196872,196874,196876,196878-196879,196882,196884-196890,196896-196897,196899-196902,196954,196956-196961,196964-196965,196970,196977-196978,196981-196983,196989,197002-197005,197007,197011-197012,197016-197019,197021,197023-197025,197029-197034,197036-197042 via svnmerge from cxx-conversion

svn+ssh://gcc.gnu.org/svn/gcc/trunk



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/cxx-conversion@197098 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 55 insertions, 2 deletions

diff --git a/gcc/config/microblaze/predicates.md b/gcc/config/microblaze/predicates.md
index e6e99836024..5fd1bd40372 100644
--- a/gcc/config/microblaze/predicates.md
+++ b/gcc/config/microblaze/predicates.md
@@ -30,6 +30,52 @@
        (and (match_code "const_int,const_double")
 	    (match_test "LARGE_INT (op)"))))
 
+(define_predicate "arith_plus_operand"
+ (match_operand 0 "general_operand")
+{
+  switch (GET_CODE (op))
+    {
+      default:
+        return 0;
+      case CONST_INT:
+      case REG:
+        return 1;
+      case SYMBOL_REF:
+      case LABEL_REF:
+        if (flag_pic || microblaze_tls_referenced_p(op))
+          return 0;
+        return 1;
+      case CONST:
+        {
+          rtx const0;
+          const0 = XEXP (op, 0);
+
+          switch (GET_CODE(const0))
+            {
+              default:
+                return 0;
+              case UNSPEC :
+                return 1;
+
+              case PLUS :
+                {
+                  rtx p0, p1;
+                  p0 = XEXP (const0, 0);
+                  p1 = XEXP (const0, 1);
+
+                  if ((GET_CODE(p0) == SYMBOL_REF
+                       || GET_CODE (p0) == LABEL_REF)
+                      && GET_CODE(p1) == CONST_INT)
+                    {
+                      return arith_plus_operand (p0, GET_MODE(p0));
+                    }
+                }
+            }
+        }
+    }
+  return 0;
+})
+
 (define_predicate "const_0_operand"
   (and (match_code "const_int,const_double")
        (match_test "op == CONST0_RTX (GET_MODE (op))")))
@@ -54,14 +100,21 @@
        (match_test "GET_CODE (op) == REG || GET_CODE (op) == SYMBOL_REF || GET_CODE (op) == CONST_INT")))
 
 ;; Return if OPERAND is valid as a source operand for a move instruction.
-(define_predicate "move_operand"
+(define_predicate "move_src_operand"
   (and (
      not (
        and (match_code "plus")
            (not (match_test "(GET_CODE (XEXP (op, 0)) == REG) ^ (GET_CODE (XEXP (op,1)) == REG)"))
 	 )
        )
-       (match_operand 0 "general_operand")))
+       (match_operand 0 "general_operand"))
+{
+  if (microblaze_tls_referenced_p(op)
+      || (flag_pic && (symbol_mentioned_p(op) || label_mentioned_p(op))))
+    return false;
+
+  return true;
+})
 
 ;; Test for valid PIC call operand
 (define_predicate "call_insn_plt_operand"