Merge zeep.eecs.umich.edu:/home/gblack/m5/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

src/arch/sparc/faults.hh:
    Hand merged.

--HG--
extra : convert_revision : 1bcefe47fa98e878a0dfbcfa5869b5b171927911

diff --cc src/arch/sparc/faults.cc
Simple merge

diff --cc src/arch/sparc/faults.hh
index b25b7706e047005a0dbbfbb94011d78ec1203772,22f83c1e5bb483076b075a5c59712c78b3c6f1f1..677f8e77ea704cdf43ffb6cc6cd684c15697316f
--- 1/src/arch/sparc/faults.hh
--- 2/src/arch/sparc/faults.hh
+++ b/src/arch/sparc/faults.hh
@@@ -118,504 -113,120 +113,124 @@@ static inline Fault genAlignmentFault(
      return new MemAddressNotAligned;
  }
  
- class PowerOnReset : public SparcFault
 -class PowerOnReset : public SparcFault<PowerOnReset> {};
++class PowerOnReset : public SparcFault<PowerOnReset>
 +{
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
 +    void invoke(ThreadContext * tc);
 +};
  
- class WatchDogReset : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class WatchDogReset : public SparcFault<WatchDogReset> {};
  
- class ExternallyInitiatedReset : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class ExternallyInitiatedReset : public SparcFault<ExternallyInitiatedReset> {};
  
- class SoftwareInitiatedReset : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class SoftwareInitiatedReset : public SparcFault<SoftwareInitiatedReset> {};
  
- class REDStateException : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class REDStateException : public SparcFault<REDStateException> {};
  
- class InstructionAccessException : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class InstructionAccessException : public SparcFault<InstructionAccessException> {};
  
- class InstructionAccessMMUMiss : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class InstructionAccessMMUMiss : public SparcFault<InstructionAccessMMUMiss> {};
  
- class InstructionAccessError : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class InstructionAccessError : public SparcFault<InstructionAccessError> {};
  
- class IllegalInstruction : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class IllegalInstruction : public SparcFault<IllegalInstruction> {};
  
- class PrivilegedOpcode : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class PrivilegedOpcode : public SparcFault<PrivilegedOpcode> {};
  
- class UnimplementedLDD : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class UnimplementedLDD : public SparcFault<UnimplementedLDD> {};
  
- class UnimplementedSTD : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class UnimplementedSTD : public SparcFault<UnimplementedSTD> {};
  
- class FpDisabled : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class FpDisabled : public SparcFault<FpDisabled> {};
  
- class FpExceptionIEEE754 : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class FpExceptionIEEE754 : public SparcFault<FpExceptionIEEE754> {};
  
- class FpExceptionOther : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class FpExceptionOther : public SparcFault<FpExceptionOther> {};
  
- class TagOverflow : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class TagOverflow : public SparcFault<TagOverflow> {};
  
- class DivisionByZero : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class DivisionByZero : public SparcFault<DivisionByZero> {};
  
- class DataAccessException : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class DataAccessException : public SparcFault<DataAccessException> {};
  
- class DataAccessMMUMiss : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class DataAccessMMUMiss : public SparcFault<DataAccessMMUMiss> {};
  
- class DataAccessError : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class DataAccessError : public SparcFault<DataAccessError> {};
  
- class DataAccessProtection : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class DataAccessProtection : public SparcFault<DataAccessProtection> {};
  
- class LDDFMemAddressNotAligned : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class LDDFMemAddressNotAligned : public SparcFault<LDDFMemAddressNotAligned> {};
  
- class STDFMemAddressNotAligned : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class STDFMemAddressNotAligned : public SparcFault<STDFMemAddressNotAligned> {};
  
- class PrivilegedAction : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class PrivilegedAction : public SparcFault<PrivilegedAction> {};
  
- class LDQFMemAddressNotAligned : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class LDQFMemAddressNotAligned : public SparcFault<LDQFMemAddressNotAligned> {};
  
- class STQFMemAddressNotAligned : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class STQFMemAddressNotAligned : public SparcFault<STQFMemAddressNotAligned> {};
  
- class AsyncDataError : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class AsyncDataError : public SparcFault<AsyncDataError> {};
  
- class CleanWindow : public SparcFault
- {
-   private:
-     static FaultName _name;
-     static TrapType _trapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-   public:
-     FaultName name() {return _name;}
-     TrapType trapType() {return _trapType;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
- };
+ class CleanWindow : public SparcFault<CleanWindow> {};
  
- class EnumeratedFault : public SparcFault
+ template <class T>
+ class EnumeratedFault : public SparcFault<T>
  {
    protected:
      uint32_t _n;
-     virtual TrapType baseTrapType() = 0;
    public:
-     EnumeratedFault(uint32_t n) : SparcFault() {_n = n;}
-     TrapType trapType() {return baseTrapType() + _n;}
+     EnumeratedFault(uint32_t n) : SparcFault<T>(), _n(n) {}
+     TrapType trapType() {return SparcFault<T>::trapType() + _n;}
  };
  
- class InterruptLevelN : public EnumeratedFault
+ class InterruptLevelN : public EnumeratedFault<InterruptLevelN>
  {
-   private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
    public:
-     InterruptLevelN(uint32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
+     InterruptLevelN(uint32_t n) :
+         EnumeratedFault<InterruptLevelN>(n) {;}
      FaultPriority priority() {return 32 - _n;}
-     FaultStat & countStat() {return _count;}
  };
  
- class SpillNNormal : public EnumeratedFault
+ class SpillNNormal : public EnumeratedFault<SpillNNormal>
  {
-   private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
    public:
-     SpillNNormal(uint32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
+     SpillNNormal(uint32_t n) :
+         EnumeratedFault<SpillNNormal>(n) {;}
 +    //These need to be handled specially to enable spill traps in SE
 +#if !FULL_SYSTEM
      void invoke(ThreadContext * tc);
 +#endif
  };
  
- class SpillNOther : public EnumeratedFault
+ class SpillNOther : public EnumeratedFault<SpillNOther>
  {
-   private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
    public:
-     SpillNOther(uint32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
+     SpillNOther(uint32_t n) :
+         EnumeratedFault<SpillNOther>(n) {;}
  };
  
- class FillNNormal : public EnumeratedFault
+ class FillNNormal : public EnumeratedFault<FillNNormal>
  {
-   private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
    public:
-     FillNNormal(uint32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
+     FillNNormal(uint32_t n) :
+         EnumeratedFault<FillNNormal>(n) {;}
 +    //These need to be handled specially to enable fill traps in SE
 +#if !FULL_SYSTEM
      void invoke(ThreadContext * tc);
 +#endif
  };
  
- class FillNOther : public EnumeratedFault
+ class FillNOther : public EnumeratedFault<FillNOther>
  {
-   private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
    public:
-     FillNOther(uint32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
+     FillNOther(uint32_t n) :
+         EnumeratedFault<FillNOther>(n) {;}
  };
  
- class TrapInstruction : public EnumeratedFault
+ class TrapInstruction : public EnumeratedFault<TrapInstruction>
  {
--  private:
-     static FaultName _name;
-     static TrapType _baseTrapType;
-     static FaultPriority _priority;
-     static FaultStat _count;
-     TrapType baseTrapType() {return _baseTrapType;}
 -    uint64_t syscall_num;
    public:
-     TrapInstruction(int32_t n) : EnumeratedFault(n) {;}
-     FaultName name() {return _name;}
-     FaultPriority priority() {return _priority;}
-     FaultStat & countStat() {return _count;}
+     TrapInstruction(uint32_t n, uint64_t syscall) :
+         EnumeratedFault<TrapInstruction>(n), syscall_num(syscall) {;}
 -#if !FULL_SYSTEM
 -    void invoke(ThreadContext * tc);
 -#endif
  };