binutils: support for the SPARC M8 processor

[deliverable/binutils-gdb.git] / sim / common / sim-arange.h

diff --git a/sim/common/sim-arange.h b/sim/common/sim-arange.h
index 10ba0f4e7bdb7a4ef77aa62d2ba28a72fb52e336..033d31b530fed443d07dc0ca83b21035bf3bcbbb 100644 (file)
--- a/sim/common/sim-arange.h
+++ b/sim/common/sim-arange.h
@@ -1,22 +1,21 @@
 /* Address ranges.
 /* Address ranges.

-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998-2017 Free Software Foundation, Inc.

    Contributed by Cygnus Solutions.
 
 This file is part of the GNU Simulators.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
    Contributed by Cygnus Solutions.
 
 This file is part of the GNU Simulators.
 
 This program 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.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.

 
 This program 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.
 
 
 This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This file is meant to be included by sim-basics.h.  */
 
 
 /* This file is meant to be included by sim-basics.h.  */
 


@@ -61,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/,
                                   address_word /*start*/,
                                   address_word /*end*/);
 
                                   address_word /*start*/,
                                   address_word /*end*/);
 

+/* TODO: This should get moved into sim-inline.h.  */
+#ifdef HAVE_INLINE
+#ifdef SIM_ARANGE_C
+#define SIM_ARANGE_INLINE INLINE
+#else
+#define SIM_ARANGE_INLINE EXTERN_INLINE
+#endif
+#else
+#define SIM_ARANGE_INLINE EXTERN
+#endif
+

 /* Return non-zero if ADDR is in range AR, traversing the entire tree.
    If no range is specified, that is defined to mean "everything".  */
 /* Return non-zero if ADDR is in range AR, traversing the entire tree.
    If no range is specified, that is defined to mean "everything".  */

-extern INLINE int
+SIM_ARANGE_INLINE int

 sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
 #define ADDR_RANGE_HIT_P(ar, addr) \
   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
 
 #ifdef HAVE_INLINE
 sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
 #define ADDR_RANGE_HIT_P(ar, addr) \
   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
 
 #ifdef HAVE_INLINE

-#ifdef SIM_ARANGE_C
-#define SIM_ARANGE_INLINE INLINE
-#else
-#define SIM_ARANGE_INLINE EXTERN_INLINE
-#endif

 #include "sim-arange.c"
 #include "sim-arange.c"

-#else
-#define SIM_ARANGE_INLINE

 #endif
 #define SIM_ARANGE_C_INCLUDED
 
 #endif
 #define SIM_ARANGE_C_INCLUDED