1d0
<
30,33d28
< /*
< * $Id$
< */
<
38,42c33,37
< m_address = addr;
< setSize(size);
< for(int i=0; i<size; i++) {
< setByte(i, 0);
< }
---
> m_address = addr;
> setSize(size);
> for (int i = 0; i < size; i++) {
> setByte(i, 0);
> }
45c40,41
< void SubBlock::internalMergeFrom(const DataBlock& data)
---
> void
> SubBlock::internalMergeFrom(const DataBlock& data)
47,52c43,48
< 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));
< }
---
> 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));
> }
55c51,52
< void SubBlock::internalMergeTo(DataBlock& data) const
---
> void
> SubBlock::internalMergeTo(DataBlock& data) const
57,62c54,60
< 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
< }
---
> int size = getSize();
> assert(size > 0);
> int offset = m_address.getOffset();
> for (int i = 0; i < size; i++) {
> // This will detect crossing a cache line boundary
> data.setByte(offset + i, this->getByte(i));
> }
65c63,64
< void SubBlock::print(ostream& out) const
---
> void
> SubBlock::print(ostream& out) const
67c66
< out << "[" << m_address << ", " << getSize() << ", " << m_data << "]";
---
> out << "[" << m_address << ", " << getSize() << ", " << m_data << "]";