summaryrefslogtreecommitdiff
path: root/mem
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-04-10 12:37:15 -0400
committerKorey Sewell <ksewell@umich.edu>2006-04-10 12:37:15 -0400
commitf51656498ea4c3418499f25e5a7a24b4c71be122 (patch)
treef54ef3c2ec601519e0cc98f007705e56a4b20dc0 /mem
parentae1a95ed9c9aa2b3c97272570575345dc3c37799 (diff)
parent4f430e9ab56443e822171b7881f4d50475dbaf25 (diff)
downloadgem5-f51656498ea4c3418499f25e5a7a24b4c71be122.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips arch/mips/isa/formats/mem.isa: Filled in Split-Memory Access Code arch/mips/isa_traits.hh: Leave IntRegFile as an array instead of class with member functions mem/page_table.cc: take out NO ALIGN FAULT page table access code for now... No need to messs up what works --HG-- extra : convert_revision : cbf1cce9145daf9ee9ceabc9080271ddb0561489
Diffstat (limited to 'mem')
-rw-r--r--mem/page_table.hh2
-rw-r--r--mem/request.hh2
2 files changed, 3 insertions, 1 deletions
diff --git a/mem/page_table.hh b/mem/page_table.hh
index 26248261a..c799f8acd 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 e9b1672ce..90c46646e 100644
--- a/mem/request.hh
+++ b/mem/request.hh
@@ -56,6 +56,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
{