diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-05-31 18:58:54 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-05-31 18:58:54 -0400 |
| commit | 93983de0cfa06e58f1d448782269ebd33341ae83 (patch) | |
| tree | 16d50228d138b5334f8cd1d3feffcfdd2c3adacf /arch/alpha/alpha_memory.cc | |
| parent | 9d0aa1399157bd90436409a7596377b4591a2d4a (diff) | |
| parent | 6964ecd1cf14f294a300e91bc5b65042d03952d4 (diff) | |
| download | gem5-93983de0cfa06e58f1d448782269ebd33341ae83.tar.xz | |
Merged head into linux tree
base/stats/mysql.hh:
Rename of Statsistics namespace to stats... merge from head
--HG--
extra : convert_revision : a5a7f6268b35e75fba1b1800a74fcd6dbd09d974
Diffstat (limited to 'arch/alpha/alpha_memory.cc')
| -rw-r--r-- | arch/alpha/alpha_memory.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc index 1a1c738ec..31f5a9b20 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/alpha_memory.cc @@ -440,8 +440,8 @@ AlphaDTB::fault(Addr vaddr, uint64_t flags, ExecContext *xc) const ipr[AlphaISA::IPR_VA] = vaddr; // set MM_STAT register flags - ipr[AlphaISA::IPR_MM_STAT] = (((xc->regs.opcode & 0x3f) << 11) - | ((xc->regs.ra & 0x1f) << 6) + ipr[AlphaISA::IPR_MM_STAT] = (((OPCODE(xc->getInst()) & 0x3f) << 11) + | ((RA(xc->getInst()) & 0x1f) << 6) | (flags & 0x3f)); // set VA_FORM register with faulting formatted address |