* Make-common.in (SCHEME,SCHEMEFLAGS): Delete.

	(CGENDIR,CGEN): New variables.
	(CGEN_VERBOSE): Renamed to CGENFLAGS.
	(cgen-arch,cgen-cpu,cgen-decode): Update.
	(CGEN_CPU_WRITE): New variable.
	(CGEN_CPU_SEMSW): -W -> -X.
	(CGEN_FLAGS_TO_PASS): Delete SCHEME.  Add CGEN,CGENFLAGS.
	* cgen.sh: Delete args scheme,schemeflags.  New arg cgen.

	* cgen-sim.h (RECORD_IADDR): Delete.
	* cgen-types.h (HOSTINT,HOSTUINT,HOSTPTR): New types.
	* genmloop.sh (engine_resume_{full,fast}): Delete icount.

3 files changed, 66 insertions, 70 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 98e7362..a2403fe 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,23 @@
+Wed Jul  1 16:44:12 1998  Doug Evans  <devans@seba.cygnus.com>
+
+	* Make-common.in (SCHEME,SCHEMEFLAGS): Delete.
+	(CGENDIR,CGEN): New variables.
+	(CGEN_VERBOSE): Renamed to CGENFLAGS.
+	(cgen-arch,cgen-cpu,cgen-decode): Update.
+	(CGEN_CPU_WRITE): New variable.
+	(CGEN_CPU_SEMSW): -W -> -X.
+	(CGEN_FLAGS_TO_PASS): Delete SCHEME.  Add CGEN,CGENFLAGS.
+	* cgen.sh: Delete args scheme,schemeflags.  New arg cgen.
+
+	* cgen-sim.h (RECORD_IADDR): Delete.
+	* cgen-types.h (HOSTINT,HOSTUINT,HOSTPTR): New types.
+	* genmloop.sh (engine_resume_{full,fast}): Delete icount.
+
+Wed Jun 17 12:25:08 1998  Mark Alexander  <marka@cygnus.com>
+
+	* gennltvals.def (mn10200): Add entry.
+	* nltvals.def: Regenerate with MN10200 additions.
+
 Wed Jun 17 13:18:28 1998  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* sim-inline.h (EXTERN_*): Replace with EXTERN_*_P. Correct
diff --git a/sim/common/cgen-sim.h b/sim/common/cgen-sim.h
index 3fb84b0..950be55 100644
--- a/sim/common/cgen-sim.h
+++ b/sim/common/cgen-sim.h
@@ -39,10 +39,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 /* Execution support.  */
 
-/* Forward decls.  Defined in the machine generated arch.h and cpu.h files.  */
+/* Forward decls.  Defined in the machine generated files.  */
 typedef struct argbuf ARGBUF;
 typedef struct scache SCACHE;
 typedef struct parexec PAREXEC;
+typedef struct idesc IDESC;
 
 #ifdef SCACHE_P
 
@@ -64,7 +65,7 @@ typedef ARGBUF *SEM_ARG;
 
 #endif /* ! SCACHE_P */
 
-/* Semantic functions come in two versions on two axis:
+/* Semantic functions come in two versions on two axes:
    fast and full (featured), and using or not using scache.
    A full featured simulator is always provided.  --enable-sim-fast includes
    support for fast execution by duplicating the semantic code but leaving
@@ -89,32 +90,6 @@ typedef CIA (SEMANTIC_FN) (SIM_CPU *, ARGBUF *);
 #endif
 #endif
 
-/* DECODE struct, there is one per instruction.  */
-
-typedef struct {
-  /* Using cgen_insn_type requires <cpu>-opc.h.  */
-  int /*enum cgen_insn_type*/ insn_type;
-  const struct cgen_insn *opcode;
-  EXTRACT_FN *extract;
-#ifdef HAVE_PARALLEL_EXEC
-#ifdef __GNUC__
-  void *read;
-#else
-  int read;
-#endif
-#endif
-  SEMANTIC_FN *semantic;
-  SEMANTIC_FN *semantic_fast;
-#if WITH_SEM_SWITCH_FULL && defined (__GNUC__)
-  /* Set at runtime.  */
-  void *sem_full_lab;
-#endif
-#if WITH_SEM_SWITCH_FAST && defined (__GNUC__)
-  /* Set at runtime.  */
-  void *semantic_lab; /* FIXME: Rename to sem_fast_lab.  */
-#endif
-} DECODE;
-
 /* Scache data for each cpu.  */
 
 typedef struct cpu_scache {
@@ -199,18 +174,10 @@ do { \
 
 #define CIA_ADDR(cia) (cia)
 
-/* extract.c support */
-/* scache_unset is a cache entry that is never used.
-   It's raison d'etre is so BRANCH_VIA_CACHE doesn't have to test for
-   newval.cache == NULL.  */
-extern struct scache scache_unset;
-#define RECORD_IADDR(fld, val) \
-do { (fld) = (val); } while (0)
-
 /* semantics.c support */
 #define SEM_ARGBUF(sem_arg) (&(sem_arg) -> argbuf)
 #define SEM_INSN(sem_arg) shouldnt_be_used
-#define SEM_NEXT_PC(sc) ((sc) -> next)
+#define SEM_NEXT_PC(sc, len) ((sc) -> next)
 #define SEM_BRANCH_VIA_CACHE(sc, newval) (newval)
 #define SEM_BRANCH_VIA_ADDR(sc, newval) (newval)
 /* Return address a branch insn will branch to.
@@ -221,14 +188,11 @@ do { (fld) = (val); } while (0)
 
 #define CIA_ADDR(cia) (cia)
 
-/* extract.c support */
-#define RECORD_IADDR(fld, val) \
-do { (fld) = (val); } while (0)
-
 /* semantics.c support */
 #define SEM_ARGBUF(sem_arg) (sem_arg)
 #define SEM_INSN(sem_arg) (SEM_ARGBUF (sem_arg) -> insn)
-#define SEM_NEXT_PC(abuf) (abuf -> addr + abuf -> length)
+/* FIXME:wip */
+#define SEM_NEXT_PC(abuf, len) (abuf -> addr + abuf -> length)
 #define SEM_BRANCH_VIA_CACHE(abuf, newval) (newval)
 #define SEM_BRANCH_VIA_ADDR(abuf, newval) (newval)
 #define SEM_NEW_PC_ADDR(new_pc) (new_pc)
@@ -288,10 +252,28 @@ typedef struct cgen_state {
    The member's name must be `cgen_cpu'.  */
 
 typedef struct {
-  /* Simulator's execution cache.  */
-#if WITH_SCACHE
+  /* Simulator's execution cache.
+     Allocate space for this even if not used as some simulators may have
+     one machine variant that uses the scache and another that doesn't and
+     we don't want members in this struct to move about.  */
   CPU_SCACHE scache;
-#endif /* WITH_SCACHE */
+
+  /* Instruction descriptor table.  */
+  IDESC *idesc;
+#define CPU_IDESC(cpu) ((cpu)->cgen_cpu.idesc)
+
+  /* Whether the read,semantic entries have been initialized or not.
+     These are computed goto labels.  */
+  int idesc_read_init_p;
+#define CPU_IDESC_READ_INIT_P(cpu) ((cpu)->cgen_cpu.idesc_read_init_p)
+  int idesc_sem_init_p;
+#define CPU_IDESC_SEM_INIT_P(cpu) ((cpu)->cgen_cpu.idesc_sem_init_p)
+
+  /* Function to fetch the opcode table entry in the IDESC.  */
+  const CGEN_INSN * (*opcode) (SIM_CPU *, int);
+#define CPU_OPCODE(cpu) ((cpu)->cgen_cpu.opcode)
+  /* Return name of instruction numbered INUM.  */
+#define INSN_NAME(cpu, inum) CGEN_INSN_NAME ((* CPU_OPCODE (cpu)) ((cpu), (inum)))
 
   /* Allow slop in size calcs for case where multiple cpu types are supported
      and space for the specified cpu is malloc'd at run time.  */
@@ -301,10 +283,13 @@ typedef struct {
 /* Various utilities.  */
 
 /* Called after sim_post_argv_init to do any cgen initialization.  */
-void cgen_init (SIM_DESC);
+extern void cgen_init (SIM_DESC);
+
+/* Return the maximum number of extra bytes required for a sim_cpu struct.  */
+extern int cgen_cpu_max_extra_bytes (void);
 
-void
-sim_disassemble_insn (SIM_CPU *, const struct cgen_insn *,
+extern void
+sim_disassemble_insn (SIM_CPU *, const CGEN_INSN *,
 		      const struct argbuf *, PCADDR, char *);
 
 #endif /* CGEN_SIM_H */
diff --git a/sim/common/genmloop.sh b/sim/common/genmloop.sh
index d3c18d9..a66f1bb 100644
--- a/sim/common/genmloop.sh
+++ b/sim/common/genmloop.sh
@@ -92,15 +92,15 @@ cat <<EOF
 #include "cpu-sim.h"
 #include "sim-assert.h"
 
-/* Tell sim_main_loop to use the cache if it's active.
+/* Tell sim_main_loop to use the scache if it's active.
    Collecting profile data and tracing slow us down so we don't do them in
    "fast mode".
    There are 2 possibilities on 2 axes:
-   - use or don't use the cache
+   - use or don't use the scache
    - run normally (full featured) or run fast
    Supporting all four possibilities in one executable is a bit much but
    supporting full/fast seems reasonable.
-   If the cache is configured in it is always used.
+   If the scache is configured in it is always used.
    ??? Need to see whether it speeds up profiling significantly or not.
    Speeding up tracing doesn't seem worth it.
    ??? Sometimes supporting more than one set of semantic functions will make
@@ -263,7 +263,6 @@ engine_resume_full (SIM_DESC sd)
   /* current_{state,cpu} exist for the generated code to use.  */
   SIM_DESC current_state = sd;
   sim_cpu *current_cpu = STATE_CPU (sd, 0);
-${parallel+  int icount = 0;}
 
 EOF
 
@@ -276,13 +275,12 @@ cat << EOF
 
 #if defined (HAVE_PARALLEL_EXEC) && defined (__GNUC__)
   {
-    static read_init_p = 0;
-    if (! read_init_p)
+    if (! CPU_IDESC_READ_INIT_P (current_cpu))
       {
 /* ??? Later maybe paste read.c in when building mainloop.c.  */
 #define DEFINE_LABELS
 #include "readx.c"
-	read_init_p = 1;
+	CPU_IDESC_READ_INIT_P (current_cpu) = 1;
       }
   }
 #endif
@@ -362,7 +360,6 @@ engine_resume_full (SIM_DESC sd)
   sim_cpu *current_cpu = STATE_CPU (sd, 0);
   SCACHE cache[MAX_LIW_INSNS];
   SCACHE *sc = &cache[0];
-${parallel+  int icount = 0;}
 
 EOF
 
@@ -375,13 +372,12 @@ cat << EOF
 
 #if defined (HAVE_PARALLEL_EXEC) && defined (__GNUC__)
   {
-    static read_init_p = 0;
-    if (! read_init_p)
+    if (! CPU_IDESC_READ_INIT_P (current_cpu))
       {
 /* ??? Later maybe paste read.c in when building mainloop.c.  */
 #define DEFINE_LABELS
 #include "readx.c"
-	read_init_p = 1;
+	CPU_IDESC_READ_INIT_P (current_cpu) = 1;
       }
   }
 #endif
@@ -432,7 +428,6 @@ engine_resume_fast (SIM_DESC sd)
 #define FAST_P 1
   SIM_DESC current_state = sd;
   sim_cpu *current_cpu = STATE_CPU (sd, 0);
-${parallel+  int icount = 0;}
 
 EOF
 
@@ -445,13 +440,12 @@ cat << EOF
 
 #if defined (HAVE_PARALLEL_EXEC) && defined (__GNUC__)
   {
-    static read_init_p = 0;
-    if (! read_init_p)
+    if (! CPU_IDESC_READ_INIT_P (current_cpu))
       {
 /* ??? Later maybe paste read.c in when building mainloop.c.  */
 #define DEFINE_LABELS
 #include "readx.c"
-	read_init_p = 1;
+	CPU_IDESC_READ_INIT_P (current_cpu) = 1;
       }
   }
 #endif
@@ -463,13 +457,12 @@ cat <<EOF
 
 #if defined (WITH_SEM_SWITCH_FAST) && defined (__GNUC__)
   {
-    static decode_init_p = 0;
-    if (! decode_init_p)
+    if (! CPU_IDESC_SEM_INIT_P (current_cpu))
       {
 /* ??? Later maybe paste sem-switch.c in when building mainloop.c.  */
 #define DEFINE_LABELS
 #include "sem-switch.c"
-	decode_init_p = 1;
+	CPU_IDESC_SEM_INIT_P (current_cpu) = 1;
       }
   }
 #endif
@@ -531,7 +524,6 @@ engine_resume_fast (SIM_DESC sd)
   sim_cpu *current_cpu = STATE_CPU (sd, 0);
   SCACHE cache[MAX_LIW_INSNS];
   SCACHE *sc = &cache[0];
-${parallel+  int icount = 0;}
 
 EOF
 
@@ -544,13 +536,12 @@ cat << EOF
 
 #if defined (HAVE_PARALLEL_EXEC) && defined (__GNUC__)
   {
-    static read_init_p = 0;
-    if (! read_init_p)
+    if (! CPU_IDESC_READ_INIT_P (current_cpu))
       {
 /* ??? Later maybe paste read.c in when building mainloop.c.  */
 #define DEFINE_LABELS
 #include "readx.c"
-	read_init_p = 1;
+	CPU_IDESC_READ_INIT_P (current_cpu) = 1;
       }
   }
 #endif