* 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.
This commit is contained in:
Hans-Peter Nilsson 2005-03-24 06:12:42 +00:00
parent cc27e1dc44
commit cce0efb55e
21 changed files with 39 additions and 25 deletions

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 },

View File

@ -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[];

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;