100c100
< uint64_t getMemData(%(CPU_exec_context)s *xc, Packet *packet);
---
> uint64_t getMemData(ExecContext *xc, Packet *packet);
108c108
< uint64_t getMemData(CPU_EXEC_CONTEXT *xc, Packet *packet) {
---
> uint64_t getMemData(ExecContext *xc, Packet *packet) {
156c156
< Fault eaComp(%(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> Fault eaComp(ExecContext *, Trace::InstRecord *) const;
160c160
< Fault initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
165c165
< Fault completeAcc(Packet *, %(CPU_exec_context)s *, Trace::InstRecord *) const;
---
> Fault completeAcc(Packet *, ExecContext *, Trace::InstRecord *) const;
179,180c179
< %(class_name)s::eaComp(CPU_EXEC_CONTEXT *xc,
< Trace::InstRecord *traceData) const
---
> %(class_name)s::eaComp(ExecContext *xc, Trace::InstRecord *traceData) const
206c205
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
238c237
< Fault %(class_name)s::initiateAcc(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::initiateAcc(ExecContext *xc,
264,265c263
< Fault %(class_name)s::completeAcc(Packet *pkt,
< CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::completeAcc(Packet *pkt, ExecContext *xc,
295c293
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
329c327
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
364c362
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
398c396
< Fault %(class_name)s::initiateAcc(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::initiateAcc(ExecContext *xc,
425c423
< CPU_EXEC_CONTEXT *xc,
---
> ExecContext *xc,
434c432
< CPU_EXEC_CONTEXT *xc,
---
> ExecContext *xc,
457c455
< Fault %(class_name)s::execute(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::execute(ExecContext *xc,
477c475
< Fault %(class_name)s::initiateAcc(CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::initiateAcc(ExecContext *xc,
487,488c485
< Fault %(class_name)s::completeAcc(Packet *pkt,
< CPU_EXEC_CONTEXT *xc,
---
> Fault %(class_name)s::completeAcc(Packet *pkt, ExecContext *xc,