summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2003-11-02 20:43:39 -0500
committerNathan Binkert <binkertn@umich.edu>2003-11-02 20:43:39 -0500
commitd76445f9f37896227f1d4e61348a418aa7ab6371 (patch)
tree4191113d095ceeee9dd817558e3193261da9c7f6 /sim
parentf0e2c80829a8cbe42fbeaf6412ef3df5adb448f5 (diff)
downloadgem5-d76445f9f37896227f1d4e61348a418aa7ab6371.tar.xz
Move the m5 pseudo instructions into their own file
arch/alpha/isa_desc: Move the pseudo instructions out of the isa_desc, into their own file and call out to them when they're to be accessed sim/sim_events.cc: sim/sim_events.hh: sim/sim_exit.hh: move SimExit to sim_exit.cc --HG-- extra : convert_revision : 1c393adb1c18bd0fef065057d7f4e9cf60ac4197
Diffstat (limited to 'sim')
-rw-r--r--sim/sim_events.cc6
-rw-r--r--sim/sim_events.hh2
-rw-r--r--sim/sim_exit.hh3
3 files changed, 3 insertions, 8 deletions
diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 265bf63dc..98d3b086d 100644
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -63,12 +63,6 @@ SimExitEvent::description()
return "simulation termination";
}
-void
-SimExit(Tick when, const char *message)
-{
- static SimExitEvent event(when, message);
-}
-
//
// constructor: automatically schedules at specified time
//
diff --git a/sim/sim_events.hh b/sim/sim_events.hh
index 8a420e419..c4db248e0 100644
--- a/sim/sim_events.hh
+++ b/sim/sim_events.hh
@@ -66,8 +66,6 @@ class SimExitEvent : public Event
virtual const char *description();
};
-void SimExit(Tick when, const char *message);
-
//
// Event class to terminate simulation after 'n' related events have
// occurred using a shared counter: used to terminate when *all*
diff --git a/sim/sim_exit.hh b/sim/sim_exit.hh
index 847d9eb10..9a8b22d51 100644
--- a/sim/sim_exit.hh
+++ b/sim/sim_exit.hh
@@ -31,11 +31,14 @@
#include <string>
+#include "sim/host.hh"
+
class Callback;
void registerExitCallback(Callback *);
void exitNow(const std::string &cause, int exit_code);
void exitNow(const char *cause, int exit_code);
+void SimExit(Tick when, const char *message);
#endif // __SIM_EXIT_HH__