Cross Reference: /gem5/src/arch/arm/isa/templates/macromem.isa

Deleted Added

sdiff udiff text old ( 12236:126ac9da6050 ) new ( 12616:4b463b4dc098 )

full compact

56,58c56,59
< Fault execute(ExecContext *, Trace::InstRecord *) const;
< Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
< Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const override;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const override;
88,90c89,92
< Fault execute(ExecContext *, Trace::InstRecord *) const;
< Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
< Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const override;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const override;
137,139c139,142
< Fault execute(ExecContext *, Trace::InstRecord *) const;
< Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
< Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
> Fault initiateAcc(ExecContext *, Trace::InstRecord *) const override;
> Fault completeAcc(PacketPtr, ExecContext *,
> Trace::InstRecord *) const override;
157c160
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
192c195
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
254c257
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
307c310
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
322c325
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
353c356
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
393c396
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;
415c418
< Fault execute(ExecContext *, Trace::InstRecord *) const;
---
> Fault execute(ExecContext *, Trace::InstRecord *) const override;