diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-10-26 02:56:13 -0200 | 
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-10-26 16:18:05 -0200 | 
| commit | d72708c1f58225f50c5ddecbd6f51580a2d9690b (patch) | |
| tree | 10348ea70bd20a867daeff8433c004c38262e120 /src/core/arm | |
| parent | da564d3fe028c80b75a4c114e6a7afbff3051029 (diff) | |
Add `override` keyword through the code.
This was automated using `clang-modernize`.
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.h | 14 | ||||
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.h | 22 | 
2 files changed, 18 insertions, 18 deletions
| diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index 9f88dd139..1f8cd3a3a 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h @@ -21,7 +21,7 @@ public:       * Set the Program Counter to an address       * @param addr Address to set PC to       */ -    void SetPC(u32 pc); +    void SetPC(u32 pc) override;      /*       * Get the current Program Counter @@ -41,7 +41,7 @@ public:       * @param index Register index (0-15)       * @param value Value to set register to       */ -    void SetReg(int index, u32 value); +    void SetReg(int index, u32 value) override;      /**       * Get the current CPSR register @@ -53,7 +53,7 @@ public:       * Set the current CPSR register       * @param cpsr Value to set CPSR to       */ -    void SetCPSR(u32 cpsr); +    void SetCPSR(u32 cpsr) override;      /**       * Returns the number of clock ticks since the last reset @@ -65,22 +65,22 @@ public:       * Saves the current CPU context       * @param ctx Thread context to save       */ -    void SaveContext(ThreadContext& ctx); +    void SaveContext(ThreadContext& ctx) override;      /**       * Loads a CPU context       * @param ctx Thread context to load       */ -    void LoadContext(const ThreadContext& ctx); +    void LoadContext(const ThreadContext& ctx) override;      /// Prepare core for thread reschedule (if needed to correctly handle state) -    void PrepareReschedule(); +    void PrepareReschedule() override;      /**       * Executes the given number of instructions       * @param num_instructions Number of instructions to executes       */ -    void ExecuteInstructions(int num_instructions); +    void ExecuteInstructions(int num_instructions) override;  private: diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 49ae01a0c..ceb1be438 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -20,60 +20,60 @@ public:       * Set the Program Counter to an address       * @param addr Address to set PC to       */ -    void SetPC(u32 pc); +    void SetPC(u32 pc) override;      /*       * Get the current Program Counter       * @return Returns current PC       */ -    u32 GetPC() const; +    u32 GetPC() const override;      /**       * Get an ARM register       * @param index Register index (0-15)       * @return Returns the value in the register       */ -    u32 GetReg(int index) const; +    u32 GetReg(int index) const override;      /**       * Set an ARM register       * @param index Register index (0-15)       * @param value Value to set register to       */ -    void SetReg(int index, u32 value); +    void SetReg(int index, u32 value) override;      /**       * Get the current CPSR register       * @return Returns the value of the CPSR register       */ -    u32 GetCPSR() const; +    u32 GetCPSR() const override;      /**       * Set the current CPSR register       * @param cpsr Value to set CPSR to       */ -    void SetCPSR(u32 cpsr); +    void SetCPSR(u32 cpsr) override;      /**       * Returns the number of clock ticks since the last reset       * @return Returns number of clock ticks       */ -    u64 GetTicks() const; +    u64 GetTicks() const override;      /**       * Saves the current CPU context       * @param ctx Thread context to save       */ -    void SaveContext(ThreadContext& ctx); +    void SaveContext(ThreadContext& ctx) override;      /**       * Loads a CPU context       * @param ctx Thread context to load       */ -    void LoadContext(const ThreadContext& ctx); +    void LoadContext(const ThreadContext& ctx) override;      /// Prepare core for thread reschedule (if needed to correctly handle state) -    void PrepareReschedule(); +    void PrepareReschedule() override;  protected: @@ -81,7 +81,7 @@ protected:       * Executes the given number of instructions       * @param num_instructions Number of instructions to executes       */ -    void ExecuteInstructions(int num_instructions); +    void ExecuteInstructions(int num_instructions) override;  private: | 
