diff options
Diffstat (limited to 'mem')
| -rw-r--r-- | mem/page_table.cc | 8 | ||||
| -rw-r--r-- | mem/page_table.hh | 2 | ||||
| -rw-r--r-- | mem/request.hh | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mem/page_table.cc b/mem/page_table.cc index 714ddde35..eb2c7cdbb 100644 --- a/mem/page_table.cc +++ b/mem/page_table.cc @@ -58,7 +58,7 @@ PageTable::~PageTable() } Fault -PageTable::page_check(Addr addr, int size) const +PageTable::page_check(Addr addr, int size, uint32_t flags) const { if (size < sizeof(uint64_t)) { if (!isPowerOf2(size)) { @@ -66,7 +66,7 @@ PageTable::page_check(Addr addr, int size) const return genMachineCheckFault(); } - if ((size - 1) & addr) + if (((size - 1) & addr) && (flags & NO_ALIGN_FAULT == 0)) return genAlignmentFault(); } else { @@ -75,7 +75,7 @@ PageTable::page_check(Addr addr, int size) const return genMachineCheckFault(); } - if ((sizeof(uint64_t) - 1) & addr) + if (((sizeof(uint64_t) - 1) & addr) && (flags & NO_ALIGN_FAULT == 0)) return genAlignmentFault(); } @@ -127,5 +127,5 @@ PageTable::translate(CpuRequestPtr &req) if (!translate(req->vaddr, req->paddr)) { return genMachineCheckFault(); } - return page_check(req->paddr, req->size); + return page_check(req->paddr, req->size, req->flags); } diff --git a/mem/page_table.hh b/mem/page_table.hh index 8f0842f58..66cce7cd6 100644 --- a/mem/page_table.hh +++ b/mem/page_table.hh @@ -67,7 +67,7 @@ class PageTable Addr pageAlign(Addr a) { return (a & ~offsetMask); } Addr pageOffset(Addr a) { return (a & offsetMask); } - Fault page_check(Addr addr, int size) const; + Fault page_check(Addr addr, int size, uint32_t flags) const; void allocate(Addr vaddr, int size); diff --git a/mem/request.hh b/mem/request.hh index 5e2275741..4b4703a0b 100644 --- a/mem/request.hh +++ b/mem/request.hh @@ -58,6 +58,8 @@ const unsigned NO_FAULT = 0x020; const unsigned PF_EXCLUSIVE = 0x100; /** The request should be marked as LRU. */ const unsigned EVICT_NEXT = 0x200; +/** The request should ignore unaligned access faults */ +const unsigned NO_ALIGN_FAULT = 0x400; class Request { |