261,263c261,263
< %(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;
343,345c343,345
< %(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;
365,367c365,367
< %(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;
387,389c387,389
< %(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;
411,415c411,413
< %(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;
430,432c428,430
< %(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;
453,455c451,453
< %(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;
473,475c471,473
< %(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;
493,495c491,493
< %(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;
512,514c510,512
< %(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;
533,535c531,533
< %(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;