From 9145d4854321870c02ded3bb8b554ecb236a9e87 Mon Sep 17 00:00:00 2001 From: Matteo Andreozzi Date: Tue, 2 Oct 2018 15:32:41 +0100 Subject: arch-arm: Mark ArmProcess method as override Allows compilation on clang3.5+ by fixing Winconsistent-missing-override Change-Id: Ic0ebf3869fc2d9a29fcf7cf5a6535952f41714d0 Reviewed-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/13227 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/arch/arm/process.hh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') 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__ -- cgit v1.2.3