* sim-base.h (sim_state_base): New member environment.

	(STATE_ENVIRONMENT): New macro.
	* sim-config.c (current_environment): Delete.
	(sim_config_default): New function.
	(sim_config): Set STATE_ENVIRONMENT, not current_environment.
	* sim-config.h (current_environment,CURRENT_ENVIRONMENT): Delete.
	(sim_config_default): Add prototype.
	* sim-module.c (sim_pre_argv_init): Call sim_config_default.
	* sim-options.c (standard_option_handler, case OPTION_ENVIRONMENT):
	Set STATE_ENVIRONMENT, not current_environment.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 764a284031ebbac90d25385f23429abae1530017..161fa7ed905ef201c0e9376ab57e5bc44f988933 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,16 @@
+Mon Mar  9 12:50:59 1998  Doug Evans  <devans@seba.cygnus.com>
+
+       * sim-base.h (sim_state_base): New member environment.
+       (STATE_ENVIRONMENT): New macro.
+       * sim-config.c (current_environment): Delete.
+       (sim_config_default): New function.
+       (sim_config): Set STATE_ENVIRONMENT, not current_environment.
+       * sim-config.h (current_environment,CURRENT_ENVIRONMENT): Delete.
+       (sim_config_default): Add prototype.
+       * sim-module.c (sim_pre_argv_init): Call sim_config_default.
+       * sim-options.c (standard_option_handler, case OPTION_ENVIRONMENT):
+       Set STATE_ENVIRONMENT, not current_environment.
+
 Mon Mar  9 11:59:03 1998  Jim Wilson  <wilson@cygnus.com>
 
        * sim-fpu.c (NR_GUARDS64): Change NR_PAD32 to NR_PAD64.

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index 270667b30aea77fc6f2feb195ef058bb40565174..654e71e30cdb8b221f13c2457e8f45e14c044e6a 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -131,6 +131,10 @@ typedef struct {
   struct host_callback_struct *callback;
 #define STATE_CALLBACK(sd) ((sd)->base.callback)
 
+  /* The type of simulation environment (user/operating).  */
+  enum sim_environment environment;
+#define STATE_ENVIRONMENT(sd) ((sd)->base.environment)
+
 #if 0 /* FIXME: Not ready yet.  */
   /* Stuff defined in sim-config.h.  */
   struct sim_config config;