derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PageTable code and SConscript fixes for new syscall emulation

Browse Source 
memory model.  These changes really should have been part of the
previous changeset.

SConscript:
    Move System and PhysicalMemory sources from being full_system_sources
    to base_sources, since they are now used in syscall emulation also.
    Also add source files for PageTable and ProxyMemory objects.
    Actual source files for PhysicalMemory and ProxyMemory are not committed
    yet since they still need to be ported from old interface.

--HG--
extra : convert_revision : cb39e3b13d71429b7ee6082794dc09428cde989f
This commit is contained in:
Steve Reinhardt
2006-01-29 17:28:04 -05:00
parent 03a2aca9a9
commit 07948528fc
3 changed files with 223 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SConscript
View File

@@ -169,6 +169,7 @@ base_sources = Split('''
mem/mem_debug.cc
mem/mem_req.cc
mem/memory_interface.cc
mem/page_table.cc
mem/bus/base_interface.cc
mem/bus/bus.cc
mem/bus/bus_bridge.cc
@@ -202,6 +203,8 @@ base_sources = Split('''
mem/cache/tags/split_lru.cc
mem/cache/tags/split_lifo.cc
mem/functional/functional.cc
mem/functional/physical.cc
mem/functional/proxy.cc
mem/timing/base_memory.cc
mem/timing/memory_builder.cc
mem/timing/simple_mem_bank.cc
@@ -227,6 +230,7 @@ base_sources = Split('''
sim/startup.cc
sim/stat_context.cc
sim/stat_control.cc
sim/system.cc
sim/trace_context.cc
''')
@@ -296,9 +300,6 @@ full_system_sources = Split('''
kern/tru64/tru64_system.cc
mem/functional/memory_control.cc
mem/functional/physical.cc
sim/system.cc
''')
# turbolaser encumbered sources

131
mem/page_table.cc Normal file
View File

@@ -0,0 +1,131 @@
/*
* Copyright (c) 2003 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file
* Definitions of page table.
*/
#include <string>
#include <map>
#include <fstream>
#include "base/bitfield.hh"
#include "base/intmath.hh"
#include "base/trace.hh"
#include "mem/mem_cmd.hh"
#include "mem/mem_req.hh"
#include "mem/page_table.hh"
#include "sim/builder.hh"
#include "sim/sim_object.hh"
#include "sim/system.hh"
using namespace std;
PageTable::PageTable(System *_system, Addr _pageSize)
: pageSize(_pageSize), offsetMask(mask(FloorLog2(_pageSize))),
system(_system)
{
assert(IsPowerOf2(pageSize));
}
PageTable::~PageTable()
{
}
Fault
PageTable::page_check(Addr addr, int size) const
{
if (size < sizeof(uint64_t)) {
if (!IsPowerOf2(size)) {
panic("Invalid request size!\n");
return Machine_Check_Fault;
}
if ((size - 1) & addr)
return Alignment_Fault;
}
else {
if ((addr & (VMPageSize - 1)) + size > VMPageSize) {
panic("Invalid request size!\n");
return Machine_Check_Fault;
}
if ((sizeof(uint64_t) - 1) & addr)
return Alignment_Fault;
}
return No_Fault;
}
void
PageTable::allocate(Addr vaddr, int size)
{
// starting address must be page aligned
assert(pageOffset(vaddr) == 0);
for (; size > 0; size -= pageSize, vaddr += pageSize) {
std::map<Addr,Addr>::iterator iter = pTable.find(vaddr);
if (iter != pTable.end()) {
// already mapped
fatal("PageTable::allocate: address 0x%x already mapped", vaddr);
}
pTable[vaddr] = system->new_page();
}
}
bool
PageTable::translate(Addr vaddr, Addr &paddr)
{
Addr page_addr = pageAlign(vaddr);
std::map<Addr,Addr>::iterator iter = pTable.find(page_addr);
if (iter == pTable.end()) {
return false;
}
paddr = iter->second + pageOffset(vaddr);
return true;
}
Fault
PageTable::translate(MemReqPtr &req)
{
assert(pageAlign(req->vaddr + req->size - 1) == pageAlign(req->vaddr));
if (!translate(req->vaddr, req->paddr)) {
return Machine_Check_Fault;
}
return page_check(req->paddr, req->size);
}

88
mem/page_table.hh Normal file
View File

@@ -0,0 +1,88 @@
/*
* Copyright (c) 2003 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file
* Declaration of a non-full system Page Table.
*/
#ifndef __PAGE_TABLE__
#define __PAGE_TABLE__
#include <string>
#include <map>
#include "base/trace.hh"
#include "mem/mem_req.hh"
#include "mem/mem_cmd.hh"
#include "sim/sim_object.hh"
class System;
/**
* Page Table Decleration.
*/
class PageTable
{
protected:
std::map<Addr,Addr> pTable;
const Addr pageSize;
const Addr offsetMask;
System *system;
public:
PageTable(System *_system, Addr _pageSize = VMPageSize);
~PageTable();
Addr pageAlign(Addr a) { return (a & ~offsetMask); }
Addr pageOffset(Addr a) { return (a & offsetMask); }
Fault page_check(Addr addr, int size) const;
void allocate(Addr vaddr, int size);
/**
* Translate function
* @param vaddr The virtual address.
* @return Physical address from translation.
*/
bool translate(Addr vaddr, Addr &paddr);
/**
* Perform a translation on the memory request, fills in paddr field of mem_req.
* @param req The memory request.
*/
Fault translate(MemReqPtr &req);
};
#endif