Deleted Added
sdiff udiff text old ( 7039:bc0b6ea676b5 ) new ( 7055:4e24742201d7 )
full compact
1/*
2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 15 unchanged lines hidden (view full) ---

24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#ifndef __MEM_RUBY_COMMON_SUBBLOCK_HH__
30#define __MEM_RUBY_COMMON_SUBBLOCK_HH__
31
32#include "mem/gems_common/Vector.hh"
33#include "mem/ruby/common/Address.hh"
34#include "mem/ruby/common/DataBlock.hh"
35#include "mem/ruby/common/Global.hh"
36
37class SubBlock
38{
39 public:

--- 13 unchanged lines hidden (view full) ---

53 uint8 readByte() const { return getByte(0); }
54 void writeByte(uint8 data) { setByte(0, data); }
55
56 // Merging to and from DataBlocks - We only need to worry about
57 // updates when we are using DataBlocks
58 void mergeTo(DataBlock& data) const { internalMergeTo(data); }
59 void mergeFrom(const DataBlock& data) { internalMergeFrom(data); }
60
61 void print(ostream& out) const;
62
63 private:
64 void internalMergeTo(DataBlock& data) const;
65 void internalMergeFrom(const DataBlock& data);
66
67 // Data Members (m_ prefix)
68 Address m_address;
69 Vector<uint8_t> m_data;
70};
71
72inline ostream&
73operator<<(ostream& out, const SubBlock& obj)
74{
75 obj.print(out);
76 out << flush;
77 return out;
78}
79
80#endif // __MEM_RUBY_COMMON_SUBBLOCK_HH__