sim: delete unused model settings

These were never fully migrated from the psim to common code, and since
we've finished moving the logic into the runtime sim state, we won't ever
need these.  So punt them.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 5b86431c8bb034a523dfb44883fa8634f47dcc68..e18d06bf01ab8fe72c92625769f4da1529f3ba12 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-config.h (WITH_MODEL): Delete.
+       (CURRENT_MODEL, MODEL_ISSUE_IGNORE, MODEL_ISSUE_PROCESS,
+       WITH_MODEL_ISSUE, CURRENT_MODEL_ISSUE): Likewise.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (SIM_DEFAULT_MODEL): Delete.

diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 5b1713cff706af6618d926606d353575db7652d3..aae08e71c5855ad4cb891aa87527b8f8010c43f6 100644 (file)
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -252,29 +252,6 @@ extern int current_floating_point;
                                         | MONITOR_INSTRUCTION_ISSUE)
 
 
-/* Current CPU model (models are in the generated models.h include file)  */
-#ifndef WITH_MODEL
-#define WITH_MODEL                     0
-#endif
-
-#define CURRENT_MODEL (WITH_MODEL      \
-                      ? WITH_MODEL     \
-                      : current_model)
-
-#define MODEL_ISSUE_IGNORE             (-1)
-#define MODEL_ISSUE_PROCESS            1
-
-#ifndef WITH_MODEL_ISSUE
-#define WITH_MODEL_ISSUE               0
-#endif
-
-extern int current_model_issue;
-#define CURRENT_MODEL_ISSUE (WITH_MODEL_ISSUE  \
-                            ? WITH_MODEL_ISSUE \
-                            : current_model_issue)
-
-
-
 /* Whether or not input/output just uses stdio, or uses printf_filtered for
    output, and polling input for input.  */