diff -r db3054ce0900 -r 3eb4b8a80f13 src/mem/ruby/common/DataBlock.hh
--- a/src/mem/ruby/common/DataBlock.hh	Wed Aug 22 14:20:19 2012 -0500
+++ b/src/mem/ruby/common/DataBlock.hh	Wed Aug 22 14:20:22 2012 -0500
@@ -29,6 +29,7 @@
 #ifndef __MEM_RUBY_COMMON_DATABLOCK_HH__
 #define __MEM_RUBY_COMMON_DATABLOCK_HH__
 
+#include <cassert>
 #include <iomanip>
 #include <iostream>
 
@@ -72,6 +73,7 @@
 inline void
 DataBlock::assign(uint8* data)
 {
+    assert(data != NULL);
     if (m_alloc) {
         delete [] m_data;
     }
diff -r db3054ce0900 -r 3eb4b8a80f13 src/mem/ruby/common/DataBlock.cc
--- a/src/mem/ruby/common/DataBlock.cc	Wed Aug 22 14:20:19 2012 -0500
+++ b/src/mem/ruby/common/DataBlock.cc	Wed Aug 22 14:20:22 2012 -0500
@@ -87,14 +87,6 @@
 DataBlock &
 DataBlock::operator=(const DataBlock & obj)
 {
-    if (this == &obj) {
-        // assert(false);
-    } else {
-        if (!m_alloc)
-            m_data = new uint8[RubySystem::getBlockSizeBytes()];
-        memcpy(m_data, obj.m_data, RubySystem::getBlockSizeBytes());
-        m_alloc = true;
-    }
-
+    memcpy(m_data, obj.m_data, RubySystem::getBlockSizeBytes());
     return *this;
 }