Rename sim/universe.{cc,hh} to root.{cc,hh} (since the
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 2 Jun 2005 01:59:27 +0000 (21:59 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 2 Jun 2005 01:59:27 +0000 (21:59 -0400)
object defined there was renamed Root long ago).

SConscript:
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
base/misc.cc:
base/pollevent.cc:
base/pollevent.hh:
base/stats/events.cc:
base/trace.hh:
cpu/beta_cpu/fetch_impl.hh:
cpu/beta_cpu/full_cpu.cc:
cpu/beta_cpu/inst_queue_impl.hh:
cpu/pc_event.cc:
cpu/static_inst.cc:
dev/etherbus.cc:
dev/etherdump.cc:
dev/etherlink.cc:
dev/ide_disk.cc:
dev/pcidev.cc:
sim/builder.cc:
sim/eventq.cc:
sim/main.cc:
sim/root.cc:
sim/stat_control.cc:
    Rename sim/universe.{cc,hh} to root.{cc,hh}.

--HG--
rename : sim/universe.cc => sim/root.cc
extra : convert_revision : b8699e81e285253d66da75412e7bb2c251c0389a

24 files changed:
SConscript
arch/alpha/alpha_linux_process.cc
arch/alpha/alpha_tru64_process.cc
base/misc.cc
base/pollevent.cc
base/pollevent.hh
base/stats/events.cc
base/trace.hh
cpu/beta_cpu/fetch_impl.hh
cpu/beta_cpu/full_cpu.cc
cpu/beta_cpu/inst_queue_impl.hh
cpu/pc_event.cc
cpu/static_inst.cc
dev/etherbus.cc
dev/etherdump.cc
dev/etherlink.cc
dev/ide_disk.cc
dev/pcidev.cc
sim/builder.cc
sim/eventq.cc
sim/main.cc
sim/root.cc [new file with mode: 0644]
sim/stat_control.cc
sim/universe.cc [deleted file]

index ad4a974ccc5fe5e7c33c93745cc2072455c4861f..dbfe5f9d2ba92171c3cb21324bdc4fa08f82458b 100644 (file)
@@ -223,6 +223,7 @@ base_sources = Split('''
        sim/main.cc
        sim/param.cc
        sim/profile.cc
+       sim/root.cc
        sim/serialize.cc
        sim/sim_events.cc
        sim/sim_exit.cc
@@ -231,7 +232,6 @@ base_sources = Split('''
        sim/stat_context.cc
        sim/stat_control.cc
        sim/trace_context.cc
-       sim/universe.cc
         ''')
 
 # MySql sources
index 600de4447f11ad466c7958a59f1099d25cf61c27..07bd5e8002ef5dfe227fe86720aadaadcb7938bb 100644 (file)
@@ -44,7 +44,7 @@
 
 #include "arch/alpha/alpha_common_syscall_emul.hh"
 #include "sim/syscall_emul.hh"
-#include "sim/universe.hh"     // for curTick & ticksPerSecond
+#include "sim/root.hh" // for curTick & ticksPerSecond
 
 #include "arch/alpha/alpha_linux_process.hh"
 
index 0910ec552cba2e5965a93ddb9b06a7228f5859a9..fe1bacc35b0d7d1324fcc137364a55dba1639454 100644 (file)
@@ -45,7 +45,7 @@
 #include "arch/alpha/alpha_tru64_process.hh"
 
 #include "sim/syscall_emul.hh"
-#include "sim/universe.hh"     // for curTick & ticksPerSecond
+#include "sim/root.hh" // for curTick & ticksPerSecond
 
 #include "base/trace.hh"
 
index 4b7c3632a5de57f4c65abb9e9389eaec424f8383..41c9800dfa26d66bccfdf41cc828dae2347289d1 100644 (file)
@@ -35,7 +35,7 @@
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "sim/host.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index 127bf57f50c196b83178d79e06e738bfb15295c5..132d7de70463ab9512e274cf90161af4cca6cb06 100644 (file)
@@ -37,7 +37,7 @@
 #include "sim/host.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 #include "sim/serialize.hh"
 
 using namespace std;
index 3c9404c08197ddc3f1d0287747effedcf2d990bd..169d82a610b1cbc4faca500de7e9fb47bdd64ed2 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <vector>
 #include <poll.h>
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 class Checkpoint;
 
index d716fa4d3e651f3c4b5f0d8d18ba8180f0abd66e..dd7ec2ccf81f9f16a315c3573b52f501e9733719 100644 (file)
@@ -41,7 +41,7 @@
 #include "base/match.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index 054b145461617d625f23eefe9336c0d7c44cdcaa..eb33213ed2cc1a19cf7f8e043c6f7508ed863e33 100644 (file)
@@ -34,7 +34,7 @@
 #include "base/cprintf.hh"
 #include "base/match.hh"
 #include "sim/host.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 #ifndef TRACING_ON
 #ifndef NDEBUG
index fd23354a124d052e29ca22dc01b5e796ab60352e..b49064565229005e0d9b3ff01a2f0425ce4374af 100644 (file)
@@ -37,7 +37,7 @@
 #include "mem/mem_req.hh"
 #include "cpu/beta_cpu/fetch.hh"
 
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 template<class Impl>
 SimpleFetch<Impl>::CacheCompletionEvent
index 515bec92669fe0d313bedb83f74f12b47be0a30e..8eedc3769dd8c7e2304abc08975d1935ef6b6a92 100644 (file)
@@ -31,7 +31,7 @@
 #else
 #include "sim/process.hh"
 #endif
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 #include "cpu/beta_cpu/alpha_dyn_inst.hh"
 #include "cpu/beta_cpu/alpha_impl.hh"
index f1a006b6efbec19dfa89e3c2e1e695605fbc3bc7..51504347ad609128739dfd3030958d3af77e77af 100644 (file)
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 #include "cpu/beta_cpu/inst_queue.hh"
 
index 2c6bb2443892d2b9872cc770db7321e3b6a6a466..f30e2a332a848c7f15102f9a73d000a91969818a 100644 (file)
@@ -36,7 +36,7 @@
 #include "cpu/exec_context.hh"
 #include "cpu/pc_event.hh"
 #include "sim/debug.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index d522dbf5accf76af6f0fabb4584d3084c791a64c..4a2c81d5ee5a3c94668443c8a93485bfebd2bd4a 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <iostream>
 #include "cpu/static_inst.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 template <class ISA>
 StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;
index ab2314c022b8b3602a3b5efb3fe53e8f6ecd0600..50731c265abe8796dfb56ccf3a6915ce40567b78 100644 (file)
@@ -41,7 +41,7 @@
 #include "dev/etherint.hh"
 #include "dev/etherpkt.hh"
 #include "sim/builder.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index 39b94f923920b91acfd6e2cfb54c4a0e5102b262..42447a5e3c1b26d6a9dcc683df94416c2949d430 100644 (file)
@@ -39,7 +39,7 @@
 #include "base/output.hh"
 #include "dev/etherdump.hh"
 #include "sim/builder.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using std::string;
 
index d63f4b3ad8d5b5dd893d2557f6e0f9768b87cc40..6ae54906c58b86e2c802b32bb12d5dea258c24c2 100644 (file)
@@ -43,7 +43,7 @@
 #include "sim/builder.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index 90a57bd2f3e8b50a99a05013bd97d78660818004..28f7b634af8cd548f8276969b1bbfb70f0d067f3 100644 (file)
@@ -49,7 +49,7 @@
 #include "mem/bus/pio_interface_impl.hh"
 #include "sim/builder.hh"
 #include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 #include "targetarch/isa_traits.hh"
 
 using namespace std;
index 76b42390adfdd47ab17ec469d36c1ecea05fbd9a..850635d49cfc65b01017f68d8077a3b5b1972c6b 100644 (file)
@@ -46,7 +46,7 @@
 #include "mem/functional_mem/memory_control.hh"
 #include "sim/builder.hh"
 #include "sim/param.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 #include "dev/tsunamireg.h"
 
 using namespace std;
index 011694797b4fd6102001ae38f6f1c9dfcc9bc168..4362a66fd03722466cb69bee9332231bf16f4e35 100644 (file)
@@ -35,7 +35,7 @@
 #include "sim/config_node.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index f975c5e974797927b0ddff58c175d790ae960fe7..50158d06fb4b3fa2caee466a421d7bf1d63f058c 100644 (file)
@@ -38,7 +38,7 @@
 
 #include "sim/eventq.hh"
 #include "base/trace.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
index ee59cb83bb4ac0c8983f210c7a5ca0fc20ff3ee4..94928e36a4f6c43a00f6690648a707c7d29e84b5 100644 (file)
@@ -61,7 +61,7 @@
 #include "sim/sim_object.hh"
 #include "sim/stat_control.hh"
 #include "sim/stats.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
diff --git a/sim/root.cc b/sim/root.cc
new file mode 100644 (file)
index 0000000..47c6a6a
--- /dev/null
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <cstring>
+#include <fstream>
+#include <list>
+#include <string>
+#include <vector>
+
+#include "base/misc.hh"
+#include "base/output.hh"
+#include "sim/builder.hh"
+#include "sim/host.hh"
+#include "sim/sim_object.hh"
+#include "sim/root.hh"
+
+using namespace std;
+
+Tick curTick = 0;
+ostream *outputStream;
+ostream *configStream;
+
+/// The simulated frequency of curTick. (This is only here for a short time)
+Tick ticksPerSecond;
+
+namespace Clock {
+/// The simulated frequency of curTick. (In ticks per second)
+Tick Frequency;
+
+namespace Float {
+double s;
+double ms;
+double us;
+double ns;
+double ps;
+
+double Hz;
+double kHz;
+double MHz;
+double GHZ;
+/* namespace Float */ }
+
+namespace Int {
+Tick s;
+Tick ms;
+Tick us;
+Tick ns;
+Tick ps;
+/* namespace Float */ }
+
+/* namespace Clock */ }
+
+
+// Dummy Object
+class Root : public SimObject
+{
+  public:
+    Root(const std::string &name) : SimObject(name) {}
+};
+
+BEGIN_DECLARE_SIM_OBJECT_PARAMS(Root)
+
+    Param<Tick> clock;
+    Param<string> output_file;
+
+END_DECLARE_SIM_OBJECT_PARAMS(Root)
+
+BEGIN_INIT_SIM_OBJECT_PARAMS(Root)
+
+    INIT_PARAM(clock, "tick frequency"),
+    INIT_PARAM(output_file, "file to dump simulator output to")
+
+END_INIT_SIM_OBJECT_PARAMS(Root)
+
+CREATE_SIM_OBJECT(Root)
+{
+    static bool created = false;
+    if (created)
+        panic("only one root object allowed!");
+
+    created = true;
+
+    outputStream = simout.find(output_file);
+    Root *root = new Root(getInstanceName());
+
+    using namespace Clock;
+    Frequency = clock;
+    Float::s = static_cast<double>(Frequency);
+    Float::ms = Float::s / 1.0e3;
+    Float::us = Float::s / 1.0e6;
+    Float::ns = Float::s / 1.0e9;
+    Float::ps = Float::s / 1.0e12;
+
+    Float::Hz  = 1.0 / Float::s;
+    Float::kHz = 1.0 / Float::ms;
+    Float::MHz = 1.0 / Float::us;
+    Float::GHZ = 1.0 / Float::ns;
+
+    Int::s  = Frequency;
+    Int::ms = Int::s / 1000;
+    Int::us = Int::ms / 1000;
+    Int::ns = Int::us / 1000;
+    Int::ps = Int::ns / 1000;
+
+    return root;
+}
+
+REGISTER_SIM_OBJECT("Root", Root)
index 4d72ce213308ca76d42f79d0f67bacbc3960edaf..37664dc65b80cd1173010fb895f9d6db324dca89 100644 (file)
@@ -43,7 +43,7 @@
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 #include "sim/stat_control.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 using namespace std;
 
diff --git a/sim/universe.cc b/sim/universe.cc
deleted file mode 100644 (file)
index 981a8eb..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2002-2004 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <cstring>
-#include <fstream>
-#include <list>
-#include <string>
-#include <vector>
-
-#include "base/misc.hh"
-#include "base/output.hh"
-#include "sim/builder.hh"
-#include "sim/host.hh"
-#include "sim/sim_object.hh"
-#include "sim/universe.hh"
-
-using namespace std;
-
-Tick curTick = 0;
-ostream *outputStream;
-ostream *configStream;
-
-/// The simulated frequency of curTick. (This is only here for a short time)
-Tick ticksPerSecond;
-
-namespace Clock {
-/// The simulated frequency of curTick. (In ticks per second)
-Tick Frequency;
-
-namespace Float {
-double s;
-double ms;
-double us;
-double ns;
-double ps;
-
-double Hz;
-double kHz;
-double MHz;
-double GHZ;
-/* namespace Float */ }
-
-namespace Int {
-Tick s;
-Tick ms;
-Tick us;
-Tick ns;
-Tick ps;
-/* namespace Float */ }
-
-/* namespace Clock */ }
-
-
-// Dummy Object
-class Root : public SimObject
-{
-  public:
-    Root(const std::string &name) : SimObject(name) {}
-};
-
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(Root)
-
-    Param<Tick> clock;
-    Param<string> output_file;
-
-END_DECLARE_SIM_OBJECT_PARAMS(Root)
-
-BEGIN_INIT_SIM_OBJECT_PARAMS(Root)
-
-    INIT_PARAM(clock, "tick frequency"),
-    INIT_PARAM(output_file, "file to dump simulator output to")
-
-END_INIT_SIM_OBJECT_PARAMS(Root)
-
-CREATE_SIM_OBJECT(Root)
-{
-    static bool created = false;
-    if (created)
-        panic("only one root object allowed!");
-
-    created = true;
-
-    outputStream = simout.find(output_file);
-    Root *root = new Root(getInstanceName());
-
-    using namespace Clock;
-    Frequency = clock;
-    Float::s = static_cast<double>(Frequency);
-    Float::ms = Float::s / 1.0e3;
-    Float::us = Float::s / 1.0e6;
-    Float::ns = Float::s / 1.0e9;
-    Float::ps = Float::s / 1.0e12;
-
-    Float::Hz  = 1.0 / Float::s;
-    Float::kHz = 1.0 / Float::ms;
-    Float::MHz = 1.0 / Float::us;
-    Float::GHZ = 1.0 / Float::ns;
-
-    Int::s  = Frequency;
-    Int::ms = Int::s / 1000;
-    Int::us = Int::ms / 1000;
-    Int::ns = Int::us / 1000;
-    Int::ps = Int::ns / 1000;
-
-    return root;
-}
-
-REGISTER_SIM_OBJECT("Root", Root)