Merge ktlim@zizzer:/bk/m5

into  zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc

arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
    SCCS merged

--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166

diff --cc arch/alpha/ev5.cc
index 11faf18508c6101ec0e69d56a776c9cef6c3288d,47ada6de60a829aff9fc39b42fa0991c2fc7d5e0..ccdcf750220661d1482d17b53333f1e09f18d783
--- 1/arch/alpha/ev5.cc
--- 2/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@@ -155,6 -152,24 +155,18 @@@ CPUExecContext::hwrei(
      return NoFault;
  }
  
 -void
 -AlphaISA::MiscRegFile::clearIprs()
 -{
 -    bzero((char *)ipr, NumInternalProcRegs * sizeof(InternalProcReg));
 -}
 -
+ int
+ AlphaISA::MiscRegFile::getInstAsid()
+ {
+     return EV5::ITB_ASN_ASN(ipr[IPR_ITB_ASN]);
+ }
+ 
+ int
+ AlphaISA::MiscRegFile::getDataAsid()
+ {
+     return EV5::DTB_ASN_ASN(ipr[IPR_DTB_ASN]);
+ }
+ 
  AlphaISA::MiscReg
  AlphaISA::MiscRegFile::readIpr(int idx, Fault &fault, ExecContext *xc)
  {

diff --cc arch/alpha/isa_traits.hh
Simple merge

diff --cc cpu/o3/alpha_cpu.hh
Simple merge

diff --cc cpu/o3/alpha_cpu_impl.hh
Simple merge

diff --cc cpu/o3/cpu.hh
index 8f29a25fba1ab352874c16e5e685f7e7badb9825,31a1b604baf21cdf8c978f30b147065020b144a6..6577e46e4e99b0103efadf773cae7c3236b353b1
--- 1/cpu/o3/cpu.hh
--- 2/cpu/o3/cpu.hh
+++ b/cpu/o3/cpu.hh
@@@ -44,17 -44,11 +44,12 @@@
  #include "base/timebuf.hh"
  #include "config/full_system.hh"
  #include "cpu/base.hh"
 +#include "cpu/cpu_exec_context.hh"
  #include "cpu/o3/comm.hh"
  #include "cpu/o3/cpu_policy.hh"
 -#include "cpu/exec_context.hh"
  #include "sim/process.hh"
  
- #if FULL_SYSTEM
- #include "arch/ev5.hh"
- using namespace EV5;
- #endif
- 
 +class ExecContext;
  class FunctionalMemory;
  class Process;