From: Matteo Andreozzi <Matteo.Andreozzi@arm.com>
Date: Tue, 2 Oct 2018 14:32:41 +0000 (+0100)
Subject: arch-arm: Mark ArmProcess method as override
X-Git-Tag: v19.0.0.0~1653
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9145d4854321870c02ded3bb8b554ecb236a9e87;p=gem5.git

arch-arm: Mark ArmProcess method as override

Allows compilation on clang3.5+ by fixing Winconsistent-missing-override

Change-Id: Ic0ebf3869fc2d9a29fcf7cf5a6535952f41714d0
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/13227
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
---

diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh
index a6f46c1a0..2b4786cce 100644
--- a/src/arch/arm/process.hh
+++ b/src/arch/arm/process.hh
@@ -80,17 +80,17 @@ class ArmProcess32 : public ArmProcess
     ArmProcess32(ProcessParams * params, ObjectFile *objFile,
                  ObjectFile::Arch _arch);
 
-    void initState();
+    void initState() override;
 
     /** AArch32 AT_HWCAP */
     uint32_t armHwcapImpl() const override;
 
   public:
 
-    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i, int width);
-    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
-    void setSyscallArg(ThreadContext *tc, int i, ArmISA::IntReg val);
-    void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value);
+    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i, int width) override;
+    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i) override;
+    void setSyscallArg(ThreadContext *tc, int i, ArmISA::IntReg val) override;
+    void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value) override;
 };
 
 class ArmProcess64 : public ArmProcess
@@ -99,17 +99,17 @@ class ArmProcess64 : public ArmProcess
     ArmProcess64(ProcessParams * params, ObjectFile *objFile,
                  ObjectFile::Arch _arch);
 
-    void initState();
+    void initState() override;
 
     /** AArch64 AT_HWCAP */
     uint32_t armHwcapImpl() const override;
 
   public:
 
-    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i, int width);
-    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
-    void setSyscallArg(ThreadContext *tc, int i, ArmISA::IntReg val);
-    void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value);
+    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i, int width) override;
+    ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i) override;
+    void setSyscallArg(ThreadContext *tc, int i, ArmISA::IntReg val) override;
+    void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value) override;
 };
 
 #endif // __ARM_PROCESS_HH__