arch: Fix all override related warnings.

Clang has started(?) reporting override related warnings, something gcc
apparently did before, but was disabled in the SConstruct. Rather than
disable the warnings in for clang as well, this change fixes the
warnings. A future change will re-enable the warnings for gcc.

Change-Id: I3cc79e45749b2ae0f9bebb1acadc56a3d3a942da
Reviewed-on: https://gem5-review.googlesource.com/9343
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>

3 files changed, 47 insertions, 30 deletions

diff --git a/src/arch/sparc/isa/formats/basic.isa b/src/arch/sparc/isa/formats/basic.isa
index a6b15388d..7fd6b245c 100644
--- a/src/arch/sparc/isa/formats/basic.isa
+++ b/src/arch/sparc/isa/formats/basic.isa
@@ -38,7 +38,7 @@ class %(class_name)s : public %(base_class)s
   public:
     // Constructor.
     %(class_name)s(ExtMachInst machInst);
-    Fault execute(ExecContext *, Trace::InstRecord *) const;
+    Fault execute(ExecContext *, Trace::InstRecord *) const override;
 };
 }};
 
@@ -52,7 +52,7 @@ class %(class_name)s : public %(base_class)s
   public:
     // Constructor.
     %(class_name)s(ExtMachInst machInst);
-    Fault execute(ExecContext *, Trace::InstRecord *) const;
+    Fault execute(ExecContext *, Trace::InstRecord *) const override;
     Fault doFpOp(ExecContext *, Trace::InstRecord *) const M5_NO_INLINE;
 };
 }};
@@ -67,7 +67,7 @@ class %(class_name)s : public %(base_class)s
   public:
     // Constructor.
     %(class_name)s(const char *mnemonic, ExtMachInst machInst);
-    Fault execute(ExecContext *, Trace::InstRecord *) const;
+    Fault execute(ExecContext *, Trace::InstRecord *) const override;
 };
 }};
 
diff --git a/src/arch/sparc/isa/formats/mem/basicmem.isa b/src/arch/sparc/isa/formats/mem/basicmem.isa
index bc7d033b6..aff7d4d73 100644
--- a/src/arch/sparc/isa/formats/mem/basicmem.isa
+++ b/src/arch/sparc/isa/formats/mem/basicmem.isa
@@ -45,10 +45,11 @@ def template MemDeclare {{
             /// Constructor.
             %(class_name)s(ExtMachInst machInst);
 
-            Fault execute(ExecContext *, Trace::InstRecord *) const;
-            Fault initiateAcc(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;
+                              Trace::InstRecord *) const override;
         };
 }};
 
diff --git a/src/arch/sparc/isa/formats/mem/blockmem.isa b/src/arch/sparc/isa/formats/mem/blockmem.isa
index 05ddc63b3..60a72a69b 100644
--- a/src/arch/sparc/isa/formats/mem/blockmem.isa
+++ b/src/arch/sparc/isa/formats/mem/blockmem.isa
@@ -48,10 +48,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_0(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_1 : public %(base_class)sMicro
@@ -59,10 +61,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_1(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_2 : public %(base_class)sMicro
@@ -70,10 +74,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_2(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_3 : public %(base_class)sMicro
@@ -81,10 +87,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_3(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_4 : public %(base_class)sMicro
@@ -92,10 +100,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_4(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_5 : public %(base_class)sMicro
@@ -103,10 +113,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_5(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_6 : public %(base_class)sMicro
@@ -114,10 +126,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_6(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
 
             class %(class_name)s_7 : public %(base_class)sMicro
@@ -125,10 +139,12 @@ def template BlockMemDeclare {{
               public:
                 // Constructor
                 %(class_name)s_7(ExtMachInst machInst);
-                Fault execute(ExecContext *, Trace::InstRecord *) const;
-                Fault initiateAcc(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;
+                                  Trace::InstRecord *) const override;
             };
         };
 }};