X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fcgen-mem.h;h=2559b3832961572201746fd949b509c36ae14643;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=186adc6d6009ed512b4b481a2db974f304d19b70;hpb=30727aa6d12fb866494020c0b62ab265a2bdcdfe;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 186adc6d60..2559b38329 100644
--- a/sim/common/cgen-mem.h
+++ b/sim/common/cgen-mem.h
@@ -1,30 +1,30 @@
 /* Memory ops header for CGEN-based simulators.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 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
-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.
 
-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/>.  */
 
 #ifndef CGEN_MEM_H
 #define CGEN_MEM_H
 
+/* TODO: This should get moved into sim-inline.h.  */
 #ifdef MEMOPS_DEFINE_INLINE
 #define MEMOPS_INLINE
 #else
-#define MEMOPS_INLINE extern inline
+#define MEMOPS_INLINE EXTERN_INLINE
 #endif
 
 /* Integer memory read support.
@@ -160,9 +160,9 @@ DECLARE_SETMEM (DF, 8) /* TAGS: SETMEMDF */
    This needn't be very efficient (i.e. can call memcpy) as this is
    only used when interfacing with the outside world (e.g. gdb).  */
 
-#if defined (__GNUC__) || defined (MEMOPS_DEFINE_INLINE)
+#if defined (MEMOPS_DEFINE_INLINE)
 #define DECLARE_GETT(mode, size) \
-MEMOPS_INLINE mode \
+mode \
 XCONCAT2 (GETT,mode) (unsigned char *p) \
 { \
   mode tmp; \
@@ -195,9 +195,9 @@ DECLARE_GETT (TF, 16) /* TAGS: GETTTF */
    This needn't be very efficient (i.e. can call memcpy) as this is
    only used when interfacing with the outside world (e.g. gdb).  */
 
-#if defined (__GNUC__) || defined (MEMOPS_DEFINE_INLINE)
+#if defined (MEMOPS_DEFINE_INLINE)
 #define DECLARE_SETT(mode, size) \
-MEMOPS_INLINE void \
+void \
 XCONCAT2 (SETT,mode) (unsigned char *buf, mode val) \
 { \
   mode tmp; \
@@ -206,7 +206,7 @@ XCONCAT2 (SETT,mode) (unsigned char *buf, mode val) \
 }
 #else
 #define DECLARE_SETT(mode, size) \
-extern mode XCONCAT2 (GETT,mode) (unsigned char *, mode);
+extern mode XCONCAT2 (SETT,mode) (unsigned char *, mode);
 #endif
 
 DECLARE_SETT (QI, 1)  /* TAGS: SETTQI */