diff options
| author | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
| commit | d484e1b334c6fd3f2721a2a4628c2324ed14fd08 (patch) | |
| tree | c95594df5ecae29b11262967f3f8b99fca82ca5d /src/mem/ruby/common/DataBlock.cc | |
| parent | 70308bc835035b940efb36d7f335643dfaa39851 (diff) | |
| parent | a0651b8f6127c8b7994a165b525e93d87c470d20 (diff) | |
| download | gem5-d484e1b334c6fd3f2721a2a4628c2324ed14fd08.tar.xz | |
m5merge(2): another merge of regression stats
Diffstat (limited to 'src/mem/ruby/common/DataBlock.cc')
| -rw-r--r-- | src/mem/ruby/common/DataBlock.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mem/ruby/common/DataBlock.cc b/src/mem/ruby/common/DataBlock.cc index 75ede7f4f..8d3c81242 100644 --- a/src/mem/ruby/common/DataBlock.cc +++ b/src/mem/ruby/common/DataBlock.cc @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood * All rights reserved. @@ -32,13 +31,14 @@ 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; - } - return *this; + 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; + } + + return *this; } |