summaryrefslogtreecommitdiff
path: root/src/core/arm
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2014-10-26 02:56:13 -0200
committerGravatar Yuri Kunde Schlesner2014-10-26 16:18:05 -0200
commitd72708c1f58225f50c5ddecbd6f51580a2d9690b (patch)
tree10348ea70bd20a867daeff8433c004c38262e120 /src/core/arm
parentFix compile errors in Clang (diff)
downloadyuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.gz
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.tar.xz
yuzu-d72708c1f58225f50c5ddecbd6f51580a2d9690b.zip
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.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:
21 * Set the Program Counter to an address 21 * Set the Program Counter to an address
22 * @param addr Address to set PC to 22 * @param addr Address to set PC to
23 */ 23 */
24 void SetPC(u32 pc); 24 void SetPC(u32 pc) override;
25 25
26 /* 26 /*
27 * Get the current Program Counter 27 * Get the current Program Counter
@@ -41,7 +41,7 @@ public:
41 * @param index Register index (0-15) 41 * @param index Register index (0-15)
42 * @param value Value to set register to 42 * @param value Value to set register to
43 */ 43 */
44 void SetReg(int index, u32 value); 44 void SetReg(int index, u32 value) override;
45 45
46 /** 46 /**
47 * Get the current CPSR register 47 * Get the current CPSR register
@@ -53,7 +53,7 @@ public:
53 * Set the current CPSR register 53 * Set the current CPSR register
54 * @param cpsr Value to set CPSR to 54 * @param cpsr Value to set CPSR to
55 */ 55 */
56 void SetCPSR(u32 cpsr); 56 void SetCPSR(u32 cpsr) override;
57 57
58 /** 58 /**
59 * Returns the number of clock ticks since the last reset 59 * Returns the number of clock ticks since the last reset
@@ -65,22 +65,22 @@ public:
65 * Saves the current CPU context 65 * Saves the current CPU context
66 * @param ctx Thread context to save 66 * @param ctx Thread context to save
67 */ 67 */
68 void SaveContext(ThreadContext& ctx); 68 void SaveContext(ThreadContext& ctx) override;
69 69
70 /** 70 /**
71 * Loads a CPU context 71 * Loads a CPU context
72 * @param ctx Thread context to load 72 * @param ctx Thread context to load
73 */ 73 */
74 void LoadContext(const ThreadContext& ctx); 74 void LoadContext(const ThreadContext& ctx) override;
75 75
76 /// Prepare core for thread reschedule (if needed to correctly handle state) 76 /// Prepare core for thread reschedule (if needed to correctly handle state)
77 void PrepareReschedule(); 77 void PrepareReschedule() override;
78 78
79 /** 79 /**
80 * Executes the given number of instructions 80 * Executes the given number of instructions
81 * @param num_instructions Number of instructions to executes 81 * @param num_instructions Number of instructions to executes
82 */ 82 */
83 void ExecuteInstructions(int num_instructions); 83 void ExecuteInstructions(int num_instructions) override;
84 84
85private: 85private:
86 86
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:
20 * Set the Program Counter to an address 20 * Set the Program Counter to an address
21 * @param addr Address to set PC to 21 * @param addr Address to set PC to
22 */ 22 */
23 void SetPC(u32 pc); 23 void SetPC(u32 pc) override;
24 24
25 /* 25 /*
26 * Get the current Program Counter 26 * Get the current Program Counter
27 * @return Returns current PC 27 * @return Returns current PC
28 */ 28 */
29 u32 GetPC() const; 29 u32 GetPC() const override;
30 30
31 /** 31 /**
32 * Get an ARM register 32 * Get an ARM register
33 * @param index Register index (0-15) 33 * @param index Register index (0-15)
34 * @return Returns the value in the register 34 * @return Returns the value in the register
35 */ 35 */
36 u32 GetReg(int index) const; 36 u32 GetReg(int index) const override;
37 37
38 /** 38 /**
39 * Set an ARM register 39 * Set an ARM register
40 * @param index Register index (0-15) 40 * @param index Register index (0-15)
41 * @param value Value to set register to 41 * @param value Value to set register to
42 */ 42 */
43 void SetReg(int index, u32 value); 43 void SetReg(int index, u32 value) override;
44 44
45 /** 45 /**
46 * Get the current CPSR register 46 * Get the current CPSR register
47 * @return Returns the value of the CPSR register 47 * @return Returns the value of the CPSR register
48 */ 48 */
49 u32 GetCPSR() const; 49 u32 GetCPSR() const override;
50 50
51 /** 51 /**
52 * Set the current CPSR register 52 * Set the current CPSR register
53 * @param cpsr Value to set CPSR to 53 * @param cpsr Value to set CPSR to
54 */ 54 */
55 void SetCPSR(u32 cpsr); 55 void SetCPSR(u32 cpsr) override;
56 56
57 /** 57 /**
58 * Returns the number of clock ticks since the last reset 58 * Returns the number of clock ticks since the last reset
59 * @return Returns number of clock ticks 59 * @return Returns number of clock ticks
60 */ 60 */
61 u64 GetTicks() const; 61 u64 GetTicks() const override;
62 62
63 /** 63 /**
64 * Saves the current CPU context 64 * Saves the current CPU context
65 * @param ctx Thread context to save 65 * @param ctx Thread context to save
66 */ 66 */
67 void SaveContext(ThreadContext& ctx); 67 void SaveContext(ThreadContext& ctx) override;
68 68
69 /** 69 /**
70 * Loads a CPU context 70 * Loads a CPU context
71 * @param ctx Thread context to load 71 * @param ctx Thread context to load
72 */ 72 */
73 void LoadContext(const ThreadContext& ctx); 73 void LoadContext(const ThreadContext& ctx) override;
74 74
75 /// Prepare core for thread reschedule (if needed to correctly handle state) 75 /// Prepare core for thread reschedule (if needed to correctly handle state)
76 void PrepareReschedule(); 76 void PrepareReschedule() override;
77 77
78protected: 78protected:
79 79
@@ -81,7 +81,7 @@ protected:
81 * Executes the given number of instructions 81 * Executes the given number of instructions
82 * @param num_instructions Number of instructions to executes 82 * @param num_instructions Number of instructions to executes
83 */ 83 */
84 void ExecuteInstructions(int num_instructions); 84 void ExecuteInstructions(int num_instructions) override;
85 85
86private: 86private:
87 87