diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
commit | cd6eb5396569bd2a3b16148f0d5277f7f4ee1391 (patch) | |
tree | f587628bf43f6374ca351c295116b8b70fc90aee /src/arch/alpha/vtophys.hh | |
parent | 74546aac0124a5ba09a0e6bfef18dc3e0b7509b8 (diff) | |
parent | c9900f159e8d2fd7e32070e2cd0971caf917431d (diff) | |
download | gem5-cd6eb5396569bd2a3b16148f0d5277f7f4ee1391.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/cpu/static_inst.hh:
SCCS merged
--HG--
extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250
Diffstat (limited to 'src/arch/alpha/vtophys.hh')
-rw-r--r-- | src/arch/alpha/vtophys.hh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/arch/alpha/vtophys.hh b/src/arch/alpha/vtophys.hh index 472c694ff..32b999c37 100644 --- a/src/arch/alpha/vtophys.hh +++ b/src/arch/alpha/vtophys.hh @@ -33,22 +33,24 @@ #define __ARCH_ALPHA_VTOPHYS_H__ #include "arch/alpha/isa_traits.hh" +#include "arch/alpha/pagetable.hh" +#include "arch/alpha/utility.hh" class ThreadContext; class FunctionalPort; namespace AlphaISA { -PageTableEntry -kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, AlphaISA::VAddr vaddr); + PageTableEntry + kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, AlphaISA::VAddr vaddr); -Addr vtophys(Addr vaddr); -Addr vtophys(ThreadContext *tc, Addr vaddr); + Addr vtophys(Addr vaddr); + Addr vtophys(ThreadContext *tc, Addr vaddr); -void CopyOut(ThreadContext *tc, void *dst, Addr src, size_t len); -void CopyIn(ThreadContext *tc, Addr dst, void *src, size_t len); -void CopyStringOut(ThreadContext *tc, char *dst, Addr vaddr, size_t maxlen); -void CopyStringIn(ThreadContext *tc, char *src, Addr vaddr); + void CopyOut(ThreadContext *tc, void *dst, Addr src, size_t len); + void CopyIn(ThreadContext *tc, Addr dst, void *src, size_t len); + void CopyStringOut(ThreadContext *tc, char *dst, Addr vaddr, size_t maxlen); + void CopyStringIn(ThreadContext *tc, char *src, Addr vaddr); }; #endif // __ARCH_ALPHA_VTOPHYS_H__ |