164,166c164,167
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
174,176c175,178
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
184,186c186,189
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
194,196c197,200
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
204,206c208,211
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
214,216c219,222
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
224,226c230,233
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;
234,236c241,244
< %(BasicExecDeclare)s
< %(InitiateAccDeclare)s
< %(CompleteAccDeclare)s
---
> Fault execute(ExecContext *, Trace::InstRecord *) const;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const;