Merge ktlim@zizzer:/bk/m5

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

arch/alpha/isa/mem.isa:
    Hand merge.

--HG--
extra : convert_revision : c557aa4c867d84ab01139e509ee9f2ed05dd8ea0

diff --cc arch/alpha/isa/mem.isa
index 0b79bc3765845872ac12af5198d771a98a3f7e02,37d0dcf14d6dd294dc9bf4c8833de87396fcdb91..df26a534d3843b12467321dbf466ba2f3c8c3ea9
--- 1/arch/alpha/isa/mem.isa
--- 2/arch/alpha/isa/mem.isa
+++ b/arch/alpha/isa/mem.isa
@@@ -287,8 -287,7 +287,7 @@@ def template LoadInitiateAcc {
                                        Trace::InstRecord *traceData) const
      {
          Addr EA;
 -        Fault fault = No_Fault;
 +        Fault * fault = NoFault;
-         %(mem_acc_type)s Mem = 0;
  
          %(fp_enable_check)s;
          %(op_src_decl)s;
@@@ -309,10 -308,10 +308,10 @@@ def template LoadCompleteAcc {
                                        %(CPU_exec_context)s *xc,
                                        Trace::InstRecord *traceData) const
      {
 -        Fault fault = No_Fault;
 +        Fault * fault = NoFault;
-         %(mem_acc_type)s Mem = 0;
  
          %(fp_enable_check)s;
+         %(op_src_decl)s;
          %(op_dest_decl)s;
  
          memcpy(&Mem, data, sizeof(Mem));
@@@ -407,9 -406,8 +406,8 @@@ def template StoreInitiateAcc {
                                        Trace::InstRecord *traceData) const
      {
          Addr EA;
 -        Fault fault = No_Fault;
 +        Fault * fault = NoFault;
          uint64_t write_result = 0;
-         %(mem_acc_type)s Mem = 0;
  
          %(fp_enable_check)s;
          %(op_src_decl)s;
@@@ -498,22 -497,12 +497,11 @@@ def template MiscExecute {
  }};
  
  def template MiscInitiateAcc {{
 -    Fault %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc,
 +    Fault * %(class_name)s::initiateAcc(%(CPU_exec_context)s *xc,
                                        Trace::InstRecord *traceData) const
      {
-         Addr EA;
-         Fault * fault = NoFault;
- 
-         %(fp_enable_check)s;
-         %(op_decl)s;
-         %(op_rd)s;
-         %(ea_code)s;
- 
-         if (fault == NoFault) {
-             %(memacc_code)s;
-         }
- 
+         panic("Misc instruction does not support split access method!");
 -
 -        return No_Fault;
 +        return NoFault;
      }
  }};
  
@@@ -523,7 -512,9 +511,9 @@@ def template MiscCompleteAcc {
                                        %(CPU_exec_context)s *xc,
                                        Trace::InstRecord *traceData) const
      {
 -        return No_Fault;
+         panic("Misc instruction does not support split access method!");
+ 
 +        return NoFault;
      }
  }};