aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/fr30/ChangeLog5
-rw-r--r--sim/fr30/sem-switch.c6
-rw-r--r--sim/fr30/sem.c6
3 files changed, 15 insertions, 2 deletions
diff --git a/sim/fr30/ChangeLog b/sim/fr30/ChangeLog
index 626c969..bf6452d 100644
--- a/sim/fr30/ChangeLog
+++ b/sim/fr30/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-06 Dave Brolley <brolley@redhat.com>
+
+ * sem.c: Regenerated.
+ * sem-switch.c: Regenerated.
+
2000-08-28 Dave Brolley <brolley@redhat.com>
* cpu.h: Regenerated.
diff --git a/sim/fr30/sem-switch.c b/sim/fr30/sem-switch.c
index f3477e5..d6340c0 100644
--- a/sim/fr30/sem-switch.c
+++ b/sim/fr30/sem-switch.c
@@ -384,12 +384,16 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
#if WITH_SCACHE_PBB_FR30BF
-#ifdef DEFINE_SWITCH
+#if defined DEFINE_SWITCH || defined FAST_P
/* In the switch case FAST_P is a constant, allowing several optimizations
in any called inline functions. */
vpc = fr30bf_pbb_begin (current_cpu, FAST_P);
#else
+#if 0 /* cgen engine can't handle dynamic fast/full switching yet. */
vpc = fr30bf_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
+#else
+ vpc = fr30bf_pbb_begin (current_cpu, 0);
+#endif
#endif
#endif
}
diff --git a/sim/fr30/sem.c b/sim/fr30/sem.c
index 0d83f36..f3a749b 100644
--- a/sim/fr30/sem.c
+++ b/sim/fr30/sem.c
@@ -179,12 +179,16 @@ SEM_FN_NAME (fr30bf,x_begin) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
#if WITH_SCACHE_PBB_FR30BF
-#ifdef DEFINE_SWITCH
+#if defined DEFINE_SWITCH || defined FAST_P
/* In the switch case FAST_P is a constant, allowing several optimizations
in any called inline functions. */
vpc = fr30bf_pbb_begin (current_cpu, FAST_P);
#else
+#if 0 /* cgen engine can't handle dynamic fast/full switching yet. */
vpc = fr30bf_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu)));
+#else
+ vpc = fr30bf_pbb_begin (current_cpu, 0);
+#endif
#endif
#endif
}