* 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.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 6e8eeeec7361511e55fd8c9799fb3551515c385a..6837a6adb6ff0cadc1ab73d5a12c1667fee7bed8 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,5 +1,15 @@
 2005-03-24  Hans-Peter Nilsson  <hp@axis.com>
 
+       * 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) <case
        TARGET_SYS_rt_sigaction>: 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 0e9af581d4a57f9b517c77dea21ec963e396a5ba..404eed474ccb77ad7c00042e3594e4a5f68cccc5 100644 (file)
--- 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 e57676146a72777690b1114004ba2b6f1ab94018..b6cae997fcba158a45d0e70d9072ff23035e8aac 100644 (file)
--- 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 d3777bf5d2cb267ee6ac8ae97ffafe076fe20712..0c8bcc26f43e707ebd3d800483b30d4adde4c9b4 100644 (file)
--- 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 64dc2650db68ee80e143d357015127a99b983226..0095edb58c5912484056297c26f246f3dbfec86d 100644 (file)
--- 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 ae76e2a4021c371ccb36ff6d95b924339e65ed3c..1cfbb0bd865d87ba9145063e5f9eae3c6ffa52e4 100644 (file)
--- 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 fda43c7ac6513bf2a48fcd5ffe40f0cb62107325..96d76b80565c632f75bc8110cf6ea4b7954e8dc4 100644 (file)
--- 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 cbd5d51cfd2807bfa95fe26b8348e7b9881a42fb..fe043c89011fd8b6b6be43d8f2761355253065e0 100644 (file)
--- 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 30815d7f04088a25a14b35719fb8374556d04274..9db2228af9918dedfc610384cd5eb03e7795ec21 100644 (file)
--- 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 b0bd8bba4ed42c2c00ea35e492b6eb3b36275563..9d073d8600f36923d65177c8b807e2d74f6da032 100644 (file)
--- 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 1e89563f24cff4bdec55266655a872e1f692d20d..20b11ee3874d1d132aad206d279bcde0aace03fc 100644 (file)
--- 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 b0fdfec8e3be40f514ff4a6dc936063ad8ef31be..d8f425f7b7977c87039ca3d1ca1edf9fb7c82cbb 100644 (file)
--- 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 7aca438852ac6fec6b7e323f1a770bbd93fdecd4..b83022a8ec0ad48d2e9dc47e64cb292a84426205 100644 (file)
--- 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 3fe4b60aa114778e92aed2f2bc71bb4c4a23f292..b6a14cf48d75a7ce1d0245594c8ebf12ab371250 100644 (file)
--- 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 111773bd7cb251104796514848b1e7712c620002..f469e148e333ca39cb8bea26b2ad03b74c86084e 100644 (file)
--- 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 b9bcf3815a48a599a0ec03e604cb755d71e6c91a..7a30df8aa5d2303a3260766b2f2944c5db1c933d 100644 (file)
--- 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 fc29ee33a9fb652a743a10bf407a1ceb72353c01..1e33c8173d14d8f53466845e4b163caeacd52830 100644 (file)
--- 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 380691027671814883592af830b089597612cfbb..bd889af8166afb458232e337eef884896de392e9 100644 (file)
--- 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 01055ae59a3b04970f537c54559823b2e118cd1c..31f2ce6aed3471a06196b8c1bc52c0d7ec899943 100644 (file)
--- 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 f09fb19fb8990c0a001919c0a78feac73880a9a1..ed57d43aebdf0c4d106ae708fd7abc84d0c76f83 100644 (file)
--- 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 52640684054029eaba9b59d7499b60cf303ce37c..b67153300651a41bf789def7ec041e0720d564b8 100644 (file)
--- 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"
 \f
 struct cris_sim_mmapped_page {
   USI addr;