X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcris%2Fmodelv32.c;h=0b10be52268b1ffc448ae5c9d4e2ec1c40f0fffc;hb=05e682e3be7e3d9d63ec358dcf8943fd200545cb;hp=f08b5acef1254419f0d170c32642bb66c0ba0684;hpb=0f51e9bf19401fe6f5beb4b46fc1ee0285d02d69;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/cris/modelv32.c b/sim/cris/modelv32.c
index f08b5acef1..0b10be5226 100644
--- a/sim/cris/modelv32.c
+++ b/sim/cris/modelv32.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2010 Free Software Foundation, Inc.
+Copyright 1996-2020 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -17,8 +17,7 @@ This file is part of the GNU simulators.
    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.,
-   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -4684,7 +4683,7 @@ model_crisv32_sfe (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_crisv32_rfg (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -4722,7 +4721,7 @@ model_crisv32_rfn (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_crisv32_halt (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -5905,7 +5904,7 @@ crisv32_model_init (SIM_CPU *cpu)
 #define TIMING_DATA(td) 0
 #endif
 
-static const MODEL crisv32_models[] =
+static const SIM_MODEL crisv32_models[] =
 {
   { "crisv32", & crisv32_mach, MODEL_CRISV32, TIMING_DATA (& crisv32_timing[0]), crisv32_model_init },
   { 0 }
@@ -5913,7 +5912,7 @@ static const MODEL crisv32_models[] =
 
 /* The properties of this cpu's implementation.  */
 
-static const MACH_IMP_PROPERTIES crisv32f_imp_properties =
+static const SIM_MACH_IMP_PROPERTIES crisv32f_imp_properties =
 {
   sizeof (SIM_CPU),
 #if WITH_SCACHE
@@ -5955,7 +5954,7 @@ crisv32_init_cpu (SIM_CPU *cpu)
 #endif
 }
 
-const MACH crisv32_mach =
+const SIM_MACH crisv32_mach =
 {
   "crisv32", "crisv32", MACH_CRISV32,
   32, 32, & crisv32_models[0], & crisv32f_imp_properties,