sim: fix unused cpu_nr warnings

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

diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 186adc6d6009ed512b4b481a2db974f304d19b70..86397ff5d597077fbe9e452ad25b47d8f6ef1155 100644 (file)
--- a/sim/common/cgen-mem.h
+++ b/sim/common/cgen-mem.h
@@ -1,22 +1,22 @@
 /* Memory ops header for CGEN-based simulators.
 /* Memory ops header for CGEN-based simulators.

-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2007, 2008, 2009, 2010
+   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/>.  */

 
 #ifndef CGEN_MEM_H
 #define CGEN_MEM_H
 
 #ifndef CGEN_MEM_H
 #define CGEN_MEM_H


@@ -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).  */
 
    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) \
 #define DECLARE_GETT(mode, size) \

-MEMOPS_INLINE mode \
+mode \

 XCONCAT2 (GETT,mode) (unsigned char *p) \
 { \
   mode tmp; \
 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).  */
 
    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) \
 #define DECLARE_SETT(mode, size) \

-MEMOPS_INLINE void \
+void \

 XCONCAT2 (SETT,mode) (unsigned char *buf, mode val) \
 { \
   mode tmp; \
 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) \
 }
 #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 */
 #endif
 
 DECLARE_SETT (QI, 1)  /* TAGS: SETTQI */