* Make-common.in (CGEN_INCLUDE_DEPS): Add cgen-defs.h, cgen-engine.h.

	(CGEN_MAIN_SCM): Add rtx-funcs.scm.
	(cgen-arch): Pass $(mach) to cgen.sh.
	* cgen-engine.h (SEM_BRANCH_FINI): New arg pcvar, all uses updated.
	(SEM_BRANCH_INIT_EXTRACT): New macro.
	(SEM_BRANCH_INIT): Add taken_p.
	(TARGET_SEM_BRANCH_FINI): Provide default definition.
	(SEM_BRANCH_FINI): Use it.
	(SEM_INSN): Update.
	* cgen-run.c (sim_resume): Handle tracing of last insn.
	* cgen-scache.h (WITH_SCACHE): Define as 0 if not defined.
	* cgen-trace.c (current_abuf): New static global.
	(trace_insn_init): Initialize it.
	(trace_insn_fini): Use it.
	(trace_insn): Set it.
	* cgen.sh (arch case): Pass -m ${mach} to cgen.
	* genmloop.sh (@cpu@_emit_before): Only define if WITH_SCACHE_PBB.
	(@cpu@_emit_after): Ditto.
	(simple @cpu@_engine_run_full): New local `pc'.  Initialize semantic
	labels if WITH_SEM_SWITCH_FULL.
	* sim-model.c: Include bfd.h.
	(sim_model_init): New function.
	(sim_model_install): Record init fn.
	* sim-model.h (MACH): New member bfd_name.
	* sim-module.c (modules): Initialize model before scache.

1 files changed, 105 insertions, 51 deletions

diff --git a/sim/common/cgen-scache.h b/sim/common/cgen-scache.h
index 9cb2a5f..e422859 100644
--- a/sim/common/cgen-scache.h
+++ b/sim/common/cgen-scache.h
@@ -1,6 +1,6 @@
-/* Simulator cache definitions for CGEN simulators (and maybe others).
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
+/* Simulator header for cgen scache support.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   Contributed by Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
 
@@ -18,62 +18,94 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifndef SCACHE_H
-#define SCACHE_H
+#ifndef CGEN_SCACHE_H
+#define CGEN_SCACHE_H
 
-/* A cached insn.  */
-typedef struct scache {
-  IADDR next;
-  union {
-#ifdef USE_SEM_SWITCH
-#ifdef __GNUC__
-    void *sem_case;
-#else
-    int sem_case;
-#endif
+#ifndef WITH_SCACHE
+#define WITH_SCACHE 0
 #endif
-    SEMANTIC_CACHE_FN *sem_fn;
-  } semantic;
-  ARGBUF argbuf;
-} SCACHE;
 
-/* Scache data for each cpu.  */
+/* When caching bb's, instructions are extracted into "chains".
+   SCACHE_MAP is a hash table into these chains.  */
+
+typedef struct {
+  PCADDR pc;
+  SCACHE *sc;
+} SCACHE_MAP;
 
 typedef struct cpu_scache {
-  /* Simulator cache size.  */
-  int size;
-#define CPU_SCACHE_SIZE(cpu) ((cpu)->cgen_cpu.scache.size)
-  /* Cache.  */
+  /* Simulator cache size.  Must be a power of 2.
+     This is the number of elements in the `cache' member.  */
+  unsigned int size;
+#define CPU_SCACHE_SIZE(cpu) ((cpu) -> cgen_cpu.scache.size)
+  /* The cache.  */
   SCACHE *cache;
-#define CPU_SCACHE_CACHE(cpu) ((cpu)->cgen_cpu.scache.cache)
-#if 0 /* FIXME: wip */
-  /* Free list.  */
-  SCACHE *free;
-#define CPU_SCACHE_FREE(cpu) ((cpu)->cgen_cpu.scache.free)
-  /* Hash table.  */
-  SCACHE **hash_table;
-#define CPU_SCACHE_HASH_TABLE(cpu) ((cpu)->cgen_cpu.scache.hash_table)
-#endif
+#define CPU_SCACHE_CACHE(cpu) ((cpu) -> cgen_cpu.scache.cache)
+
+#if WITH_SCACHE_PBB
+  /* Number of hash chains.  Must be a power of 2.  */
+  unsigned int num_hash_chains;
+#define CPU_SCACHE_NUM_HASH_CHAINS(cpu) ((cpu) -> cgen_cpu.scache.num_hash_chains)
+  /* Number of entries in each hash chain.
+     The hash table is a statically allocated NxM array where
+     N = num_hash_chains
+     M = num_hash_chain_entries.  */
+  unsigned int num_hash_chain_entries;
+#define CPU_SCACHE_NUM_HASH_CHAIN_ENTRIES(cpu) ((cpu) -> cgen_cpu.scache.num_hash_chain_entries)
+  /* Maximum number of instructions in a chain.
+     ??? This just let's us set a static size of chain_lengths table.
+     In a simulation that handles more than just the cpu, this might also be
+     used to keep too many instructions from being executed before checking
+     for events (or some such).  */
+  unsigned int max_chain_length;
+#define CPU_SCACHE_MAX_CHAIN_LENGTH(cpu) ((cpu) -> cgen_cpu.scache.max_chain_length)
+  /* Special scache entry for (re)starting bb extraction.  */
+  SCACHE *pbb_begin;
+#define CPU_SCACHE_PBB_BEGIN(cpu) ((cpu) -> cgen_cpu.scache.pbb_begin)
+  /* Hash table into cached chains.  */
+  SCACHE_MAP *hash_table;
+#define CPU_SCACHE_HASH_TABLE(cpu) ((cpu) -> cgen_cpu.scache.hash_table)
+  /* Next free entry in cache.  */
+  SCACHE *next_free;
+#define CPU_SCACHE_NEXT_FREE(cpu) ((cpu) -> cgen_cpu.scache.next_free)
+
+  /* Address of cti-chain insn, only used by functional semantics,
+     not switch form.  */
+  SCACHE **pbb_br_npc_ptr;
+#define CPU_PBB_BR_NPC_PTR(cpu) ((cpu) -> cgen_cpu.scache.pbb_br_npc_ptr)
+  /* Target's branch address.  */
+  PCADDR pbb_br_npc;
+#define CPU_PBB_BR_NPC(cpu) ((cpu) -> cgen_cpu.scache.pbb_br_npc)
+#endif /* WITH_SCACHE_PBB */
 
 #if WITH_PROFILE_SCACHE_P
   /* Cache hits, misses.  */
   unsigned long hits, misses;
-#define CPU_SCACHE_HITS(cpu) ((cpu)->cgen_cpu.scache.hits)
-#define CPU_SCACHE_MISSES(cpu) ((cpu)->cgen_cpu.scache.misses)
+#define CPU_SCACHE_HITS(cpu) ((cpu) -> cgen_cpu.scache.hits)
+#define CPU_SCACHE_MISSES(cpu) ((cpu) -> cgen_cpu.scache.misses)
+
+#if WITH_SCACHE_PBB
+  /* Chain length counts.
+     Each element is a count of the number of chains created with that
+     length.  */
+  unsigned long *chain_lengths;
+#define CPU_SCACHE_CHAIN_LENGTHS(cpu) ((cpu) -> cgen_cpu.scache.chain_lengths)
+  /* Number of times cache was flushed due to its being full.  */
+  unsigned long full_flushes;
+#define CPU_SCACHE_FULL_FLUSHES(cpu) ((cpu) -> cgen_cpu.scache.full_flushes)
 #endif
-} CPU_SCACHE;
-
-/* Default number of cached blocks.  */
-#ifdef CONFIG_SIM_CACHE_SIZE
-#define SCACHE_DEFAULT_CACHE_SIZE CONFIG_SIM_CACHE_SIZE
-#else
-#define SCACHE_DEFAULT_CACHE_SIZE 1024
 #endif
+} CPU_SCACHE;
 
-/* Hash a PC value.  */
-/* FIXME: cpu specific */
-#define SCACHE_HASH_PC(state, pc) \
-(((pc) >> 1) & (STATE_SCACHE_SIZE (sd) - 1))
+/* Hash a PC value.
+   This is split into two parts to help with moving as much of the
+   computation out of the main loop.  */
+#define CPU_SCACHE_HASH_MASK(cpu) (CPU_SCACHE_SIZE (cpu) - 1)
+#define SCACHE_HASH_PC(pc, mask) \
+((CGEN_MIN_INSN_SIZE == 2 ? ((pc) >> 1) \
+  : CGEN_MIN_INSN_SIZE == 4 ? ((pc) >> 2) \
+  : (pc)) \
+ & (mask))
 
 /* Non-zero if cache is in use.  */
 #define USING_SCACHE_P(sd) (STATE_SCACHE_SIZE (sd) > 0)
@@ -81,15 +113,22 @@ typedef struct cpu_scache {
 /* Install the simulator cache into the simulator.  */
 MODULE_INSTALL_FN scache_install;
 
-/* Flush all cpu's caches.  */
-void scache_flush (SIM_DESC);
+/* Lookup a PC value in the scache [compilation only].  */
+extern SCACHE * scache_lookup (SIM_CPU *, PCADDR);
+/* Return a pointer to at least N buffers.  */
+extern SCACHE *scache_lookup_or_alloc (SIM_CPU *, PCADDR, int, SCACHE **);
+/* Flush all cpu's scaches.  */
+extern void scache_flush (SIM_DESC);
+/* Flush a cpu's scache.  */
+extern void scache_flush_cpu (SIM_CPU *);
 
-/* Profiling support.  */
+/* Scache profiling support.  */
 
 /* Print summary scache usage information.  */
-void scache_print_profile (SIM_DESC sd, int verbose);
+extern void scache_print_profile (SIM_CPU *cpu, int verbose);
 
 #if WITH_PROFILE_SCACHE_P
+
 #define PROFILE_COUNT_SCACHE_HIT(cpu) \
 do { \
   if (CPU_PROFILE_FLAGS (cpu) [PROFILE_SCACHE_IDX]) \
@@ -100,9 +139,24 @@ do { \
   if (CPU_PROFILE_FLAGS (cpu) [PROFILE_SCACHE_IDX]) \
     ++ CPU_SCACHE_MISSES (cpu); \
 } while (0)
+#define PROFILE_COUNT_SCACHE_CHAIN_LENGTH(cpu,length) \
+do { \
+  if (CPU_PROFILE_FLAGS (cpu) [PROFILE_SCACHE_IDX]) \
+    ++ CPU_SCACHE_CHAIN_LENGTHS (cpu) [length]; \
+} while (0)
+#define PROFILE_COUNT_SCACHE_FULL_FLUSH(cpu) \
+do { \
+  if (CPU_PROFILE_FLAGS (cpu) [PROFILE_SCACHE_IDX]) \
+    ++ CPU_SCACHE_FULL_FLUSHES (cpu); \
+} while (0)
+
 #else
+
 #define PROFILE_COUNT_SCACHE_HIT(cpu)
 #define PROFILE_COUNT_SCACHE_MISS(cpu)
+#define PROFILE_COUNT_SCACHE_CHAIN_LENGTH(cpu,length)
+#define PROFILE_COUNT_SCACHE_FULL_FLUSH(cpu)
+
 #endif
 
-#endif /* SCACHE_H */
+#endif /* CGEN_SCACHE_H */