180c180
< CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
---
> ExecContext *, Trace::InstRecord *) const;
211c211
< Fault %(class_name)s<Element>::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s<Element>::execute(ExecContext *xc,
256c256
< Fault %(class_name)s<Element>::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s<Element>::execute(ExecContext *xc,