diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-09-11 09:23:56 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-09-11 09:23:56 -0500 |
commit | f00347a20fca8bbb0a955723bf068e23fe66f170 (patch) | |
tree | 5af847871374784d1f038a4ddb25755ba5d56edf /src/mem/ruby/system/MemoryVector.hh | |
parent | 5cdf221d8ce3f5b983672f26346aefc21b37a752 (diff) | |
download | gem5-f00347a20fca8bbb0a955723bf068e23fe66f170.tar.xz |
Ruby: Use uint8_t instead of uint8 everywhere
Diffstat (limited to 'src/mem/ruby/system/MemoryVector.hh')
-rw-r--r-- | src/mem/ruby/system/MemoryVector.hh | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mem/ruby/system/MemoryVector.hh b/src/mem/ruby/system/MemoryVector.hh index f8e407942..60707037d 100644 --- a/src/mem/ruby/system/MemoryVector.hh +++ b/src/mem/ruby/system/MemoryVector.hh @@ -48,16 +48,16 @@ class MemoryVector void resize(uint64 size); // destructive - void write(const Address & paddr, uint8* data, int len); - uint8* read(const Address & paddr, uint8* data, int len); - uint32 collatePages(uint8* &raw_data); - void populatePages(uint8* raw_data); + void write(const Address & paddr, uint8_t *data, int len); + uint8_t *read(const Address & paddr, uint8_t *data, int len); + uint32 collatePages(uint8_t *&raw_data); + void populatePages(uint8_t *raw_data); private: - uint8* getBlockPtr(const PhysAddress & addr); + uint8_t *getBlockPtr(const PhysAddress & addr); uint64 m_size; - uint8** m_pages; + uint8_t **m_pages; uint32 m_num_pages; const uint32 m_page_offset_mask; static const uint32 PAGE_SIZE = 4096; @@ -104,12 +104,12 @@ MemoryVector::resize(uint64 size) m_size = size; assert(size%PAGE_SIZE == 0); m_num_pages = size >> 12; - m_pages = new uint8*[m_num_pages]; - memset(m_pages, 0, m_num_pages * sizeof(uint8*)); + m_pages = new uint8_t*[m_num_pages]; + memset(m_pages, 0, m_num_pages * sizeof(uint8_t*)); } inline void -MemoryVector::write(const Address & paddr, uint8* data, int len) +MemoryVector::write(const Address & paddr, uint8_t *data, int len) { assert(paddr.getAddress() + len <= m_size); uint32 page_num = paddr.getAddress() >> 12; @@ -123,7 +123,7 @@ MemoryVector::write(const Address & paddr, uint8* data, int len) } if (all_zeros) return; - m_pages[page_num] = new uint8[PAGE_SIZE]; + m_pages[page_num] = new uint8_t[PAGE_SIZE]; memset(m_pages[page_num], 0, PAGE_SIZE); uint32 offset = paddr.getAddress() & m_page_offset_mask; memcpy(&m_pages[page_num][offset], data, len); @@ -133,8 +133,8 @@ MemoryVector::write(const Address & paddr, uint8* data, int len) } } -inline uint8* -MemoryVector::read(const Address & paddr, uint8* data, int len) +inline uint8_t* +MemoryVector::read(const Address & paddr, uint8_t *data, int len) { assert(paddr.getAddress() + len <= m_size); uint32 page_num = paddr.getAddress() >> 12; @@ -147,12 +147,12 @@ MemoryVector::read(const Address & paddr, uint8* data, int len) return data; } -inline uint8* +inline uint8_t* MemoryVector::getBlockPtr(const PhysAddress & paddr) { uint32 page_num = paddr.getAddress() >> 12; if (m_pages[page_num] == 0) { - m_pages[page_num] = new uint8[PAGE_SIZE]; + m_pages[page_num] = new uint8_t[PAGE_SIZE]; memset(m_pages[page_num], 0, PAGE_SIZE); } return &m_pages[page_num][paddr.getAddress()&m_page_offset_mask]; @@ -167,7 +167,7 @@ MemoryVector::getBlockPtr(const PhysAddress & paddr) */ inline uint32 -MemoryVector::collatePages(uint8* &raw_data) +MemoryVector::collatePages(uint8_t *&raw_data) { uint32 num_zero_pages = 0; uint32 data_size = 0; @@ -177,9 +177,9 @@ MemoryVector::collatePages(uint8* &raw_data) if (m_pages[i] == 0) num_zero_pages++; } - raw_data = new uint8[ sizeof(uint32) /* number of pages*/ - + m_num_pages /* whether the page is all zeros */ - + PAGE_SIZE * (m_num_pages - num_zero_pages)]; + raw_data = new uint8_t[sizeof(uint32) /* number of pages*/ + + m_num_pages /* whether the page is all zeros */ + + PAGE_SIZE * (m_num_pages - num_zero_pages)]; /* Write the number of pages to be stored. */ memcpy(raw_data, &m_num_pages, sizeof(uint32)); @@ -210,7 +210,7 @@ MemoryVector::collatePages(uint8* &raw_data) * in the checkpoint. */ inline void -MemoryVector::populatePages(uint8* raw_data) +MemoryVector::populatePages(uint8_t *raw_data) { uint32 data_size = 0; uint32 num_pages = 0; @@ -226,7 +226,7 @@ MemoryVector::populatePages(uint8* raw_data) { assert(m_pages[i] == 0); if (raw_data[data_size] != 0) { - m_pages[i] = new uint8[PAGE_SIZE]; + m_pages[i] = new uint8_t[PAGE_SIZE]; memcpy(m_pages[i], raw_data + data_size + 1, PAGE_SIZE); data_size += PAGE_SIZE; } |