2005-03-04 Andrew Haley <aph@redhat.com>

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

diff --git a/gcc/insn-addr.h b/gcc/insn-addr.h
index 2a055e7..4403b0b 100644 (file)
--- a/gcc/insn-addr.h
+++ b/gcc/insn-addr.h
@@ -1,46 +1,50 @@
 /* Macros to support INSN_ADDRESSES
    Copyright (C) 2000 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 2, 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 COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
 #ifndef GCC_INSN_ADDR_H
 #define GCC_INSN_ADDR_H 
 
 #include "varray.h"
 
-extern varray_type insn_addresses_;
+extern GTY(()) varray_type 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_FREE() (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 {                             \
-  int insn_uid__ = INSN_UID ((insn)), insn_addr__ = (addr);            \
+#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__)                           \
-      insn_addresses_ = VARRAY_GROW (insn_addresses_, insn_uid__ + 1); \
-    INSN_ADDRESSES (insn_uid__) = insn_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)
+while (0)
 
 #endif /* ! GCC_INSN_ADDR_H */