summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2013-02-10 21:26:24 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2013-02-10 21:26:24 -0600
commit7862478eef88d58d8da3c43663aa39bd4b604fc5 (patch)
tree09bf37b44cb164d03415e64b4d4c52cbccbd194a /src/base
parentd3aebe1f91aa166329c8ee102fdcb2c9734fdceb (diff)
downloadgem5-7862478eef88d58d8da3c43663aa39bd4b604fc5.tar.xz
ruby: replace Time with Cycles in Message class
Concomitant changes are being committed as well, including the io operator<< for the Cycles class.
Diffstat (limited to 'src/base')
-rw-r--r--src/base/SConscript1
-rw-r--r--src/base/types.cc43
-rw-r--r--src/base/types.hh3
3 files changed, 47 insertions, 0 deletions
diff --git a/src/base/SConscript b/src/base/SConscript
index ff6d696d4..2bd255162 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -59,6 +59,7 @@ Source('statistics.cc')
Source('str.cc')
Source('time.cc')
Source('trace.cc')
+Source('types.cc')
Source('userinfo.cc')
Source('loader/aout_object.cc')
diff --git a/src/base/types.cc b/src/base/types.cc
new file mode 100644
index 000000000..38b6bf2b2
--- /dev/null
+++ b/src/base/types.cc
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013 Mark D. Hill and David A. Wood
+ * 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.
+ *
+ * Authors: Nilay Vaish
+ */
+
+#include "base/types.hh"
+
+#ifndef SWIG // keep the operators away from SWIG
+
+std::ostream&
+operator<<(std::ostream &out, const Cycles & cycles)
+{
+ out << cycles.c;
+ return out;
+}
+
+#endif // SWIG not touching operators
+
diff --git a/src/base/types.hh b/src/base/types.hh
index b4cb69a0c..ad9ac766e 100644
--- a/src/base/types.hh
+++ b/src/base/types.hh
@@ -40,6 +40,7 @@
#include <inttypes.h>
#include <cassert>
+#include <ostream>
/** uint64_t constant */
#define ULL(N) ((uint64_t)N##ULL)
@@ -125,6 +126,8 @@ class Cycles
const Cycles operator >>(const int32_t shift)
{ return Cycles(c >> shift); }
+ friend std::ostream& operator<<(std::ostream &out, const Cycles & cycles);
+
#endif // SWIG not touching operators
};