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

Deleted Added

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

full compact

585,587c585,588
< 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;
603,605c604,607
< 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;
621,623c623,626
< 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;
640,642c643,646
< 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;
659,661c663,666
< 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;
677,679c682,685
< 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;
681,682c687,689
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
701,703c708,711
< 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;
722,724c730,733
< 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;
742,744c751,754
< 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;
746,747c756,758
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
768,770c779,782
< 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;
788,790c800,803
< 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;
792,793c805,807
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
811,813c825,828
< 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;
815,816c830,832
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {