* arch.c, arch.h, cpuall.h: New files.

	* arch-defs.h: Deleted.
	* mloop.in: Renamed from mainloop.in.
	* sem.c: Renamed from semantics.c.
	* Makefile.in: Update.
	* sem-ops.h: Deleted.
	* mem-ops.h: Deleted.
start-sanitize-cygnus
	Add cgen support for generating files.
end-sanitize-cygnus
	(arch): Renamed from CPU.
	* decode.c: Redone.
	* decode.h: Redone.
	* extract.c: Redone.
	* model.c: Redone.
	* sem-switch.c: Redone.
	* sem.c: Renamed from semantics.c, and redone.
	* m32r-sim.h (PROFILE_COUNT_FILLNOPS): Update.
	(GETTWI,SETTWI,BRANCH_NEW_PC): Define.
	* m32r.c (WANT_CPU,WANT_CPU_M32R): Define.
	(m32r_{fetch,store}_register): New functions.
	(model_mark_{get,set}_h_gr): Prefix with m32r_.
	(m32r_model_mark_{busy,unbusy}_reg): Prefix with m32r_.
	(h_cr_{get,set}): Prefix with m32r_.
	(do_trap): Fetch state from current_cpu, not current_state.
	Call sim_engine_halt instead of engine_halt.
	* sim-if.c (alloc_cpu): New function.
	(free_state): New function.
	(sim_open): Call sim_state_alloc, and malloc space for selected cpu
	type.  Call sim_analyze_program.
	(sim_create_inferior): Handle selected cpu type when setting PC.
start-sanitize-m32rx
	(sim_resume): Handle m32rx.
end-sanitize-m32rx
	(sim_stop_reason): Deleted.
	(print_m32r_misc_cpu): Update.
start-sanitize-m32rx
	(sim_{fetch,store}_register): Handle m32rx.
end-sanitize-m32rx
	(sim_{read,write}): Deleted.
	(sim_engine_illegal_insn): New function.
	* sim-main.h: Don't include arch-defs.h,sim-core.h,sim-events.h.
	Include arch.h,cpuall.h.  Include cpu.h,decode.h if m32r.
start-sanitize-m32rx
	Include cpux.h,decodex.h if m32rx.
end-sanitize-m32rx
	(_sim_cpu): Include member appropriate cpu_data member for the cpu.
	(M32R_MISC_PROFILE): Renamed from M32R_PROFILE.
	(sim_state): Delete members core,events,halt_jmp_buf.
	Change `cpu' member to be a pointer to the cpu's struct, rather than
	record inside the state struct.
	* tconfig.in (WITH_DEVICES): Define here.
	(WITH_FAST,WITH_SEM_SWITCH_{FULL,FAST}): Define for the cpu.

1 files changed, 61 insertions, 5 deletions

diff --git a/sim/m32r/.Sanitize b/sim/m32r/.Sanitize
index 7ea15d9..0d5aef1 100644
--- a/sim/m32r/.Sanitize
+++ b/sim/m32r/.Sanitize
@@ -28,21 +28,21 @@ ChangeLog
 Makefile.in
 README
 TODO
-arch-defs.h
+arch.c
+arch.h
 config.in
 configure
 configure.in
+cpuall.h
 decode.c
 decode.h
 extract.c
 m32r-sim.h
 m32r.c
-mainloop.in
-mem-ops.h
+mloop.in
 model.c
-sem-ops.h
 sem-switch.c
-semantics.c
+sem.c
 sim-if.c
 sim-main.h
 tconfig.in
@@ -51,4 +51,60 @@ Things-to-lose:
 
 Do-last:
 
+cygnus_files="ChangeLog Makefile.in"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+        for i in $cygnus_files ; do
+                if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping cygnus stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in $cygnus_files ; do
+                if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"cygnus\" from $i...
+                        fi
+                        cp $i new
+                        sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
+                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                                if [ -n "${verbose}" ] ; then
+                                        echo Caching $i in .Recover...
+                                fi
+                                mv $i .Recover
+                        fi
+                        mv new $i
+                fi
+        done
+fi
+
+m32rx_files="ChangeLog Makefile.in sim-if.c sim-main.h"
+if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
+        for i in $m32rx_files ; do
+                if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping m32rx stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in $m32rx_files ; do
+                if test ! -d $i && (grep sanitize-m32rx $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"m32rx\" from $i...
+                        fi
+                        cp $i new
+                        sed '/start\-sanitize\-m32rx/,/end-\sanitize\-m32rx/d' < $i > new
+                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                                if [ -n "${verbose}" ] ; then
+                                        echo Caching $i in .Recover...
+                                fi
+                                mv $i .Recover
+                        fi
+                        mv new $i
+                fi
+        done
+fi
+
 # End of file.