aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>1997-09-22 09:16:14 +0000
committerAndrew Cagney <cagney@redhat.com>1997-09-22 09:16:14 +0000
commit4ca7d6d25b8020a15edf366aeb0fa9b3ac636e2b (patch)
tree32c616c5cac5b6d6aa2ae15a9cbbac71a83621a3 /sim
parent794e9ac96aca71d2cb7683383bb445c3125d9660 (diff)
downloadgdb-4ca7d6d25b8020a15edf366aeb0fa9b3ac636e2b.zip
gdb-4ca7d6d25b8020a15edf366aeb0fa9b3ac636e2b.tar.gz
gdb-4ca7d6d25b8020a15edf366aeb0fa9b3ac636e2b.tar.bz2
Fix disabling of model code when simulator does not support modeling.
Stops `-p' crashing simulators.
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog18
-rw-r--r--sim/common/sim-base.h8
2 files changed, 24 insertions, 2 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index b0e3a2e..a2eb578 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,23 @@
Mon Sep 22 11:46:20 1997 Andrew Cagney <cagney@b1.cygnus.com>
+ * sim-base.h (STATE_MODEL): Make conditional on SIM_HAVE_MODEL.
+
+ * sim-profile.c (profile_print_insn): Check 0 .. MAX_INSN for any
+ insn count. Make count conditional on there being a valid
+ INSN_NAME.
+ (profile_pc_init): Make default PC profile frequency an arbitrary
+ 256.
+
+ * sim-base.h: Ditto.
+
+ * sim-profile.h (WITH_PROFILE_MODEL_P): Only enable modeling when
+ SIM_HAVE_MODEL.
+
+ * sim-model.h (struct MACH): Depreciate, to be replaced by bfd
+ archure struct.
+
+Mon Sep 22 11:46:20 1997 Andrew Cagney <cagney@b1.cygnus.com>
+
* configure: Regenerated to track ../common/aclocal.m4 changes.
Mon Sep 22 11:45:00 1997 Andrew Cagney <cagney@b1.cygnus.com>
diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index f2b13d6..21be805 100644
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -70,10 +70,12 @@ typedef struct _sim_cpu sim_cpu;
#include "sim-module.h"
#include "sim-trace.h"
-#include "sim-profile.h"
-#include "sim-model.h"
#include "sim-core.h"
#include "sim-events.h"
+#include "sim-profile.h"
+#ifdef SIM_HAVE_MODEL
+#include "sim-model.h"
+#endif
#include "sim-io.h"
#include "sim-engine.h"
#include "sim-watch.h"
@@ -136,10 +138,12 @@ typedef struct {
MODULE_SUSPEND_LIST *suspend_list;
#define STATE_SUSPEND_LIST(sd) ((sd)->base.suspend_list)
+#ifdef SIM_HAVE_MODEL
/* ??? This might be more appropriate in sim_cpu. */
/* Machine tables for this cpu. See sim-model.h. */
const MODEL *model;
#define STATE_MODEL(sd) ((sd)->base.model)
+#endif
/* Supported options. */
struct option_list *options;