X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Finsn-addr.h;h=0cf292cb10df847670c084f127995d81b3d12edd;hb=f31d5206a713e983c4600384e642d69efeffa085;hp=4ae59f7fddbea17cc95e01ca20d89d8a38aaad90;hpb=47fc0706efc3899bb63c2fa9a1e36fc77d988a8d;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/insn-addr.h b/gcc/insn-addr.h
index 4ae59f7fddb..0cf292cb10d 100644
--- a/gcc/insn-addr.h
+++ b/gcc/insn-addr.h
@@ -1,46 +1,65 @@
 /* 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 GNU CC.
+This file is part of GCC.
 
-GNU CC 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 version.
+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 3, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
-along with GNU CC; 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 _INSN_ADDR_H
-#define _INSN_ADDR_H 1
+#ifndef 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;
 
-#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_SIZE() VARRAY_SIZE (insn_addresses_)
-#define INSN_ADDRESSES_NEW(insn,addr) do {				\
-  int insn_uid__ = INSN_UID ((insn)), insn_addr__ = (addr);		\
-									\
-  if (INSN_ADDRESSES_SET_P()) {						\
-    if (INSN_ADDRESSES_SIZE() <= insn_uid__)				\
-      insn_addresses_ = VARRAY_GROW (insn_addresses_, insn_uid__ + 1);	\
-    INSN_ADDRESSES (insn_uid__) = insn_addr__;				\
-  }									\
-} while (0)
-
-#endif /* _INSN_ADDR_H */
+#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 */