diff options
author | Ali Saidi <Ali.Saidi@ARM.com> | 2010-11-19 18:01:01 -0600 |
---|---|---|
committer | Ali Saidi <Ali.Saidi@ARM.com> | 2010-11-19 18:01:01 -0600 |
commit | 34a8e37c1319dc19c10d239834030793733dc475 (patch) | |
tree | 7cb543ca445438e2ddcb7d83625758b0a191ed7f /src/mem | |
parent | 5c6f4a0f17f1f74bf913ce49f14517084949b8ed (diff) | |
download | gem5-34a8e37c1319dc19c10d239834030793733dc475.tar.xz |
SE: Fix simulating more than 4GB of RAM in SE mode
This change removes some dead code in PhysicalMemory, uses a 64 bit type
for the page pointer in System (instead of 32 bit) and cleans up some style.
Diffstat (limited to 'src/mem')
-rw-r--r-- | src/mem/physical.cc | 13 | ||||
-rw-r--r-- | src/mem/physical.hh | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/mem/physical.cc b/src/mem/physical.cc index c24300cad..937fb80a2 100644 --- a/src/mem/physical.cc +++ b/src/mem/physical.cc @@ -68,8 +68,7 @@ using namespace std; using namespace TheISA; PhysicalMemory::PhysicalMemory(const Params *p) - : MemObject(p), pmemAddr(NULL), pagePtr(0), - lat(p->latency), lat_var(p->latency_var), + : MemObject(p), pmemAddr(NULL), lat(p->latency), lat_var(p->latency_var), _size(params()->range.size()), _start(params()->range.start) { if (size() % TheISA::PageBytes != 0) @@ -124,16 +123,6 @@ PhysicalMemory::~PhysicalMemory() munmap((char*)pmemAddr, size()); } -Addr -PhysicalMemory::new_page() -{ - Addr return_addr = pagePtr << LogVMPageSize; - return_addr += start(); - - ++pagePtr; - return return_addr; -} - unsigned PhysicalMemory::deviceBlockSize() const { diff --git a/src/mem/physical.hh b/src/mem/physical.hh index a19db4d9d..cd6d809e2 100644 --- a/src/mem/physical.hh +++ b/src/mem/physical.hh @@ -148,7 +148,6 @@ class PhysicalMemory : public MemObject } uint8_t *pmemAddr; - int pagePtr; Tick lat; Tick lat_var; std::vector<MemoryPort*> ports; @@ -157,7 +156,6 @@ class PhysicalMemory : public MemObject uint64_t _size; uint64_t _start; public: - Addr new_page(); uint64_t size() { return _size; } uint64_t start() { return _start; } |