summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoel Hestness <hestness@cs.utexas.edu>2011-02-06 22:14:17 -0800
committerJoel Hestness <hestness@cs.utexas.edu>2011-02-06 22:14:17 -0800
commit38140b5519d7fb925e7a5c53be72399243112c80 (patch)
tree4c45ada2a1766350682d36724ade553a91462a64 /src
parenteea78f968b8c959e377bcdf50203c070de5057ac (diff)
downloadgem5-38140b5519d7fb925e7a5c53be72399243112c80.tar.xz
x86: implements vtophys
Calls walker to look up virt. to phys. page mapping
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/pagetable_walker.hh1
-rw-r--r--src/arch/x86/system.cc1
-rw-r--r--src/arch/x86/vtophys.cc29
-rw-r--r--src/arch/x86/vtophys.hh3
4 files changed, 28 insertions, 6 deletions
diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh
index 38ce6ce02..68f85be93 100644
--- a/src/arch/x86/pagetable_walker.hh
+++ b/src/arch/x86/pagetable_walker.hh
@@ -48,6 +48,7 @@
#include "mem/mem_object.hh"
#include "mem/packet.hh"
#include "params/X86PagetableWalker.hh"
+#include "sim/faults.hh"
class ThreadContext;
diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index 3fc16e729..20ee484fb 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -39,6 +39,7 @@
#include "arch/x86/bios/smbios.hh"
#include "arch/x86/bios/intelmp.hh"
+#include "arch/x86/isa_traits.hh"
#include "arch/x86/regs/misc.hh"
#include "arch/x86/system.hh"
#include "arch/vtophys.hh"
diff --git a/src/arch/x86/vtophys.cc b/src/arch/x86/vtophys.cc
index e0bb6c993..3a6932564 100644
--- a/src/arch/x86/vtophys.cc
+++ b/src/arch/x86/vtophys.cc
@@ -39,19 +39,42 @@
#include <string>
+#include "arch/x86/pagetable_walker.hh"
+#include "arch/x86/tlb.hh"
#include "arch/x86/vtophys.hh"
+#include "base/trace.hh"
+#include "config/full_system.hh"
+#include "cpu/thread_context.hh"
+#include "sim/fault.hh"
using namespace std;
namespace X86ISA
{
- Addr vtophys(Addr vaddr)
+ Addr
+ vtophys(Addr vaddr)
{
+#if FULL_SYSTEM
+ panic("Need access to page tables\n");
+#endif
return vaddr;
}
- Addr vtophys(ThreadContext *tc, Addr addr)
+ Addr
+ vtophys(ThreadContext *tc, Addr vaddr)
{
- return addr;
+#if FULL_SYSTEM
+ Walker *walker = tc->getDTBPtr()->getWalker();
+ Addr size;
+ Addr addr = vaddr;
+ Fault fault = walker->startFunctional(tc, addr, size, BaseTLB::Read);
+ if (fault != NoFault)
+ panic("vtophys page walk returned fault\n");
+ Addr masked_addr = vaddr & (size - 1);
+ Addr paddr = addr | masked_addr;
+ DPRINTF(VtoPhys, "vtophys(%#x) -> %#x\n", vaddr, paddr);
+ return paddr;
+#endif
+ return vaddr;
}
}
diff --git a/src/arch/x86/vtophys.hh b/src/arch/x86/vtophys.hh
index 8b8ddf467..10522313c 100644
--- a/src/arch/x86/vtophys.hh
+++ b/src/arch/x86/vtophys.hh
@@ -40,12 +40,9 @@
#ifndef __ARCH_X86_VTOPHYS_HH__
#define __ARCH_X86_VTOPHYS_HH__
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/pagetable.hh"
#include "base/types.hh"
class ThreadContext;
-class FunctionalPort;
namespace X86ISA
{