59a60
> using PrivilegeLevelSpec = std::array<PrivilegeLevel, NumLevels>;
65c66
< const PrivilegeLevel nextPrivilegeLevel[NumLevels];
---
> const PrivilegeLevelSpec nextPrivilegeLevel;
66a68,72
> FaultVals(const FaultName& name_, const TrapType& trapType_,
> const FaultPriority& priority_, const PrivilegeLevelSpec& il)
> : name(name_), trapType(trapType_), priority(priority_),
> nextPrivilegeLevel(il)
> {}