290c290
< Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
319c319
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
415c415
< Nop::execute(CPU_EXEC_CONTEXT *, Trace::InstRecord *) const
---
> Nop::execute(ExecContext *, Trace::InstRecord *) const