* config/sh/sh-protos.h (sh_legitimize_reload_address): Declare.

[pf3gnuchains/gcc-fork.git] / gcc / insn-addr.h

diff --git a/gcc/insn-addr.h b/gcc/insn-addr.h
index 214df19..0cf292c 100644 (file)
--- a/gcc/insn-addr.h
+++ b/gcc/insn-addr.h
@@ -1,11 +1,11 @@
 /* Macros to support INSN_ADDRESSES
 /* Macros to support INSN_ADDRESSES

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2007 Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,37 +14,52 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #ifndef GCC_INSN_ADDR_H
 
 #ifndef GCC_INSN_ADDR_H

-#define GCC_INSN_ADDR_H 
+#define GCC_INSN_ADDR_H

 
 

-#include "varray.h"
+#include "vecprim.h"

 
 

-extern varray_type insn_addresses_;
+extern VEC(int,heap) *insn_addresses_;

 extern int insn_current_address;
 
 extern int insn_current_address;
 

-#define INSN_ADDRESSES_DEFN() varray_type insn_addresses_
-#define INSN_ADDRESSES(id) VARRAY_INT (insn_addresses_, (id))
-#define INSN_ADDRESSES_ALLOC(size) \
-  VARRAY_INT_INIT (insn_addresses_, (size), "insn_addresses")
-#define INSN_ADDRESSES_FREE() VARRAY_FREE (insn_addresses_)
+#define INSN_ADDRESSES(id) (*&(VEC_address (int, insn_addresses_) [id]))
+#define INSN_ADDRESSES_ALLOC(size)                     \
+  do                                                   \
+    {                                                  \
+      insn_addresses_ = VEC_alloc (int, heap, size);   \
+      VEC_safe_grow (int, heap, insn_addresses_, size);        \
+      memset (VEC_address (int, insn_addresses_),      \
+             0, sizeof (int) * size);                  \
+    }                                                  \
+  while (0)
+#define INSN_ADDRESSES_FREE() (VEC_free (int, heap, insn_addresses_))

 #define INSN_ADDRESSES_SET_P() (insn_addresses_ != 0)
 #define INSN_ADDRESSES_SET_P() (insn_addresses_ != 0)

-#define INSN_ADDRESSES_SIZE() VARRAY_SIZE (insn_addresses_)
-#define INSN_ADDRESSES_NEW(insn, addr) do \
-  {                                                                    \
-    unsigned insn_uid__ = INSN_UID ((insn));                           \
-    int insn_addr__ = (addr);                                          \
-                                                                       \
-    if (INSN_ADDRESSES_SET_P ())                                       \
-      {                                                                        \
-       if (INSN_ADDRESSES_SIZE () <= insn_uid__)                       \
-         VARRAY_GROW (insn_addresses_, insn_uid__ + 1);                \
-       INSN_ADDRESSES (insn_uid__) = insn_addr__;                      \
-      }                                                                        \
-  }                                                                    \
-while (0)
+#define INSN_ADDRESSES_SIZE() (VEC_length (int, insn_addresses_))
+
+static inline void
+insn_addresses_new (rtx insn, int insn_addr)
+{
+  unsigned insn_uid = INSN_UID ((insn));
+
+  if (INSN_ADDRESSES_SET_P ())
+    {
+      size_t size = INSN_ADDRESSES_SIZE ();
+      if (size <= insn_uid)
+       {
+         int *p;
+         VEC_safe_grow (int, heap, insn_addresses_, insn_uid + 1);
+         p = VEC_address (int, insn_addresses_);
+         memset (&p[size],
+                 0, sizeof (int) * (insn_uid + 1 - size));
+       }
+      INSN_ADDRESSES (insn_uid) = insn_addr;
+    }
+}
+
+#define INSN_ADDRESSES_NEW(insn, addr)         \
+  (insn_addresses_new (insn, addr))

 
 #endif /* ! GCC_INSN_ADDR_H */
 
 #endif /* ! GCC_INSN_ADDR_H */