* hwint.c: New. Extracted from toplev.c.

[pf3gnuchains/gcc-fork.git] / gcc / tree-dfa.c

diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 467a678..05a682b 100644 (file)
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "toplev.h"
 #include "hashtab.h"
 #include "pointer-set.h"
 #include "tree.h"
@@ -495,7 +494,6 @@ referenced_var_lookup (unsigned int uid)
   struct tree_decl_minimal in;
   in.uid = uid;
   h = (tree) htab_find_with_hash (gimple_referenced_vars (cfun), &in, uid);
-  gcc_assert (h || uid == 0);
   return h;
 }
 
@@ -770,9 +768,9 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset,
                    && maxsize != -1)
                  {
                    tree stype = TREE_TYPE (TREE_OPERAND (exp, 0));
-                   tree next = TREE_CHAIN (field);
+                   tree next = DECL_CHAIN (field);
                    while (next && TREE_CODE (next) != FIELD_DECL)
-                     next = TREE_CHAIN (next);
+                     next = DECL_CHAIN (next);
                    if (!next
                        || TREE_CODE (stype) != RECORD_TYPE)
                      {
@@ -879,6 +877,38 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset,
            }
          goto done;
 
+       case TARGET_MEM_REF:
+         /* Hand back the decl for MEM[&decl, off].  */
+         if (TREE_CODE (TMR_BASE (exp)) == ADDR_EXPR)
+           {
+             /* Via the variable index or index2 we can reach the
+                whole object.  */
+             if (TMR_INDEX (exp) || TMR_INDEX2 (exp))
+               {
+                 exp = TREE_OPERAND (TMR_BASE (exp), 0);
+                 bit_offset = 0;
+                 maxsize = -1;
+                 goto done;
+               }
+             if (integer_zerop (TMR_OFFSET (exp)))
+               exp = TREE_OPERAND (TMR_BASE (exp), 0);
+             else
+               {
+                 double_int off = mem_ref_offset (exp);
+                 off = double_int_lshift (off,
+                                          BITS_PER_UNIT == 8
+                                          ? 3 : exact_log2 (BITS_PER_UNIT),
+                                          HOST_BITS_PER_DOUBLE_INT, true);
+                 off = double_int_add (off, shwi_to_double_int (bit_offset));
+                 if (double_int_fits_in_shwi_p (off))
+                   {
+                     bit_offset = double_int_to_shwi (off);
+                     exp = TREE_OPERAND (TMR_BASE (exp), 0);
+                   }
+               }
+           }
+         goto done;
+
        default:
          goto done;
        }
@@ -1011,6 +1041,22 @@ get_addr_base_and_unit_offset (tree exp, HOST_WIDE_INT *poffset)
            }
          goto done;
 
+       case TARGET_MEM_REF:
+         /* Hand back the decl for MEM[&decl, off].  */
+         if (TREE_CODE (TMR_BASE (exp)) == ADDR_EXPR)
+           {
+             if (TMR_INDEX (exp) || TMR_INDEX2 (exp))
+               return NULL_TREE;
+             if (!integer_zerop (TMR_OFFSET (exp)))
+               {
+                 double_int off = mem_ref_offset (exp);
+                 gcc_assert (off.high == -1 || off.high == 0);
+                 byte_offset += double_int_to_shwi (off);
+               }
+             exp = TREE_OPERAND (TMR_BASE (exp), 0);
+           }
+         goto done;
+
        default:
          goto done;
        }