32,33c32,33
< #ifndef __ALPHA_FAULTS_HH__
< #define __ALPHA_FAULTS_HH__
---
> #ifndef __ARCH_ALPHA_FAULTS_HH__
> #define __ARCH_ALPHA_FAULTS_HH__
34a35
> #include "arch/alpha/pagetable.hh"
38,39d38
< #include "arch/alpha/pagetable.hh"
<
42,43c41
< namespace AlphaISA
< {
---
> namespace AlphaISA {
65a64
>
78a78
>
96a97
>
105,106d105
< protected:
< bool skipFaultingInstruction() {return true;}
110a110,113
>
> protected:
> bool skipFaultingInstruction() {return true;}
>
122,123d124
< protected:
< bool setRestartAddress() {return false;}
127a129,132
>
> protected:
> bool setRestartAddress() {return false;}
>
139a145
>
157a164
>
175a183
>
190a199
>
205a215
>
220a231
>
233a245
>
235,237c247
< ItbFault(Addr _pc)
< : pc(_pc)
< { }
---
> ItbFault(Addr _pc) : pc(_pc) { }
251a262
>
253,255c264
< ItbPageFault(Addr pc)
< : ItbFault(pc)
< { }
---
> ItbPageFault(Addr pc) : ItbFault(pc) { }
269a279
>
271,273c281
< ItbAcvFault(Addr pc)
< : ItbFault(pc)
< { }
---
> ItbAcvFault(Addr pc) : ItbFault(pc) { }
284a293
>
296a306
>
305,306d314
< protected:
< bool skipFaultingInstruction() {return true;}
310a319,322
>
> protected:
> bool skipFaultingInstruction() {return true;}
>
322a335
>
329c342
< } // AlphaISA namespace
---
> } // namespace AlphaISA
331c344
< #endif // __FAULTS_HH__
---
> #endif // __ARCH_ALPHA_FAULTS_HH__