summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2021-05-29 02:49:07 -0400
committerGravatar Lioncash2021-05-29 02:58:32 -0400
commit7b2917b4e1f257a5bca3892be13bb6dcb1ed9820 (patch)
treed92bec1006154a64e5ca2b7bc9d46b4cf61ced95 /src
parentMerge pull request #6375 from lioncash/iofs (diff)
downloadyuzu-7b2917b4e1f257a5bca3892be13bb6dcb1ed9820.tar.gz
yuzu-7b2917b4e1f257a5bca3892be13bb6dcb1ed9820.tar.xz
yuzu-7b2917b4e1f257a5bca3892be13bb6dcb1ed9820.zip
kernel: Add missing override specifiers
Over the course of the kernel refactoring a tiny bit of missing overrides slipped through review, so we can add these. While we're at it, we can remove redundant virtual keywords where applicable as well.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/k_client_port.h6
-rw-r--r--src/core/hle/kernel/k_client_session.h4
-rw-r--r--src/core/hle/kernel/k_event.h14
-rw-r--r--src/core/hle/kernel/k_port.h3
-rw-r--r--src/core/hle/kernel/k_process.h8
-rw-r--r--src/core/hle/kernel/k_readable_event.h4
-rw-r--r--src/core/hle/kernel/k_resource_limit.h4
-rw-r--r--src/core/hle/kernel/k_server_port.h12
-rw-r--r--src/core/hle/kernel/k_server_session.h6
-rw-r--r--src/core/hle/kernel/k_session.h10
-rw-r--r--src/core/hle/kernel/k_shared_memory.h4
-rw-r--r--src/core/hle/kernel/k_synchronization_object.h4
-rw-r--r--src/core/hle/kernel/k_thread.h10
-rw-r--r--src/core/hle/kernel/k_transfer_memory.h10
-rw-r--r--src/core/hle/kernel/k_writable_event.h2
15 files changed, 48 insertions, 53 deletions
diff --git a/src/core/hle/kernel/k_client_port.h b/src/core/hle/kernel/k_client_port.h
index 8501156e8..f2fff3b01 100644
--- a/src/core/hle/kernel/k_client_port.h
+++ b/src/core/hle/kernel/k_client_port.h
@@ -22,7 +22,7 @@ class KClientPort final : public KSynchronizationObject {
22 22
23public: 23public:
24 explicit KClientPort(KernelCore& kernel_); 24 explicit KClientPort(KernelCore& kernel_);
25 virtual ~KClientPort() override; 25 ~KClientPort() override;
26 26
27 void Initialize(KPort* parent_, s32 max_sessions_, std::string&& name_); 27 void Initialize(KPort* parent_, s32 max_sessions_, std::string&& name_);
28 void OnSessionFinalized(); 28 void OnSessionFinalized();
@@ -49,8 +49,8 @@ public:
49 bool IsServerClosed() const; 49 bool IsServerClosed() const;
50 50
51 // Overridden virtual functions. 51 // Overridden virtual functions.
52 virtual void Destroy() override; 52 void Destroy() override;
53 virtual bool IsSignaled() const override; 53 bool IsSignaled() const override;
54 54
55 ResultCode CreateSession(KClientSession** out); 55 ResultCode CreateSession(KClientSession** out);
56 56
diff --git a/src/core/hle/kernel/k_client_session.h b/src/core/hle/kernel/k_client_session.h
index 720a8c243..b11d5b4e3 100644
--- a/src/core/hle/kernel/k_client_session.h
+++ b/src/core/hle/kernel/k_client_session.h
@@ -34,7 +34,7 @@ class KClientSession final
34 34
35public: 35public:
36 explicit KClientSession(KernelCore& kernel_); 36 explicit KClientSession(KernelCore& kernel_);
37 virtual ~KClientSession(); 37 ~KClientSession() override;
38 38
39 void Initialize(KSession* parent_, std::string&& name_) { 39 void Initialize(KSession* parent_, std::string&& name_) {
40 // Set member variables. 40 // Set member variables.
@@ -42,7 +42,7 @@ public:
42 name = std::move(name_); 42 name = std::move(name_);
43 } 43 }
44 44
45 virtual void Destroy() override; 45 void Destroy() override;
46 static void PostDestroy([[maybe_unused]] uintptr_t arg) {} 46 static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
47 47
48 KSession* GetParent() const { 48 KSession* GetParent() const {
diff --git a/src/core/hle/kernel/k_event.h b/src/core/hle/kernel/k_event.h
index 9a59ffb70..3d3ec99e2 100644
--- a/src/core/hle/kernel/k_event.h
+++ b/src/core/hle/kernel/k_event.h
@@ -20,23 +20,21 @@ class KEvent final : public KAutoObjectWithSlabHeapAndContainer<KEvent, KAutoObj
20 20
21public: 21public:
22 explicit KEvent(KernelCore& kernel_); 22 explicit KEvent(KernelCore& kernel_);
23 virtual ~KEvent(); 23 ~KEvent() override;
24 24
25 void Initialize(std::string&& name); 25 void Initialize(std::string&& name);
26 26
27 virtual void Finalize() override; 27 void Finalize() override;
28 28
29 virtual bool IsInitialized() const override { 29 bool IsInitialized() const override {
30 return initialized; 30 return initialized;
31 } 31 }
32 32
33 virtual uintptr_t GetPostDestroyArgument() const override { 33 uintptr_t GetPostDestroyArgument() const override {
34 return reinterpret_cast<uintptr_t>(owner); 34 return reinterpret_cast<uintptr_t>(owner);
35 } 35 }
36 36
37 static void PostDestroy(uintptr_t arg); 37 KProcess* GetOwner() const override {
38
39 virtual KProcess* GetOwner() const override {
40 return owner; 38 return owner;
41 } 39 }
42 40
@@ -48,6 +46,8 @@ public:
48 return writable_event; 46 return writable_event;
49 } 47 }
50 48
49 static void PostDestroy(uintptr_t arg);
50
51private: 51private:
52 KReadableEvent readable_event; 52 KReadableEvent readable_event;
53 KWritableEvent writable_event; 53 KWritableEvent writable_event;
diff --git a/src/core/hle/kernel/k_port.h b/src/core/hle/kernel/k_port.h
index 960f1f3a3..4018ea2df 100644
--- a/src/core/hle/kernel/k_port.h
+++ b/src/core/hle/kernel/k_port.h
@@ -22,7 +22,7 @@ class KPort final : public KAutoObjectWithSlabHeapAndContainer<KPort, KAutoObjec
22 22
23public: 23public:
24 explicit KPort(KernelCore& kernel_); 24 explicit KPort(KernelCore& kernel_);
25 virtual ~KPort(); 25 ~KPort() override;
26 26
27 static void PostDestroy([[maybe_unused]] uintptr_t arg) {} 27 static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
28 28
@@ -59,7 +59,6 @@ private:
59 ServerClosed = 3, 59 ServerClosed = 3,
60 }; 60 };
61 61
62private:
63 KServerPort server; 62 KServerPort server;
64 KClientPort client; 63 KClientPort client;
65 State state{State::Invalid}; 64 State state{State::Invalid};
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h
index 123d71cd3..c0656b9af 100644
--- a/src/core/hle/kernel/k_process.h
+++ b/src/core/hle/kernel/k_process.h
@@ -331,19 +331,19 @@ public:
331 331
332 void LoadModule(CodeSet code_set, VAddr base_addr); 332 void LoadModule(CodeSet code_set, VAddr base_addr);
333 333
334 virtual bool IsInitialized() const override { 334 bool IsInitialized() const override {
335 return is_initialized; 335 return is_initialized;
336 } 336 }
337 337
338 static void PostDestroy([[maybe_unused]] uintptr_t arg) {} 338 static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
339 339
340 virtual void Finalize(); 340 void Finalize() override;
341 341
342 virtual u64 GetId() const override final { 342 u64 GetId() const override {
343 return GetProcessID(); 343 return GetProcessID();
344 } 344 }
345 345
346 virtual bool IsSignaled() const override; 346 bool IsSignaled() const override;
347 347
348 void PinCurrentThread(); 348 void PinCurrentThread();
349 void UnpinCurrentThread(); 349 void UnpinCurrentThread();
diff --git a/src/core/hle/kernel/k_readable_event.h b/src/core/hle/kernel/k_readable_event.h
index 33cd1dd3e..b2850ac7b 100644
--- a/src/core/hle/kernel/k_readable_event.h
+++ b/src/core/hle/kernel/k_readable_event.h
@@ -31,8 +31,8 @@ public:
31 return parent; 31 return parent;
32 } 32 }
33 33
34 virtual bool IsSignaled() const override; 34 bool IsSignaled() const override;
35 virtual void Destroy() override; 35 void Destroy() override;
36 36
37 ResultCode Signal(); 37 ResultCode Signal();
38 ResultCode Clear(); 38 ResultCode Clear();
diff --git a/src/core/hle/kernel/k_resource_limit.h b/src/core/hle/kernel/k_resource_limit.h
index 0debbbb51..fab6005ff 100644
--- a/src/core/hle/kernel/k_resource_limit.h
+++ b/src/core/hle/kernel/k_resource_limit.h
@@ -37,10 +37,10 @@ class KResourceLimit final
37 37
38public: 38public:
39 explicit KResourceLimit(KernelCore& kernel_); 39 explicit KResourceLimit(KernelCore& kernel_);
40 virtual ~KResourceLimit(); 40 ~KResourceLimit() override;
41 41
42 void Initialize(const Core::Timing::CoreTiming* core_timing_); 42 void Initialize(const Core::Timing::CoreTiming* core_timing_);
43 virtual void Finalize() override; 43 void Finalize() override;
44 44
45 s64 GetLimitValue(LimitableResource which) const; 45 s64 GetLimitValue(LimitableResource which) const;
46 s64 GetCurrentValue(LimitableResource which) const; 46 s64 GetCurrentValue(LimitableResource which) const;
diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.h
index d1a757ec3..55481d63f 100644
--- a/src/core/hle/kernel/k_server_port.h
+++ b/src/core/hle/kernel/k_server_port.h
@@ -25,12 +25,9 @@ class SessionRequestHandler;
25class KServerPort final : public KSynchronizationObject { 25class KServerPort final : public KSynchronizationObject {
26 KERNEL_AUTOOBJECT_TRAITS(KServerPort, KSynchronizationObject); 26 KERNEL_AUTOOBJECT_TRAITS(KServerPort, KSynchronizationObject);
27 27
28private:
29 using SessionList = boost::intrusive::list<KServerSession>;
30
31public: 28public:
32 explicit KServerPort(KernelCore& kernel_); 29 explicit KServerPort(KernelCore& kernel_);
33 virtual ~KServerPort() override; 30 ~KServerPort() override;
34 31
35 void Initialize(KPort* parent_, std::string&& name_); 32 void Initialize(KPort* parent_, std::string&& name_);
36 33
@@ -63,13 +60,14 @@ public:
63 bool IsLight() const; 60 bool IsLight() const;
64 61
65 // Overridden virtual functions. 62 // Overridden virtual functions.
66 virtual void Destroy() override; 63 void Destroy() override;
67 virtual bool IsSignaled() const override; 64 bool IsSignaled() const override;
68 65
69private: 66private:
67 using SessionList = boost::intrusive::list<KServerSession>;
68
70 void CleanupSessions(); 69 void CleanupSessions();
71 70
72private:
73 SessionList session_list; 71 SessionList session_list;
74 SessionRequestHandlerPtr session_handler; 72 SessionRequestHandlerPtr session_handler;
75 KPort* parent{}; 73 KPort* parent{};
diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h
index dd4de2904..27b757ad2 100644
--- a/src/core/hle/kernel/k_server_session.h
+++ b/src/core/hle/kernel/k_server_session.h
@@ -42,9 +42,9 @@ class KServerSession final : public KSynchronizationObject,
42 42
43public: 43public:
44 explicit KServerSession(KernelCore& kernel_); 44 explicit KServerSession(KernelCore& kernel_);
45 virtual ~KServerSession() override; 45 ~KServerSession() override;
46 46
47 virtual void Destroy() override; 47 void Destroy() override;
48 48
49 void Initialize(KSession* parent_, std::string&& name_); 49 void Initialize(KSession* parent_, std::string&& name_);
50 50
@@ -56,7 +56,7 @@ public:
56 return parent; 56 return parent;
57 } 57 }
58 58
59 virtual bool IsSignaled() const override; 59 bool IsSignaled() const override;
60 60
61 void OnClientClosed(); 61 void OnClientClosed();
62 62
diff --git a/src/core/hle/kernel/k_session.h b/src/core/hle/kernel/k_session.h
index a981fd1f6..4ddd080d2 100644
--- a/src/core/hle/kernel/k_session.h
+++ b/src/core/hle/kernel/k_session.h
@@ -18,17 +18,17 @@ class KSession final : public KAutoObjectWithSlabHeapAndContainer<KSession, KAut
18 18
19public: 19public:
20 explicit KSession(KernelCore& kernel_); 20 explicit KSession(KernelCore& kernel_);
21 virtual ~KSession() override; 21 ~KSession() override;
22 22
23 void Initialize(KClientPort* port_, const std::string& name_); 23 void Initialize(KClientPort* port_, const std::string& name_);
24 24
25 virtual void Finalize() override; 25 void Finalize() override;
26 26
27 virtual bool IsInitialized() const override { 27 bool IsInitialized() const override {
28 return initialized; 28 return initialized;
29 } 29 }
30 30
31 virtual uintptr_t GetPostDestroyArgument() const override { 31 uintptr_t GetPostDestroyArgument() const override {
32 return reinterpret_cast<uintptr_t>(process); 32 return reinterpret_cast<uintptr_t>(process);
33 } 33 }
34 34
@@ -78,7 +78,6 @@ private:
78 ServerClosed = 3, 78 ServerClosed = 3,
79 }; 79 };
80 80
81private:
82 void SetState(State state) { 81 void SetState(State state) {
83 atomic_state = static_cast<u8>(state); 82 atomic_state = static_cast<u8>(state);
84 } 83 }
@@ -87,7 +86,6 @@ private:
87 return static_cast<State>(atomic_state.load(std::memory_order_relaxed)); 86 return static_cast<State>(atomic_state.load(std::memory_order_relaxed));
88 } 87 }
89 88
90private:
91 KServerSession server; 89 KServerSession server;
92 KClientSession client; 90 KClientSession client;
93 std::atomic<std::underlying_type_t<State>> atomic_state{ 91 std::atomic<std::underlying_type_t<State>> atomic_state{
diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h
index 553a56327..e9815f90b 100644
--- a/src/core/hle/kernel/k_shared_memory.h
+++ b/src/core/hle/kernel/k_shared_memory.h
@@ -68,9 +68,9 @@ public:
68 return device_memory->GetPointer(physical_address + offset); 68 return device_memory->GetPointer(physical_address + offset);
69 } 69 }
70 70
71 virtual void Finalize() override; 71 void Finalize() override;
72 72
73 virtual bool IsInitialized() const override { 73 bool IsInitialized() const override {
74 return is_initialized; 74 return is_initialized;
75 } 75 }
76 static void PostDestroy([[maybe_unused]] uintptr_t arg) {} 76 static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
diff --git a/src/core/hle/kernel/k_synchronization_object.h b/src/core/hle/kernel/k_synchronization_object.h
index a41dd1220..3d4ce1fbc 100644
--- a/src/core/hle/kernel/k_synchronization_object.h
+++ b/src/core/hle/kernel/k_synchronization_object.h
@@ -29,7 +29,7 @@ public:
29 KSynchronizationObject** objects, const s32 num_objects, 29 KSynchronizationObject** objects, const s32 num_objects,
30 s64 timeout); 30 s64 timeout);
31 31
32 virtual void Finalize() override; 32 void Finalize() override;
33 33
34 [[nodiscard]] virtual bool IsSignaled() const = 0; 34 [[nodiscard]] virtual bool IsSignaled() const = 0;
35 35
@@ -37,7 +37,7 @@ public:
37 37
38protected: 38protected:
39 explicit KSynchronizationObject(KernelCore& kernel); 39 explicit KSynchronizationObject(KernelCore& kernel);
40 virtual ~KSynchronizationObject(); 40 ~KSynchronizationObject() override;
41 41
42 virtual void OnFinalizeSynchronizationObject() {} 42 virtual void OnFinalizeSynchronizationObject() {}
43 43
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index 4abfc2b49..01eebb165 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -358,21 +358,21 @@ public:
358 return termination_requested || GetRawState() == ThreadState::Terminated; 358 return termination_requested || GetRawState() == ThreadState::Terminated;
359 } 359 }
360 360
361 [[nodiscard]] virtual u64 GetId() const override final { 361 [[nodiscard]] u64 GetId() const override {
362 return this->GetThreadID(); 362 return this->GetThreadID();
363 } 363 }
364 364
365 [[nodiscard]] virtual bool IsInitialized() const override { 365 [[nodiscard]] bool IsInitialized() const override {
366 return initialized; 366 return initialized;
367 } 367 }
368 368
369 [[nodiscard]] virtual uintptr_t GetPostDestroyArgument() const override { 369 [[nodiscard]] uintptr_t GetPostDestroyArgument() const override {
370 return reinterpret_cast<uintptr_t>(parent) | (resource_limit_release_hint ? 1 : 0); 370 return reinterpret_cast<uintptr_t>(parent) | (resource_limit_release_hint ? 1 : 0);
371 } 371 }
372 372
373 virtual void Finalize() override; 373 void Finalize() override;
374 374
375 [[nodiscard]] virtual bool IsSignaled() const override; 375 [[nodiscard]] bool IsSignaled() const override;
376 376
377 static void PostDestroy(uintptr_t arg); 377 static void PostDestroy(uintptr_t arg);
378 378
diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/core/hle/kernel/k_transfer_memory.h
index c2d0f1eaf..31029a5c2 100644
--- a/src/core/hle/kernel/k_transfer_memory.h
+++ b/src/core/hle/kernel/k_transfer_memory.h
@@ -27,23 +27,23 @@ class KTransferMemory final
27 27
28public: 28public:
29 explicit KTransferMemory(KernelCore& kernel_); 29 explicit KTransferMemory(KernelCore& kernel_);
30 virtual ~KTransferMemory() override; 30 ~KTransferMemory() override;
31 31
32 ResultCode Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_); 32 ResultCode Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_);
33 33
34 virtual void Finalize() override; 34 void Finalize() override;
35 35
36 virtual bool IsInitialized() const override { 36 bool IsInitialized() const override {
37 return is_initialized; 37 return is_initialized;
38 } 38 }
39 39
40 virtual uintptr_t GetPostDestroyArgument() const override { 40 uintptr_t GetPostDestroyArgument() const override {
41 return reinterpret_cast<uintptr_t>(owner); 41 return reinterpret_cast<uintptr_t>(owner);
42 } 42 }
43 43
44 static void PostDestroy(uintptr_t arg); 44 static void PostDestroy(uintptr_t arg);
45 45
46 KProcess* GetOwner() const { 46 KProcess* GetOwner() const override {
47 return owner; 47 return owner;
48 } 48 }
49 49
diff --git a/src/core/hle/kernel/k_writable_event.h b/src/core/hle/kernel/k_writable_event.h
index 607b0eadb..858d982c4 100644
--- a/src/core/hle/kernel/k_writable_event.h
+++ b/src/core/hle/kernel/k_writable_event.h
@@ -21,7 +21,7 @@ public:
21 explicit KWritableEvent(KernelCore& kernel_); 21 explicit KWritableEvent(KernelCore& kernel_);
22 ~KWritableEvent() override; 22 ~KWritableEvent() override;
23 23
24 virtual void Destroy() override; 24 void Destroy() override;
25 25
26 static void PostDestroy([[maybe_unused]] uintptr_t arg) {} 26 static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
27 27