summaryrefslogtreecommitdiff
path: root/src/arch/sparc/asi.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-03-03 19:03:22 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-03-03 19:03:22 -0500
commit82874eefca231fa960fbd39a90ed98929915c414 (patch)
tree8646c2358edec660d123e45d20885a366d0815de /src/arch/sparc/asi.cc
parent61178c8de20d334e9c5cf0454d453880a5fff928 (diff)
parent1694c65ba169a555bd642d3352c65be41a36ce4d (diff)
downloadgem5-82874eefca231fa960fbd39a90ed98929915c414.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : fd6464c9883783c7c2cbefba317f4a0f20dd24cb
Diffstat (limited to 'src/arch/sparc/asi.cc')
-rw-r--r--src/arch/sparc/asi.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/sparc/asi.cc b/src/arch/sparc/asi.cc
index 3d553955f..d8cd84af5 100644
--- a/src/arch/sparc/asi.cc
+++ b/src/arch/sparc/asi.cc
@@ -294,7 +294,8 @@ namespace SparcISA
bool AsiIsReg(ASI asi)
{
- return AsiIsMmu(asi) || AsiIsScratchPad(asi) | AsiIsSparcError(asi);
+ return AsiIsMmu(asi) || AsiIsScratchPad(asi) ||
+ AsiIsSparcError(asi) || AsiIsInterrupt(asi);
}
bool AsiIsSparcError(ASI asi)