Add some constructors and an output operator to the Twin??_t types so that o3 SPARC...

--HG--
extra : convert_revision : af987aaeac87ee92a3b55cf0839d994cf7dea1af

diff --git a/src/SConscript b/src/SConscript
index 9d7248213c18a7255115c88ef7513c6dd357589f..74d9bf9a66222693edb6037312c68b496cd4a27e 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -48,6 +48,7 @@ Import('env')
 
 base_sources = Split('''
        base/annotate.cc
+       base/bigint.cc
        base/circlebuf.cc
        base/cprintf.cc
        base/fast_alloc.cc

diff --git a/src/base/bigint.cc b/src/base/bigint.cc
new file mode 100644 (file)
index 0000000..ce9942c
--- /dev/null
+++ b/src/base/bigint.cc
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006 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.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "base/bigint.hh"
+
+#include <iostream>
+
+using namespace std;
+
+ostream & operator << (ostream & os, const Twin64_t & t)
+{
+    os << t.a << ", " << t.b;
+    return os;
+}
+
+ostream & operator << (ostream & os, const Twin32_t & t)
+{
+    os << t.a << ", " << t.b;
+    return os;
+}

diff --git a/src/base/bigint.hh b/src/base/bigint.hh
index d533e662a541c0f042fc6148da5db73a4a80fbb0..ed48c67fe2f758672941d190edb82d5d46c0fbdf 100644 (file)
--- a/src/base/bigint.hh
+++ b/src/base/bigint.hh
@@ -28,12 +28,21 @@
  * Authors: Ali Saidi
  */
 
+#include <iostream>
+
 #ifndef __BASE_BIGINT_HH__
 #define __BASE_BIGINT_HH__
 // Create a couple of large int types for atomic reads
 struct m5_twin64_t {
     uint64_t a;
     uint64_t b;
+    m5_twin64_t()
+    {}
+    m5_twin64_t(const uint64_t x)
+    {
+        a = x;
+        b = x;
+    }
     inline m5_twin64_t& operator=(const uint64_t x)
     {
         a = x;
@@ -45,6 +54,13 @@ struct m5_twin64_t {
 struct m5_twin32_t {
     uint32_t a;
     uint32_t b;
+    m5_twin32_t()
+    {}
+    m5_twin32_t(const uint32_t x)
+    {
+        a = x;
+        b = x;
+    }
     inline m5_twin32_t& operator=(const uint32_t x)
     {
         a = x;
@@ -59,6 +75,9 @@ struct m5_twin32_t {
 typedef m5_twin64_t Twin64_t;
 typedef m5_twin32_t Twin32_t;
 
+// Output operator overloads
+std::ostream & operator << (std::ostream & os, const Twin64_t & t);
+std::ostream & operator << (std::ostream & os, const Twin32_t & t);
 
 #endif // __BASE_BIGINT_HH__