149,157c149
< # XXX Need to take care of pstate.hpriv as well. The lower ASIs are split
< # into ones that are available in priv and hpriv, and those that are only
< # available in hpriv
< privilegedString = '''if(bits(Pstate,2,2) == 0 && (EXT_ASI & 0x80) == 0)
< return new PrivilegedAction;
< if(AsiIsAsIfUser(EXT_ASI) && !bits(Pstate,2,2))
< return new PrivilegedAction;'''
<
< def doMemFormat(code, execute, priv, name, Name, opt_flags):
---
> def doMemFormat(code, execute, faultCode, name, Name, opt_flags):
161c153
< opt_flags, {"priv_check": priv, "ea_code": addrCalcReg})
---
> opt_flags, {"fault_check": faultCode, "ea_code": addrCalcReg})
163c155
< opt_flags, {"priv_check": priv, "ea_code": addrCalcImm})
---
> opt_flags, {"fault_check": faultCode, "ea_code": addrCalcImm})
168c160
< priv, name, name + "Imm", Name, Name + "Imm", opt_flags)
---
> faultCode, name, name + "Imm", Name, Name + "Imm", opt_flags)
177c169
< privelegedString, name, Name, opt_flags)
---
> AlternateAsiPrivFaultCheck, name, Name, opt_flags)
185c177
< privilegedString, name, Name, opt_flags)
---
> AlternateAsiPrivFaultCheck, name, Name, opt_flags)