diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /arch/alpha/vtophys.hh | |
parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'arch/alpha/vtophys.hh')
-rw-r--r-- | arch/alpha/vtophys.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/vtophys.hh b/arch/alpha/vtophys.hh index 95430ce77..988f050ba 100644 --- a/arch/alpha/vtophys.hh +++ b/arch/alpha/vtophys.hh @@ -35,16 +35,16 @@ class ExecContext; class PhysicalMemory; AlphaISA::PageTableEntry -kernel_pte_lookup(PhysicalMemory *pmem, Addr ptbr, AlphaISA::VAddr vaddr); +kernel_pte_lookup(PhysicalMemory *pmem, AlphaISA::Addr ptbr, AlphaISA::VAddr vaddr); -Addr vtophys(PhysicalMemory *xc, Addr vaddr); -Addr vtophys(ExecContext *xc, Addr vaddr); -uint8_t *vtomem(ExecContext *xc, Addr vaddr, size_t len); -uint8_t *ptomem(ExecContext *xc, Addr paddr, size_t len); +AlphaISA::Addr vtophys(PhysicalMemory *xc, AlphaISA::Addr vaddr); +AlphaISA::Addr vtophys(ExecContext *xc, AlphaISA::Addr vaddr); +uint8_t *vtomem(ExecContext *xc, AlphaISA::Addr vaddr, size_t len); +uint8_t *ptomem(ExecContext *xc, AlphaISA::Addr paddr, size_t len); -void CopyOut(ExecContext *xc, void *dst, Addr src, size_t len); -void CopyIn(ExecContext *xc, Addr dst, void *src, size_t len); -void CopyString(ExecContext *xc, char *dst, Addr vaddr, size_t maxlen); +void CopyOut(ExecContext *xc, void *dst, AlphaISA::Addr src, size_t len); +void CopyIn(ExecContext *xc, AlphaISA::Addr dst, void *src, size_t len); +void CopyString(ExecContext *xc, char *dst, AlphaISA::Addr vaddr, size_t maxlen); #endif // __ARCH_ALPHA_VTOPHYS_H__ |