From 52ba01a6d0a345b48e6a65ee6669f385466415aa Mon Sep 17 00:00:00 2001 From: David Carlton Date: Fri, 23 May 2003 18:40:58 +0000 Subject: 2003-05-23 David Carlton * Merge with mainline; tag is carlton_dictionary-20030523-merge. --- sim/d10v/ChangeLog | 12 +++++ sim/d10v/interp.c | 42 +++++++++-------- sim/igen/ChangeLog | 4 ++ sim/igen/compare_igen_models | 2 +- sim/mips/ChangeLog | 14 ++++++ sim/mips/Makefile.in | 106 ++++++++++++++++++++++--------------------- sim/mips/cp1.c | 7 +-- sim/mips/cp1.h | 3 +- sim/mips/mdmx.c | 3 +- sim/mips/mdmx.igen | 3 +- sim/mips/mips3d.igen | 3 +- sim/mips/sb1.igen | 3 +- sim/ppc/ChangeLog | 5 ++ sim/ppc/Makefile.in | 42 ++++++++--------- sim/testsuite/ChangeLog | 4 ++ sim/v850/ChangeLog | 5 ++ sim/v850/Makefile.in | 32 +++++++------ 17 files changed, 175 insertions(+), 115 deletions(-) (limited to 'sim') diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 54d84e6..3256284 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,15 @@ +2003-05-07 Andrew Cagney + + * interp.c (sim_d10v_translate_addr): Add "regcache" parameter. + (sim_d10v_translate_imap_addr): Ditto. + (sim_d10v_translate_dmap_addr): Ditto. + (xfer_mem): Pass NULL regcache to sim_d10v_translate_addr. + (dmem_addr): Pass NULL regcache to sim_d10v_translate_dmap_addr. + (dmap_register, imap_register): Add "regcache" parameter. + (imem_addr): Pass NULL regcache to sim_d10v_translate_imap_addr. + (sim_fetch_register): Pass NULL regcache to imap_register and + dmap_register. + 2003-02-27 Andrew Cagney * interp.c (sim_open, sim_create_inferior): Rename _bfd to bfd. diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 718acca..30239ab 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -363,7 +363,7 @@ set_dmap_register (int reg_nr, unsigned long value) } static unsigned long -dmap_register (int reg_nr) +dmap_register (void *regcache, int reg_nr) { uint8 *raw = map_memory (SIM_D10V_MEMORY_DATA + DMAP0_OFFSET + 2 * reg_nr); @@ -386,7 +386,7 @@ set_imap_register (int reg_nr, unsigned long value) } static unsigned long -imap_register (int reg_nr) +imap_register (void *regcache, int reg_nr) { uint8 *raw = map_memory (SIM_D10V_MEMORY_DATA + IMAP0_OFFSET + 2 * reg_nr); @@ -440,7 +440,9 @@ unsigned long sim_d10v_translate_dmap_addr (unsigned long offset, int nr_bytes, unsigned long *phys, - unsigned long (*dmap_register) (int reg_nr)) + void *regcache, + unsigned long (*dmap_register) (void *regcache, + int reg_nr)) { short map; int regno; @@ -457,7 +459,7 @@ sim_d10v_translate_dmap_addr (unsigned long offset, /* Don't cross a BLOCK boundary */ nr_bytes = DMAP_BLOCK_SIZE - (offset % DMAP_BLOCK_SIZE); } - map = dmap_register (regno); + map = dmap_register (regcache, regno); if (regno == 3) { /* Always maps to data memory */ @@ -498,7 +500,9 @@ unsigned long sim_d10v_translate_imap_addr (unsigned long offset, int nr_bytes, unsigned long *phys, - unsigned long (*imap_register) (int reg_nr)) + void *regcache, + unsigned long (*imap_register) (void *regcache, + int reg_nr)) { short map; int regno; @@ -517,7 +521,7 @@ sim_d10v_translate_imap_addr (unsigned long offset, /* Don't cross a BLOCK boundary */ nr_bytes = IMAP_BLOCK_SIZE - offset; } - map = imap_register (regno); + map = imap_register (regcache, regno); sp = (map & 0x3000) >> 12; segno = (map & 0x007f); switch (sp) @@ -549,8 +553,11 @@ unsigned long sim_d10v_translate_addr (unsigned long memaddr, int nr_bytes, unsigned long *targ_addr, - unsigned long (*dmap_register) (int reg_nr), - unsigned long (*imap_register) (int reg_nr)) + void *regcache, + unsigned long (*dmap_register) (void *regcache, + int reg_nr), + unsigned long (*imap_register) (void *regcache, + int reg_nr)) { unsigned long phys; unsigned long seg; @@ -614,12 +621,12 @@ sim_d10v_translate_addr (unsigned long memaddr, break; case 0x10: /* in logical data address segment */ - nr_bytes = sim_d10v_translate_dmap_addr (off, nr_bytes, &phys, + nr_bytes = sim_d10v_translate_dmap_addr (off, nr_bytes, &phys, regcache, dmap_register); break; case 0x11: /* in logical instruction address segment */ - nr_bytes = sim_d10v_translate_imap_addr (off, nr_bytes, &phys, + nr_bytes = sim_d10v_translate_imap_addr (off, nr_bytes, &phys, regcache, imap_register); break; @@ -720,10 +727,8 @@ xfer_mem (SIM_ADDR virt, uint8 *memory; unsigned long phys; int phys_size; - phys_size = sim_d10v_translate_addr (virt, size, - &phys, - dmap_register, - imap_register); + phys_size = sim_d10v_translate_addr (virt, size, &phys, NULL, + dmap_register, imap_register); if (phys_size == 0) return xfered; @@ -892,7 +897,7 @@ dmem_addr (uint16 offset) things like ``0xfffe + 0x0e60 == 0x10e5d''. Since offset's type is uint16 this is modulo'ed onto 0x0e5d. */ - phys_size = sim_d10v_translate_dmap_addr (offset, 1, &phys, + phys_size = sim_d10v_translate_dmap_addr (offset, 1, &phys, NULL, dmap_register); if (phys_size == 0) { @@ -919,7 +924,8 @@ imem_addr (uint32 offset) { unsigned long phys; uint8 *mem; - int phys_size = sim_d10v_translate_imap_addr (offset, 1, &phys, imap_register); + int phys_size = sim_d10v_translate_imap_addr (offset, 1, &phys, NULL, + imap_register); if (phys_size == 0) { return State.mem.fault; @@ -1367,14 +1373,14 @@ sim_fetch_register (sd, rn, memory, length) break; case SIM_D10V_IMAP0_REGNUM: case SIM_D10V_IMAP1_REGNUM: - WRITE_16 (memory, imap_register (rn - SIM_D10V_IMAP0_REGNUM)); + WRITE_16 (memory, imap_register (NULL, rn - SIM_D10V_IMAP0_REGNUM)); size = 2; break; case SIM_D10V_DMAP0_REGNUM: case SIM_D10V_DMAP1_REGNUM: case SIM_D10V_DMAP2_REGNUM: case SIM_D10V_DMAP3_REGNUM: - WRITE_16 (memory, dmap_register (rn - SIM_D10V_DMAP0_REGNUM)); + WRITE_16 (memory, dmap_register (NULL, rn - SIM_D10V_DMAP0_REGNUM)); size = 2; break; case SIM_D10V_TS2_DMAP_REGNUM: diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index b36e4f0..db27cb8 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -1,3 +1,7 @@ +2003-05-03 Chris Demetriou + + * compare_igen_models: Tweak attribution slightly. + 2002-11-22 Andrew Cagney * gen.c (name_cmp): Rename format_name_cmp. diff --git a/sim/igen/compare_igen_models b/sim/igen/compare_igen_models index 3c3e46a..a842be9 100755 --- a/sim/igen/compare_igen_models +++ b/sim/igen/compare_igen_models @@ -2,7 +2,7 @@ # Script to compare functions and instructions used by different igen models. # Copyright (C) 2002 Free Software Foundation, Inc. -# Contributed by Broadcom Corporation (SiByte). +# Contributed by Chris Demetriou of Broadcom Corporation (SiByte). # # This file is part of GDB, the GNU debugger. # diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 2d344b5..4d20a00 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,17 @@ +2003-05-16 Ian Lance Taylor + + * Makefile.in (SHELL): Make sure this is defined. + (various): Use $(SHELL) whenever we invoke move-if-change. + +2003-05-03 Chris Demetriou + + * cp1.c: Tweak attribution slightly. + * cp1.h: Likewise. + * mdmx.c: Likewise. + * mdmx.igen: Likewise. + * mips3d.igen: Likewise. + * sb1.igen: Likewise. + 2003-04-15 Richard Sandiford * vr.igen (do_vr_mul_op): Zero-extend the low 32 bits of diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index b709ce8..9d198a9 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -1,6 +1,8 @@ # Makefile template for Configure for the MIPS simulator. # Written by Cygnus Support. +SHELL = @SHELL@ + ## COMMON_PRE_CONFIG_FRAG srcdir=@srcdir@ @@ -155,21 +157,21 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c + $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c touch tmp-igen semantics.o: sim-main.h semantics.c $(SIM_EXTRA_DEPS) @@ -233,16 +235,16 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n m16_support.h -hf tmp-support.h \ -n m16_support.c -f tmp-support.c \ # - $(srcdir)/../../move-if-change tmp-icache.h m16_icache.h - $(srcdir)/../../move-if-change tmp-icache.c m16_icache.c - $(srcdir)/../../move-if-change tmp-idecode.h m16_idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c m16_idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h m16_semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c m16_semantics.c - $(srcdir)/../../move-if-change tmp-model.h m16_model.h - $(srcdir)/../../move-if-change tmp-model.c m16_model.c - $(srcdir)/../../move-if-change tmp-support.h m16_support.h - $(srcdir)/../../move-if-change tmp-support.c m16_support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m16_icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m16_icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m16_idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m16_idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h m16_semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c m16_semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m16_model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m16_model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m16_support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m16_support.c ../igen/igen \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -268,16 +270,16 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n m32_support.h -hf tmp-support.h \ -n m32_support.c -f tmp-support.c \ # - $(srcdir)/../../move-if-change tmp-icache.h m32_icache.h - $(srcdir)/../../move-if-change tmp-icache.c m32_icache.c - $(srcdir)/../../move-if-change tmp-idecode.h m32_idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c m32_idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h m32_semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c m32_semantics.c - $(srcdir)/../../move-if-change tmp-model.h m32_model.h - $(srcdir)/../../move-if-change tmp-model.c m32_model.c - $(srcdir)/../../move-if-change tmp-support.h m32_support.h - $(srcdir)/../../move-if-change tmp-support.c m32_support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m32_icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m32_icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m32_idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m32_idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h m32_semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c m32_semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m32_model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m32_model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m32_support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m32_support.c ../igen/igen \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -291,8 +293,8 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c touch tmp-m16 @@ -336,18 +338,18 @@ tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n $${p}_engine.h -he tmp-engine.h \ -n $${p}_engine.c -e tmp-engine.c \ ; \ - $(srcdir)/../../move-if-change tmp-icache.h $${p}_icache.h ; \ - $(srcdir)/../../move-if-change tmp-icache.c $${p}_icache.c ; \ - $(srcdir)/../../move-if-change tmp-idecode.h $${p}_idecode.h ; \ - $(srcdir)/../../move-if-change tmp-idecode.c $${p}_idecode.c ; \ - $(srcdir)/../../move-if-change tmp-semantics.h $${p}_semantics.h ; \ - $(srcdir)/../../move-if-change tmp-semantics.c $${p}_semantics.c ; \ - $(srcdir)/../../move-if-change tmp-model.h $${p}_model.h ; \ - $(srcdir)/../../move-if-change tmp-model.c $${p}_model.c ; \ - $(srcdir)/../../move-if-change tmp-support.h $${p}_support.h ; \ - $(srcdir)/../../move-if-change tmp-support.c $${p}_support.c ; \ - $(srcdir)/../../move-if-change tmp-engine.h $${p}_engine.h ; \ - $(srcdir)/../../move-if-change tmp-engine.c $${p}_engine.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h $${p}_icache.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c $${p}_icache.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h $${p}_idecode.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c $${p}_idecode.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h $${p}_semantics.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c $${p}_semantics.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h $${p}_model.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c $${p}_model.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h $${p}_support.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c $${p}_support.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h $${p}_engine.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c $${p}_engine.c ; \ done touch tmp-mach-multi tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) @@ -365,8 +367,8 @@ tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c touch tmp-itable-multi tmp-run-multi: $(srcdir)/m16run.c for t in $(SIM_MULTI_IGEN_CONFIGS); do \ @@ -377,7 +379,7 @@ tmp-run-multi: $(srcdir)/m16run.c -e "s/^sim_/m16$${m}_/" \ -e "s/m16_/m16$${m}_/" \ -e "s/m32_/m32$${m}_/" ; \ - $(srcdir)/../../move-if-change tmp-run m16$${m}_run.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-run m16$${m}_run.c ; \ esac \ done touch tmp-run-multi diff --git a/sim/mips/cp1.c b/sim/mips/cp1.c index ea0f599..556af1a 100644 --- a/sim/mips/cp1.c +++ b/sim/mips/cp1.c @@ -1,9 +1,10 @@ /*> cp1.c <*/ /* MIPS Simulator FPU (CoProcessor 1) support. Copyright (C) 2002 Free Software Foundation, Inc. - Originally created by Cygnus Solutions, modified substially - by Broadcom Corporation (SiByte). Paired-single operation support - and MIPS-3D support contributed by Broadcom Corporation (SiByte). + Originally created by Cygnus Solutions. Extensive modifications, + including paired-single operation support and MIPS-3D support + contributed by Ed Satterthwaite and Chris Demetriou, of Broadcom + Corporation (SiByte). This file is part of GDB, the GNU debugger. diff --git a/sim/mips/cp1.h b/sim/mips/cp1.h index 24901d8..9a189a9 100644 --- a/sim/mips/cp1.h +++ b/sim/mips/cp1.h @@ -2,7 +2,8 @@ /* MIPS Simulator FPU (CoProcessor 1) definitions. Copyright (C) 1997, 1998, 2002 Free Software Foundation, Inc. Derived from sim-main.h contributed by Cygnus Solutions, - modified substially by Broadcom Corporation (SiByte). + modified substantially by Ed Satterthwaite of Broadcom Corporation + (SiByte). This file is part of GDB, the GNU debugger. diff --git a/sim/mips/mdmx.c b/sim/mips/mdmx.c index 4955e82..3af59b0 100644 --- a/sim/mips/mdmx.c +++ b/sim/mips/mdmx.c @@ -1,6 +1,7 @@ /* Simulation code for the MIPS MDMX ASE. Copyright (C) 2002 Free Software Foundation, Inc. - Contributed by Broadcom Corporation (SiByte). + Contributed by Ed Satterthwaite and Chris Demetriou, of Broadcom + Corporation (SiByte). This file is part of GDB, the GNU debugger. diff --git a/sim/mips/mdmx.igen b/sim/mips/mdmx.igen index f286e3b..d8edcd7 100644 --- a/sim/mips/mdmx.igen +++ b/sim/mips/mdmx.igen @@ -2,7 +2,8 @@ // Simulator definition for the MIPS MDMX ASE. // Copyright (C) 2002 Free Software Foundation, Inc. -// Contributed by Broadcom Corporation (SiByte). +// Contributed by Ed Satterthwaite and Chris Demetriou, of Broadcom +// Corporation (SiByte). // // This file is part of GDB, the GNU debugger. // diff --git a/sim/mips/mips3d.igen b/sim/mips/mips3d.igen index f7043ef..d24a06c 100644 --- a/sim/mips/mips3d.igen +++ b/sim/mips/mips3d.igen @@ -2,7 +2,8 @@ // Simulator definition for the MIPS MIPS-3D ASE. // Copyright (C) 2002 Free Software Foundation, Inc. -// Contributed by Broadcom Corporation (SiByte). +// Contributed by Ed Satterthwaite and Chris Demetriou, of Broadcom +// Corporation (SiByte). // // This file is part of GDB, the GNU debugger. // diff --git a/sim/mips/sb1.igen b/sim/mips/sb1.igen index 6453670..33c5141 100644 --- a/sim/mips/sb1.igen +++ b/sim/mips/sb1.igen @@ -2,7 +2,8 @@ // Simulator definition for the Broadcom SiByte SB-1 CPU extensions. // Copyright (C) 2002 Free Software Foundation, Inc. -// Contributed by Broadcom Corporation (SiByte). +// Contributed by Ed Satterthwaite and Chris Demetriou, of Broadcom +// Corporation (SiByte). // // This file is part of GDB, the GNU debugger. // diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index b625ac9..b7b1de5 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2003-05-16 Ian Lance Taylor + + * Makefile.in (various): Use $(SHELL) whenever we invoke + move-if-change. + 2003-02-27 Andrew Cagney * sim_calls.c (sim_open, sim_create_inferior): Rename _bfd to bfd. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index d69b5c3..0fb8f48 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -413,17 +413,17 @@ gentmap: ../common/gentmap.c Makefile targ-vals.def targ-vals.def: $(srcdir)/../common/nltvals.def rm -f targ-vals.def tmp-def cat $(srcdir)/../common/nltvals.def > tmp-vals.def - $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def + $(SHELL) $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def targ-vals.h: Makefile gentmap $(srcdir)/../../move-if-change rm -f tmp-vals.h ./gentmap -h > tmp-vals.h - $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h + $(SHELL) $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h targ-map.c: Makefile gentmap $(srcdir)/../../move-if-change rm -f tmp-map.c ./gentmap -c > tmp-map.c - $(srcdir)/../../move-if-change tmp-map.c targ-map.c + $(SHELL) $(srcdir)/../../move-if-change tmp-map.c targ-map.c callback.o: ../common/callback.c targ-vals.h config.h $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $< @@ -443,7 +443,7 @@ options.o: options.c $(BASICS_H) $(CPU_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BU tmp-defines: config.h Makefile sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h - $(srcdir)/../../move-if-change tmp-defines.h defines.h + $(SHELL) $(srcdir)/../../move-if-change tmp-defines.h defines.h touch tmp-defines # @@ -459,8 +459,8 @@ tmp-dgen: dgen ppc-spr-table $(srcdir)/../../move-if-change -r $(srcdir)/ppc-spr-table \ -n spreg.h -hp tmp-spreg.h \ -n spreg.c -p tmp-spreg.c - $(srcdir)/../../move-if-change tmp-spreg.h spreg.h - $(srcdir)/../../move-if-change tmp-spreg.c spreg.c + $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.h spreg.h + $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.c spreg.c touch tmp-dgen @@ -481,18 +481,18 @@ tmp-igen: igen ppc-instructions $(IGEN_OPCODE_RULES) ppc-cache-rules $(srcdir)/. -n model.c -m tmp-model.c \ -n support.h -hf tmp-support.h \ -n support.c -f tmp-support.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c touch tmp-igen # NOTE: Some versions of make don't handle files created as side-effects @@ -596,8 +596,8 @@ tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change -e 's/^/ /' \ -e 's/$$/_device_descriptor,/' \ > tmp-hw.c - $(srcdir)/../../move-if-change tmp-hw.h hw.h - $(srcdir)/../../move-if-change tmp-hw.c hw.c + $(SHELL) $(srcdir)/../../move-if-change tmp-hw.h hw.h + $(SHELL) $(srcdir)/../../move-if-change tmp-hw.c hw.c touch tmp-hw hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H) $(CPU_H) @@ -635,7 +635,7 @@ tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change -e 's/^/extern package_create_instance_callback pk_/' \ -e 's/$$/_create_instance;/' \ > tmp-pk.h - $(srcdir)/../../move-if-change tmp-pk.h pk.h + $(SHELL) $(srcdir)/../../move-if-change tmp-pk.h pk.h touch tmp-pk pk_disklabel.o: pk.h $(DEVICE_TABLE_H) diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 4023d28..c88c159 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-04-13 Michael Snyder + + * sim/h8300: New directory. Tests for Renesas h8/300 family. + 2003-04-01 Nick Clifton * sim/arm: New directory: Tests for ARM simulator. diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 7d1075c..78fe7e2 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,8 @@ +2003-05-16 Ian Lance Taylor + + * Makefile.in (SHELL): Make sure this is defined. + (tmp-igen): Use $(SHELL) whenever we invoke move-if-change. + 2003-04-06 Nick Clifton * simops.c (OP_40): Delete. Move code to... diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in index 89029d6..f2ddd56 100644 --- a/sim/v850/Makefile.in +++ b/sim/v850/Makefile.in @@ -16,6 +16,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +SHELL = @SHELL@ + ## COMMON_PRE_CONFIG_FRAG SIM_OBJS = \ @@ -101,21 +103,21 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c + $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c touch tmp-igen clean-extra: clean-igen -- cgit v1.1