Automatic date update in version.in

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

diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h
index f8996f5bd268ce85cdae0a40d1dfe543476f96b3..3200894dff8b29956bd58baf755cc02e42d80cd4 100644 (file)
--- a/sim/common/sim-cpu.h
+++ b/sim/common/sim-cpu.h
@@ -1,22 +1,21 @@
 /* CPU support.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
 
 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/>.  */
 
 /* This file is intended to be included by sim-base.h.
 
@@ -101,17 +100,15 @@ typedef struct {
   PROFILE_DATA profile_data;
 #define CPU_PROFILE_DATA(cpu) (& (cpu)->base.profile_data)
 
-#ifdef SIM_HAVE_MODEL
   /* Machine tables for this cpu.  See sim-model.h.  */
-  const MACH *mach;
+  const SIM_MACH *mach;
 #define CPU_MACH(cpu) ((cpu)->base.mach)
   /* The selected model.  */
-  const MODEL *model;
+  const SIM_MODEL *model;
 #define CPU_MODEL(cpu) ((cpu)->base.model)
   /* Model data (profiling state, etc.).  */
   void *model_data;
 #define CPU_MODEL_DATA(cpu) ((cpu)->base.model_data)
-#endif
 
   /* Routines to fetch/store registers.  */
   CPUREG_FETCH_FN *reg_fetch;
@@ -137,6 +134,11 @@ extern void sim_cpu_free (sim_cpu *);
 /* Return a pointer to the cpu data for CPU_NAME, or NULL if not found.  */
 extern sim_cpu *sim_cpu_lookup (SIM_DESC, const char *);
 
+/* Return prefix to use in cpu specific messages.  */
+extern const char *sim_cpu_msg_prefix (sim_cpu *);
+/* Cover fn to sim_io_eprintf.  */
+extern void sim_io_eprintf_cpu (sim_cpu *, const char *, ...);
+
 /* Get/set a pc value.  */
 #define CPU_PC_GET(cpu) ((* CPU_PC_FETCH (cpu)) (cpu))
 #define CPU_PC_SET(cpu,newval) ((* CPU_PC_STORE (cpu)) ((cpu), (newval)))