diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-15 21:07:04 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-15 21:07:04 -0800 |
| commit | f47dcadfd8b50e97b51c05b72f19063b39686a7c (patch) | |
| tree | 5b05ef12c1d674d841b45cfa65dae415b7e9449f /arch/alpha/alpha_memory.cc | |
| parent | ce4aba3e54eb69b0902c75de2db1810ed7dcfe6b (diff) | |
| parent | 2cd5e980d2e7b33d61b5a5639784b424fa74142a (diff) | |
| download | gem5-f47dcadfd8b50e97b51c05b72f19063b39686a7c.tar.xz | |
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : dd887635c7ce74324b3670744461ffdf92e1dedf
Diffstat (limited to 'arch/alpha/alpha_memory.cc')
| -rw-r--r-- | arch/alpha/alpha_memory.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc index c79b821d0..d934299b8 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/alpha_memory.cc @@ -436,12 +436,12 @@ AlphaDtb::translate(MemReqPtr req, bool write) const else read_accesses++; - AlphaISA::md_mode_type mode = - (AlphaISA::md_mode_type)DTB_CM_CM(ipr[AlphaISA::IPR_DTB_CM]); + AlphaISA::mode_type mode = + (AlphaISA::mode_type)DTB_CM_CM(ipr[AlphaISA::IPR_DTB_CM]); if (PC_PAL(pc)) { - mode = (req->flags & ALTMODE) ? (AlphaISA::md_mode_type) - (ALT_MODE_AM(ipr[AlphaISA::IPR_ALT_MODE])) + mode = (req->flags & ALTMODE) ? + (AlphaISA::mode_type)ALT_MODE_AM(ipr[AlphaISA::IPR_ALT_MODE]) : AlphaISA::mode_kernel; } |