151c151
< fault = xc->read(EA, (uint%(mem_acc_size)s_t&)Mem, 0);
---
> fault = xc->read(EA, (uint%(mem_acc_size)s_t&)Mem, %(asi_val)s);
178c178
< fault = xc->read(EA, (uint%(mem_acc_size)s_t&)Mem, 0);
---
> fault = xc->read(EA, (uint%(mem_acc_size)s_t&)Mem, %(asi_val)s);
291,292c291,293
< if(bits(Pstate,2,2) == 0 && (EXT_ASI & 0x80) == 0)
< fault = new PrivilegedAction;
---
> if(!bits(Pstate,2,2) && !bits(Hpstate,2,2) && !AsiIsUnPriv((ASI)EXT_ASI) ||
> !bits(Hpstate,2,2) && AsiIsHPriv((ASI)EXT_ASI))
> fault = new PrivilegedAction;