85,89c85,91
< FaultName name() const {return vals.name;}
< TrapType trapType() {return vals.trapType;}
< FaultPriority priority() {return vals.priority;}
< FaultStat & countStat() {return vals.count;}
< PrivilegeLevel getNextLevel(PrivilegeLevel current)
---
> FaultName name() const { return vals.name; }
> TrapType trapType() { return vals.trapType; }
> FaultPriority priority() { return vals.priority; }
> FaultStat & countStat() { return vals.count; }
>
> PrivilegeLevel
> getNextLevel(PrivilegeLevel current)
115c117
< //class InstructionAccessMMUMiss : public SparcFault<InstructionAccessMMUMiss> {};
---
> // class InstructionAccessMMUMiss : public SparcFault<InstructionAccessMMUMiss> {};
123c125
< //class UnimplementedLDD : public SparcFault<UnimplementedLDD> {};
---
> // class UnimplementedLDD : public SparcFault<UnimplementedLDD> {};
125c127
< //class UnimplementedSTD : public SparcFault<UnimplementedSTD> {};
---
> // class UnimplementedSTD : public SparcFault<UnimplementedSTD> {};
143c145
< bool isMachineCheckFault() const {return true;}
---
> bool isMachineCheckFault() const { return true; }
146c148,149
< class InstructionInvalidTSBEntry : public SparcFault<InstructionInvalidTSBEntry> {};
---
> class InstructionInvalidTSBEntry :
> public SparcFault<InstructionInvalidTSBEntry> {};
152c155
< //class DataAccessMMUMiss : public SparcFault<DataAccessMMUMiss> {};
---
> // class DataAccessMMUMiss : public SparcFault<DataAccessMMUMiss> {};
162c165
< bool isAlignmentFault() const {return true;}
---
> bool isAlignmentFault() const { return true; }
180c183
< //class AsyncDataError : public SparcFault<AsyncDataError> {};
---
> // class AsyncDataError : public SparcFault<AsyncDataError> {};
189c192
< TrapType trapType() {return SparcFault<T>::trapType() + _n;}
---
> TrapType trapType() { return SparcFault<T>::trapType() + _n; }
196c199
< FaultPriority priority() {return 3200 - _n*100;}
---
> FaultPriority priority() { return 3200 - _n*100; }
250c253
< //These need to be handled specially to enable spill traps in SE
---
> // These need to be handled specially to enable spill traps in SE
260c263,264
< SpillNOther(uint32_t n) : EnumeratedFault<SpillNOther>(n) {;}
---
> SpillNOther(uint32_t n) : EnumeratedFault<SpillNOther>(n)
> {}
266,267c270,272
< FillNNormal(uint32_t n) : EnumeratedFault<FillNNormal>(n) {;}
< //These need to be handled specially to enable fill traps in SE
---
> FillNNormal(uint32_t n) : EnumeratedFault<FillNNormal>(n)
> {}
> // These need to be handled specially to enable fill traps in SE
277c282,283
< FillNOther(uint32_t n) : EnumeratedFault<FillNOther>(n) {;}
---
> FillNOther(uint32_t n) : EnumeratedFault<FillNOther>(n)
> {}
283,284c289,291
< TrapInstruction(uint32_t n) : EnumeratedFault<TrapInstruction>(n) {;}
< //In SE, trap instructions are requesting services from the OS.
---
> TrapInstruction(uint32_t n) : EnumeratedFault<TrapInstruction>(n)
> {}
> // In SE, trap instructions are requesting services from the OS.
291c298,299
< static inline Fault genMachineCheckFault()
---
> static inline Fault
> genMachineCheckFault()