diff options
| -rw-r--r-- | sim/common/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/common/sim-config.h | 23 |
2 files changed, 6 insertions, 23 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5b86431..e18d06b 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,11 @@ 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. * sim-base.h (struct sim_state): Add model_name. (STATE_MODEL_NAME): Define. diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h index 5b1713c..aae08e7 100644 --- 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. */ |