Giacomo Travaglini has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13227 )
Change subject: arch-arm: Mark ArmProcess method as override
......................................................................
arch-arm: Mark ArmProcess method as override
Allows compilation on clang3.5+ by fixing Winconsistent-missing-override
Change-Id: Ic0ebf3869fc2d9a29fcf7cf5a6535952f41714d0
Reviewed-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/13227
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
---
M src/arch/arm/process.hh
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh
index a6f46c1..2b4786c 100644
--- a/src/arch/arm/process.hh
+++ b/src/arch/arm/process.hh
@@ -80,17 +80,17 @@
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 @@
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__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13227
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ic0ebf3869fc2d9a29fcf7cf5a6535952f41714d0
Gerrit-Change-Number: 13227
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
