From cce0efb55e75ff1caac4f6037744ccd0c9c8cdde Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Thu, 24 Mar 2005 06:12:42 +0000 Subject: [PATCH] * cris/Makefile.in (stamp-v10fcpu, stamp-v32fcpu): Add kludge to include cgen-ops.h in decodev10.c and decodev32.c. * cris/sim-main.h: Don't include cgen-ops.h here. * cris/arch.c, cris/arch.h, cris/cpuall.h, cris/cpuv10.c, cris/cpuv10.h, cris/cpuv32.c, cris/cpuv32.h, cris/cris-desc.c, cris/cris-desc.h, cris/cris-opc.h, cris/decodev10.c, cris/decodev10.h, cris/decodev32.c, cris/decodev32.h, cris/modelv10.c, cris/modelv32.c, cris/semcrisv10f-switch.c, cris/semcrisv32f-switch.c: Regenerate. --- sim/ChangeLog | 10 ++++++++++ sim/cris/Makefile.in | 5 +++++ sim/cris/arch.c | 2 +- sim/cris/arch.h | 2 +- sim/cris/cpuall.h | 2 +- sim/cris/cpuv10.c | 2 +- sim/cris/cpuv10.h | 2 +- sim/cris/cpuv32.c | 2 +- sim/cris/cpuv32.h | 2 +- sim/cris/cris-desc.c | 6 +++--- sim/cris/cris-desc.h | 6 +++--- sim/cris/cris-opc.h | 2 +- sim/cris/decodev10.c | 3 ++- sim/cris/decodev10.h | 2 +- sim/cris/decodev32.c | 3 ++- sim/cris/decodev32.h | 2 +- sim/cris/modelv10.c | 2 +- sim/cris/modelv32.c | 2 +- sim/cris/semcrisv10f-switch.c | 2 +- sim/cris/semcrisv32f-switch.c | 2 +- sim/cris/sim-main.h | 3 --- 21 files changed, 39 insertions(+), 25 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 6e8eeee..6837a6a 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,15 @@ 2005-03-24 Hans-Peter Nilsson + * cris/Makefile.in (stamp-v10fcpu, stamp-v32fcpu): Add kludge to + include cgen-ops.h in decodev10.c and decodev32.c. + * cris/sim-main.h: Don't include cgen-ops.h here. + * cris/arch.c, cris/arch.h, cris/cpuall.h, cris/cpuv10.c, + cris/cpuv10.h, cris/cpuv32.c, cris/cpuv32.h, cris/cris-desc.c, + cris/cris-desc.h, cris/cris-opc.h, cris/decodev10.c, + cris/decodev10.h, cris/decodev32.c, cris/decodev32.h, + cris/modelv10.c, cris/modelv32.c, cris/semcrisv10f-switch.c, + cris/semcrisv32f-switch.c: Regenerate. + * cris/traps.c (cris_break_13_handler) : Rename sa_handler, sa_flags, sa_restorer, sa_mask_low, sa_mask_high to target_sa_handler etc. diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 0e9af58..404eed4 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -140,11 +140,14 @@ stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile touch stamp-arch arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch +# The sed-hack is supposed to be temporary, until we get CGEN to emit it. stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ archfile=$(CGEN_CPU_DIR)/cris.cpu \ cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c + sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev10.c > decodev10.c.tmp + mv decodev10.c.tmp $(srcdir)/decodev10.c touch stamp-v10fcpu cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu @@ -153,6 +156,8 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DI archfile=$(CGEN_CPU_DIR)/cris.cpu \ cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c + sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev32.c > decodev32.c.tmp + mv decodev32.c.tmp $(srcdir)/decodev32.c touch stamp-v32fcpu cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu diff --git a/sim/cris/arch.c b/sim/cris/arch.c index e576761..b6cae99 100644 --- a/sim/cris/arch.c +++ b/sim/cris/arch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/arch.h b/sim/cris/arch.h index d3777bf..0c8bcc2 100644 --- a/sim/cris/arch.h +++ b/sim/cris/arch.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cpuall.h b/sim/cris/cpuall.h index 64dc265..0095edb 100644 --- a/sim/cris/cpuall.h +++ b/sim/cris/cpuall.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cpuv10.c b/sim/cris/cpuv10.c index ae76e2a..1cfbb0b 100644 --- a/sim/cris/cpuv10.c +++ b/sim/cris/cpuv10.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cpuv10.h b/sim/cris/cpuv10.h index fda43c7..96d76b8 100644 --- a/sim/cris/cpuv10.h +++ b/sim/cris/cpuv10.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cpuv32.c b/sim/cris/cpuv32.c index cbd5d51..fe043c8 100644 --- a/sim/cris/cpuv32.c +++ b/sim/cris/cpuv32.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cpuv32.h b/sim/cris/cpuv32.h index 30815d7..9db2228 100644 --- a/sim/cris/cpuv32.h +++ b/sim/cris/cpuv32.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/cris-desc.c b/sim/cris/cris-desc.c index b0bd8bb..9d073d8 100644 --- a/sim/cris/cris-desc.c +++ b/sim/cris/cris-desc.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -43,7 +43,7 @@ static const CGEN_ATTR_ENTRY bool_attr[] = { 0, 0 } }; -static const CGEN_ATTR_ENTRY MACH_attr[] = +static const CGEN_ATTR_ENTRY MACH_attr[] ATTRIBUTE_UNUSED = { { "base", MACH_BASE }, { "crisv0", MACH_CRISV0 }, @@ -55,7 +55,7 @@ static const CGEN_ATTR_ENTRY MACH_attr[] = { 0, 0 } }; -static const CGEN_ATTR_ENTRY ISA_attr[] = +static const CGEN_ATTR_ENTRY ISA_attr[] ATTRIBUTE_UNUSED = { { "cris", ISA_CRIS }, { "max", ISA_MAX }, diff --git a/sim/cris/cris-desc.h b/sim/cris/cris-desc.h index 1e89563..20b11ee 100644 --- a/sim/cris/cris-desc.h +++ b/sim/cris/cris-desc.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -221,8 +221,6 @@ typedef enum isa_attr { /* Ifield support. */ -extern const struct cgen_ifld cris_cgen_ifld_table[]; - /* Ifield attribute indices. */ /* Enum declaration for cgen_ifld attrs. */ @@ -326,6 +324,8 @@ typedef enum cgen_insn_attr { /* cgen.h uses things we just defined. */ #include "opcode/cgen.h" +extern const struct cgen_ifld cris_cgen_ifld_table[]; + /* Attributes. */ extern const CGEN_ATTR_TABLE cris_cgen_hardware_attr_table[]; extern const CGEN_ATTR_TABLE cris_cgen_ifield_attr_table[]; diff --git a/sim/cris/cris-opc.h b/sim/cris/cris-opc.h index b0fdfec..d8f425f 100644 --- a/sim/cris/cris-opc.h +++ b/sim/cris/cris-opc.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. diff --git a/sim/cris/decodev10.c b/sim/cris/decodev10.c index 7aca438..b83022a 100644 --- a/sim/cris/decodev10.c +++ b/sim/cris/decodev10.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "sim-main.h" #include "sim-assert.h" +#include "cgen-ops.h" /* The instruction descriptor array. This is computed at runtime. Space for it is not malloc'd to save a diff --git a/sim/cris/decodev10.h b/sim/cris/decodev10.h index 3fe4b60..b6a14cf 100644 --- a/sim/cris/decodev10.h +++ b/sim/cris/decodev10.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/decodev32.c b/sim/cris/decodev32.c index 111773b..f469e14 100644 --- a/sim/cris/decodev32.c +++ b/sim/cris/decodev32.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "sim-main.h" #include "sim-assert.h" +#include "cgen-ops.h" /* The instruction descriptor array. This is computed at runtime. Space for it is not malloc'd to save a diff --git a/sim/cris/decodev32.h b/sim/cris/decodev32.h index b9bcf38..7a30df8 100644 --- a/sim/cris/decodev32.h +++ b/sim/cris/decodev32.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/modelv10.c b/sim/cris/modelv10.c index fc29ee3..1e33c81 100644 --- a/sim/cris/modelv10.c +++ b/sim/cris/modelv10.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/modelv32.c b/sim/cris/modelv32.c index 3806910..bd889af 100644 --- a/sim/cris/modelv32.c +++ b/sim/cris/modelv32.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/semcrisv10f-switch.c b/sim/cris/semcrisv10f-switch.c index 01055ae..31f2ce6 100644 --- a/sim/cris/semcrisv10f-switch.c +++ b/sim/cris/semcrisv10f-switch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/semcrisv32f-switch.c b/sim/cris/semcrisv32f-switch.c index f09fb19..ed57d43 100644 --- a/sim/cris/semcrisv32f-switch.c +++ b/sim/cris/semcrisv32f-switch.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996-2004 Free Software Foundation, Inc. +Copyright 1996-2005 Free Software Foundation, Inc. This file is part of the GNU simulators. diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index 5264068..b671533 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -56,9 +56,6 @@ do { \ #include "sim-base.h" #include "cgen-sim.h" #include "cris-sim.h" - -/* For occurrences of ANDIF in decodev32.c. */ -#include "cgen-ops.h" struct cris_sim_mmapped_page { USI addr; -- 2.7.4