diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-04-10 12:37:15 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-04-10 12:37:15 -0400 |
| commit | f51656498ea4c3418499f25e5a7a24b4c71be122 (patch) | |
| tree | f54ef3c2ec601519e0cc98f007705e56a4b20dc0 /mem/page_table.hh | |
| parent | ae1a95ed9c9aa2b3c97272570575345dc3c37799 (diff) | |
| parent | 4f430e9ab56443e822171b7881f4d50475dbaf25 (diff) | |
| download | gem5-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/page_table.hh')
| -rw-r--r-- | mem/page_table.hh | 2 |
1 files changed, 1 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); |