deprecate the m5exit instruction and rename it to m5exit_old

Implement a new m5exit instruction with an optional delay

arch/alpha/isa_desc:
    move m5exit to m5exit old.  The old version of the
    instruction is now deprecated

    Implement the new exit instruction with the optional delay
sim/sim_events.cc:
sim/sim_events.hh:
    Make SimExit take a cycle
sim/universe.cc:
    provide ticksPerMS, ticksPerUS, and ticksPerNS so we don't
    have to do math during the cycle

--HG--
extra : convert_revision : e2ed47a2e5cfcd57c82086c6fcb4a28bf801c214

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index 75f765029258681e23e2418ac3f83f370536b0de..09fb4a50a7ca8c3339e14444cfa6fdc73d426be5 100644 (file)
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -2425,9 +2425,21 @@ decode OPCODE default Unknown::unknown() {
                if (!xc->misspeculating())
                    Annotate::EndInterval(xc);
            }}, No_OpClass);
-           0x20: m5exit({{
+           0x20: m5exit_old({{
                if (!xc->misspeculating())
-                   SimExit("m5_exit instruction encountered");
+                   SimExit(curTick, "m5_exit_old instruction encountered");
+           }}, No_OpClass);
+           0x21: m5exit({{
+               if (!xc->misspeculating()) {
+                   Tick when = curTick;
+                   Tick delay = xc->regs.intRegFile[16];
+                   if (delay != 0) {
+                       delay *= ticksPerUS;
+                       delay /= 1000;
+                       when += delay;
+                   }
+                   SimExit(when, "m5_exit instruction encountered");
+               }
            }}, No_OpClass);
             0x30: initparam({{ Ra = xc->cpu->system->init_param; }});
             0x40: resetstats({{

diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 5f24de5161cb581209ca209abc1501e21f57053a..165bab2bf116dd8b41cf517c192f8dc7b2b7a35b 100644 (file)
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -64,9 +64,9 @@ SimExitEvent::description()
 }
 
 void
-SimExit(const char *message)
+SimExit(Tick when, const char *message)
 {
-    static SimExitEvent event(message);
+    static SimExitEvent event(when, message);
 }
 
 //

diff --git a/sim/sim_events.hh b/sim/sim_events.hh
index 0029a8404df88f4c3544a91a68c463765b450d4a..bca978ce114b9ab1df46bd99a2b0841ab79d57c8 100644 (file)
--- a/sim/sim_events.hh
+++ b/sim/sim_events.hh
@@ -66,7 +66,7 @@ class SimExitEvent : public Event
     virtual const char *description();
 };
 
-void SimExit(const char *message);
+void SimExit(Tick when, const char *message);
 
 //
 // Event class to terminate simulation after 'n' related events have

diff --git a/sim/universe.cc b/sim/universe.cc
index 8274d84ca6a31f5f6e4c7d31dd41406bb424ea35..4cfcdc563fbe23424d416e30e11b5f70bfaf753d 100644 (file)
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -38,6 +38,9 @@ using namespace std;
 
 Tick curTick = 0;
 Tick ticksPerSecond;
+Tick ticksPerMS;
+Tick ticksPerUS;
+Tick ticksPerNS;
 
 class UniverseParamContext : public ParamContext
 {
@@ -49,10 +52,13 @@ class UniverseParamContext : public ParamContext
 UniverseParamContext universe("Universe");
 
 Param<Tick> universe_freq(&universe, "frequency", "tick frequency",
-                            200000000);
+                          200000000);
 
 void
 UniverseParamContext::checkParams()
 {
     ticksPerSecond = universe_freq;
+    ticksPerMS = universe_freq / 1000;
+    ticksPerUS = universe_freq / (1000 * 1000);
+    ticksPerNS = universe_freq / (1000 * 1000 * 1000);
 }