summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-10-28 02:23:16 +0100
committerbunnei <bunneidev@gmail.com>2014-10-28 02:23:16 +0100
commit19d91a45f50b95e53369444b4a34758e58e96739 (patch)
tree04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/core/arm
parentMerge pull request #154 from lioncash/dyncom (diff)
parentAdd `override` keyword through the code. (diff)
downloadyuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.gz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.bz2
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.lz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.xz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.zst
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h14
-rw-r--r--src/core/arm/interpreter/arm_interpreter.h22
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: