diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-08-26 20:33:57 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-08-26 20:33:57 -0700 |
commit | 9b49a78cfdc0bd6f8afdb0d066ea39778095d7ac (patch) | |
tree | b4a977c8d7379ac552d245847825a73b61bf8c5b /src/mem/page_table.hh | |
parent | 80d51650c8bce1503e5ce3877f3bfe21d3e57d45 (diff) | |
download | gem5-9b49a78cfdc0bd6f8afdb0d066ea39778095d7ac.tar.xz |
Address translation: Make the page table more flexible.
The page table now stores actual page table entries. It is still a templated
class here, but this will be corrected in the near future.
--HG--
extra : convert_revision : 804dcc6320414c2b3ab76a74a15295bd24e1d13d
Diffstat (limited to 'src/mem/page_table.hh')
-rw-r--r-- | src/mem/page_table.hh | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh index 64c824238..845bb9112 100644 --- a/src/mem/page_table.hh +++ b/src/mem/page_table.hh @@ -40,11 +40,11 @@ #include "sim/faults.hh" #include "arch/isa_traits.hh" +#include "arch/tlb.hh" #include "base/hashmap.hh" -#include "base/trace.hh" #include "mem/request.hh" -#include "mem/packet.hh" -#include "sim/sim_object.hh" +#include "sim/host.hh" +#include "sim/serialize.hh" class System; @@ -54,12 +54,14 @@ class System; class PageTable { protected: - m5::hash_map<Addr,Addr> pTable; + typedef m5::hash_map<Addr, TheISA::TlbEntry> PTable; + typedef PTable::iterator PTableItr; + PTable pTable; struct cacheElement { - Addr paddr; Addr vaddr; - } ; + TheISA::TlbEntry entry; + }; struct cacheElement pTableCache[3]; @@ -77,11 +79,16 @@ class PageTable Addr pageAlign(Addr a) { return (a & ~offsetMask); } Addr pageOffset(Addr a) { return (a & offsetMask); } - Fault page_check(Addr addr, int64_t size) const; - void allocate(Addr vaddr, int64_t size); /** + * Lookup function + * @param vaddr The virtual address. + * @return entry The page table entry corresponding to vaddr. + */ + bool lookup(Addr vaddr, TheISA::TlbEntry &entry); + + /** * Translate function * @param vaddr The virtual address. * @return Physical address from translation. @@ -90,28 +97,29 @@ class PageTable /** * Perform a translation on the memory request, fills in paddr - * field of mem_req. + * field of req. * @param req The memory request. */ - Fault translate(RequestPtr &req); + Fault translate(RequestPtr req); /** * Update the page table cache. * @param vaddr virtual address (page aligned) to check - * @param paddr physical address (page aligned) to return + * @param pte page table entry to return */ - inline void updateCache(Addr vaddr, Addr paddr) + inline void updateCache(Addr vaddr, TheISA::TlbEntry entry) { - pTableCache[2].paddr = pTableCache[1].paddr; + pTableCache[2].entry = pTableCache[1].entry; pTableCache[2].vaddr = pTableCache[1].vaddr; - pTableCache[1].paddr = pTableCache[0].paddr; + pTableCache[1].entry = pTableCache[0].entry; pTableCache[1].vaddr = pTableCache[0].vaddr; - pTableCache[0].paddr = paddr; + pTableCache[0].entry = entry; pTableCache[0].vaddr = vaddr; } void serialize(std::ostream &os); + void unserialize(Checkpoint *cp, const std::string §ion); }; |