* cgen-sim.h (DECODE): Always use switch for `read' for now.

	* cgen.sh (decode): Add s/@arch@/$arch/.
	* genmloop.sh (@cpu@_engine_run): Delete `current_state'.
	(engine_resume): Likewise.  Make `engine' volatile.  Save copy
	of cpu pointer in volatile object.  Initialize read switch if
	-parallel.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c71335188098f7201c13a0b189b15279f5381a62..2ce4d418fd9937499e21720be9f09441b1740501 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,8 +1,11 @@
 Mon Feb  9 14:48:37 1998  Doug Evans  <devans@canuck.cygnus.com>
 
+       * cgen-sim.h (DECODE): Always use switch for `read' for now.
+       * cgen.sh (decode): Add s/@arch@/$arch/.
        * genmloop.sh (@cpu@_engine_run): Delete `current_state'.
        (engine_resume): Likewise.  Make `engine' volatile.  Save copy
-       of cpu pointer in volatile object.
+       of cpu pointer in volatile object.  Initialize read switch if
+       -parallel.
 
 Thu Feb  5 13:27:04 1998  Doug Evans  <devans@seba.cygnus.com>
 

diff --git a/sim/common/cgen-sim.h b/sim/common/cgen-sim.h
index 71e41dfa127570833ecd6fbda2e67a3ad59c46c3..d6c405a54cf0eb9959e237abaaad4cf8c0f9f687 100644 (file)
--- a/sim/common/cgen-sim.h
+++ b/sim/common/cgen-sim.h
@@ -48,6 +48,7 @@ typedef struct parallel_exec PARALLEL_EXEC;
 
 /* Types of the machine generated extract and semantic fns.  */
 typedef void (EXTRACT_FN) (SIM_CPU *, PCADDR, insn_t, ARGBUF *);
+/* ??? READ_FN isn't currently used anywhere, we always use a switch.  */
 typedef void (READ_FN) (SIM_CPU *, PCADDR, insn_t, PARALLEL_EXEC *);
 /*typedef CIA (SEMANTIC_FN) (SEM_ARG);*/
 typedef PCADDR (SEMANTIC_FN) (SIM_CPU *, ARGBUF *);
@@ -62,20 +63,13 @@ typedef struct {
   const struct cgen_insn *opcode;
   EXTRACT_FN *extract;
 #ifdef HAVE_PARALLEL_EXEC
-#ifdef USE_READ_SWITCH
 #ifdef __GNUC__
   void *read;
 #else
   int read;
 #endif
-#else
-  READ_FN *read;
-#endif
 #endif
   SEMANTIC_FN *semantic;
-#if 0 /* wip */
-  EXTRACT_CACHE_FN *extract_fast;
-#endif
   SEMANTIC_CACHE_FN *semantic_fast;
 #if WITH_SEM_SWITCH_FULL && defined (__GNUC__)
   /* Set at runtime.  */