183c183
< %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
186c186
< %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
189c189
< %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
195c195
< %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
227c227
< Fault %(class_name)s<Element>::execute(%(CPU_exec_context)s *xc,
---
> Fault %(class_name)s<Element>::execute(CPU_EXEC_CONTEXT *xc,