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

Deleted Added

sdiff udiff text old ( 12359:8fb4630c444f ) new ( 12616:4b463b4dc098 )

full compact

262,264c262,265
< 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;
266,267c267,269
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
345,347c347,350
< 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;
349,350c352,354
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
367,369c371,374
< 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;
371,372c376,378
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
389,391c395,398
< 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;
393,394c400,402
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
413,415c421,424
< 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;
430,432c439,442
< 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;
434,435c444,446
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
453,455c464,467
< 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;
457,458c469,471
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
473,475c486,489
< 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;
477,478c491,493
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
493,495c508,511
< 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;
497,498c513,515
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
512,514c529,532
< 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;
516,517c534,536
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {
533,535c552,555
< 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;
537,538c557,559
< virtual void
< annotateFault(ArmFault *fault) {
---
> void
> annotateFault(ArmFault *fault) override
> {