44c44
< PSTATE_MASK = (((1 << 4) - 1) << 1) | (((1 << 4) - 1) << 6) | (1 << 12)
---
> PSTATE_MASK = (((1 << 4) - 1) << 1) | (((1 << 4) - 1) << 6) | (1 << 12)
88,89c88,89
< //y = 0;
< //ccr = 0;
---
> // y = 0;
> // ccr = 0;
106,111c106,111
< //cansave = 0;
< //canrestore = 0;
< //cleanwin = 0;
< //otherwin = 0;
< //wstate = 0;
< //In a T1, bit 11 is apparently always 1
---
> // cansave = 0;
> // canrestore = 0;
> // cleanwin = 0;
> // otherwin = 0;
> // wstate = 0;
> // In a T1, bit 11 is apparently always 1
117c117
< //This is set this way in Legion for some reason
---
> // This is set this way in Legion for some reason
178c178
< //case MISCREG_TLB_DATA:
---
> // case MISCREG_TLB_DATA:
180c180
< //case MISCREG_Y:
---
> // case MISCREG_Y:
182c182
< //case MISCREG_CCR:
---
> // case MISCREG_CCR:
224,238c224,238
< //CWP, GL moved
< //case MISCREG_CWP:
< // return cwp;
< //case MISCREG_CANSAVE:
< // return cansave;
< //case MISCREG_CANRESTORE:
< // return canrestore;
< //case MISCREG_CLEANWIN:
< // return cleanwin;
< //case MISCREG_OTHERWIN:
< // return otherwin;
< //case MISCREG_WSTATE:
< // return wstate;
< //case MISCREG_GL:
< // return gl;
---
> // CWP, GL moved
> // case MISCREG_CWP:
> // return cwp;
> // case MISCREG_CANSAVE:
> // return cansave;
> // case MISCREG_CANRESTORE:
> // return canrestore;
> // case MISCREG_CLEANWIN:
> // return cleanwin;
> // case MISCREG_OTHERWIN:
> // return otherwin;
> // case MISCREG_WSTATE:
> // return wstate;
> // case MISCREG_GL:
> // return gl;
352,355c352,355
< //HPSTATE is special because because sometimes in privilege
< //checks for instructions it will read HPSTATE to make sure
< //the priv. level is ok So, we'll just have to tell it it
< //isn't, instead of panicing.
---
> // HPSTATE is special because because sometimes in privilege
> // checks for instructions it will read HPSTATE to make sure
> // the priv. level is ok So, we'll just have to tell it it
> // isn't, instead of panicing.
560c560
< //Configure the fpu based on the fprs
---
> // Configure the fpu based on the fprs
563c563
< //Set up performance counting based on pcr value
---
> // Set up performance counting based on pcr value
617,618c617,618
< //HPSTATE is special because normal trap processing saves HPSTATE when
< //it goes into a trap, and restores it when it returns.
---
> // HPSTATE is special because normal trap processing saves HPSTATE when
> // it goes into a trap, and restores it when it returns.