From faa09946fe715da86c3f551c011b887c31b5d62c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 28 Jun 2021 22:10:28 -0400 Subject: [PATCH] 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. --- sim/common/ChangeLog | 6 ++++++ sim/common/sim-config.h | 23 ----------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5b86431c8bb..e18d06bf01a 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2021-06-30 Mike Frysinger + + * 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 * Make-common.in (SIM_DEFAULT_MODEL): Delete. diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h index 5b1713cff70..aae08e71c58 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. */ -- 2.30.2