170c170
< %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> CPU_EXEC_CONTEXT *, Trace::InstRecord *) const;
175c175
< Fault %(class_name)s<Element>::execute(%(CPU_exec_context)s *xc,
---
> Fault %(class_name)s<Element>::execute(CPU_EXEC_CONTEXT *xc,
208c208
< Fault %(class_name)s<Element>::execute(%(CPU_exec_context)s *xc,
---
> Fault %(class_name)s<Element>::execute(CPU_EXEC_CONTEXT *xc,
278c278
< %(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
---
> CPU_EXEC_CONTEXT *xc, Trace::InstRecord *traceData) const
306c306
< %(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
---
> CPU_EXEC_CONTEXT *xc, Trace::InstRecord *traceData) const
329c329
< PacketPtr pkt, %(CPU_exec_context)s *xc,
---
> PacketPtr pkt, CPU_EXEC_CONTEXT *xc,
354c354
< %(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
---
> CPU_EXEC_CONTEXT *xc, Trace::InstRecord *traceData) const
386c386
< %(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
---
> CPU_EXEC_CONTEXT *xc, Trace::InstRecord *traceData) const
412c412
< PacketPtr pkt, %(CPU_exec_context)s *xc,
---
> PacketPtr pkt, CPU_EXEC_CONTEXT *xc,
510c510
< Fault %(class_name)s::execute(%(CPU_exec_context)s *xc,
---
> Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,