From 2f30950143cc70bc42a3c8a4111d7cf8198ec881 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 11 May 2009 10:38:43 -0700
Subject: ruby: Import ruby and slicc from GEMS

We eventually plan to replace the m5 cache hierarchy with the GEMS
hierarchy, but for now we will make both live alongside eachother.
---
 src/mem/ruby/common/SubBlock.cc | 81 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/mem/ruby/common/SubBlock.cc

(limited to 'src/mem/ruby/common/SubBlock.cc')

diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc
new file mode 100644
index 000000000..f79e33d9c
--- /dev/null
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) 1999-2008 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.
+ */
+
+/*
+ * $Id$
+ */
+
+#include "SubBlock.hh"
+
+SubBlock::SubBlock(const Address& addr, int size)
+{
+  m_address = addr;
+  setSize(size);
+  for(int i=0; i<size; i++) {
+    setByte(i, 0);
+  }
+}
+
+SubBlock::SubBlock(const Address& addr, const Address& logicalAddress, int size)
+{
+  m_address = addr;
+  m_logicalAddress = logicalAddress;
+  setSize(size);
+  for(int i=0; i<size; i++) {
+    setByte(i, 0);
+  }
+}
+
+void SubBlock::internalMergeFrom(const DataBlock& data)
+{
+  int size = getSize();
+  assert(size > 0);
+  int offset = m_address.getOffset();
+  for(int i=0; i<size; i++) {
+    this->setByte(i, data.getByte(offset+i));
+  }
+}
+
+void SubBlock::internalMergeTo(DataBlock& data) const
+{
+  int size = getSize();
+  assert(size > 0);
+  int offset = m_address.getOffset();
+  for(int i=0; i<size; i++) {
+    data.setByte(offset+i, this->getByte(i)); // This will detect crossing a cache line boundary
+  }
+}
+
+void SubBlock::print(ostream& out) const
+{
+  out << "[" << m_address << ", " << getSize() << ", " << m_data << "]";
+}
+
+
+
-- 
cgit v1.2.3


From 24da30e317cdbf4b628141d69b2d17dac5ae3822 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 11 May 2009 10:38:45 -0700
Subject: ruby: Make ruby #includes use full paths to the files they're
 including. This basically means changing all #include statements and changing
 autogenerated code so that it generates the correct paths.  Because slicc
 generates #includes, I had to hard code the include paths to mem/protocol.

---
 src/mem/ruby/common/SubBlock.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mem/ruby/common/SubBlock.cc')

diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc
index f79e33d9c..568d3106a 100644
--- a/src/mem/ruby/common/SubBlock.cc
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
 
 SubBlock::SubBlock(const Address& addr, int size)
 {
-- 
cgit v1.2.3