From 488f2c3e71af8d443c1fc04d0f03e70e0aa7aefd Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Mon, 9 Aug 2021 16:40:04 -0700 Subject: [PATCH 1/5] Implemented DebugFinder --- data/uking_functions.csv | 10 +++++----- src/KingSystem/System/CMakeLists.txt | 2 ++ src/KingSystem/System/DebugFinder.cpp | 14 ++++++++++++++ src/KingSystem/System/DebugFinder.h | 22 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/KingSystem/System/DebugFinder.cpp create mode 100644 src/KingSystem/System/DebugFinder.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 6fdd3779..75efdfdc 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -94017,11 +94017,11 @@ Address,Quality,Size,Name 0x000000710124a37c,U,000140, 0x000000710124a408,U,000048, 0x000000710124a438,U,000092, -0x000000710124a494,U,000100, -0x000000710124a4f8,U,000108, -0x000000710124a564,U,000292,DebugFinder::createInstance -0x000000710124a688,U,000004,nullsub_4722 -0x000000710124a68c,U,000004,j__ZdlPv_1261 +0x000000710124a494,O,000100,_ZN4ksys11DebugFinder18SingletonDisposer_D1Ev +0x000000710124a4f8,O,000108,_ZN4ksys11DebugFinder18SingletonDisposer_D0Ev +0x000000710124a564,O,000292,_ZN4ksys11DebugFinder14createInstanceEPN4sead4HeapE +0x000000710124a688,O,000004,_ZN4ksys11DebugFinder4initEPN4sead4HeapE +0x000000710124a68c,U,000004, 0x000000710124a690,U,000008, 0x000000710124a698,U,000108, 0x000000710124a704,U,000108, diff --git a/src/KingSystem/System/CMakeLists.txt b/src/KingSystem/System/CMakeLists.txt index f3fe4e5b..95afaea7 100644 --- a/src/KingSystem/System/CMakeLists.txt +++ b/src/KingSystem/System/CMakeLists.txt @@ -9,6 +9,8 @@ target_sources(uking PRIVATE CameraEditor.h CameraMgr.cpp CameraMgr.h + DebugFinder.cpp + DebugFinder.h DebugMessage.h HavokWorkerMgr.cpp HavokWorkerMgr.h diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp new file mode 100644 index 00000000..d566df2b --- /dev/null +++ b/src/KingSystem/System/DebugFinder.cpp @@ -0,0 +1,14 @@ +#include "KingSystem/System/DebugFinder.h" + +namespace ksys { + +SEAD_SINGLETON_DISPOSER_IMPL(DebugFinder) + +DebugFinder::DebugFinder() = default; + +void DebugFinder::init(sead::Heap* heap) { + +} + +} + diff --git a/src/KingSystem/System/DebugFinder.h b/src/KingSystem/System/DebugFinder.h new file mode 100644 index 00000000..c1b26cf5 --- /dev/null +++ b/src/KingSystem/System/DebugFinder.h @@ -0,0 +1,22 @@ +#pragma once + +#include +#include + +namespace ksys { + +class DebugFinder{ + SEAD_SINGLETON_DISPOSER(DebugFinder) + DebugFinder(); + virtual ~DebugFinder(); + +public: + void init(sead::Heap* heap); + +private: + sead::FixedSafeString<0x40> unused_1; + sead::FixedSafeString<0x100> unused_2; + u32 unused_3 = 0; +}; + +} // namespace ksys::evt \ No newline at end of file From 341f9166d093dae514148f1d57743450b1ffdc58 Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Mon, 9 Aug 2021 16:44:26 -0700 Subject: [PATCH 2/5] fix style --- src/KingSystem/System/DebugFinder.cpp | 6 ++---- src/KingSystem/System/DebugFinder.h | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp index d566df2b..2f10e1dd 100644 --- a/src/KingSystem/System/DebugFinder.cpp +++ b/src/KingSystem/System/DebugFinder.cpp @@ -6,9 +6,7 @@ SEAD_SINGLETON_DISPOSER_IMPL(DebugFinder) DebugFinder::DebugFinder() = default; -void DebugFinder::init(sead::Heap* heap) { - -} +void DebugFinder::init(sead::Heap* heap) {} -} +} // namespace ksys diff --git a/src/KingSystem/System/DebugFinder.h b/src/KingSystem/System/DebugFinder.h index c1b26cf5..95205051 100644 --- a/src/KingSystem/System/DebugFinder.h +++ b/src/KingSystem/System/DebugFinder.h @@ -5,18 +5,18 @@ namespace ksys { -class DebugFinder{ +class DebugFinder { SEAD_SINGLETON_DISPOSER(DebugFinder) DebugFinder(); virtual ~DebugFinder(); - + public: void init(sead::Heap* heap); - + private: sead::FixedSafeString<0x40> unused_1; sead::FixedSafeString<0x100> unused_2; u32 unused_3 = 0; }; - -} // namespace ksys::evt \ No newline at end of file + +} // namespace ksys \ No newline at end of file From b502476d9632379379b28bc726be85c8a7a1eb68 Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Mon, 9 Aug 2021 16:46:25 -0700 Subject: [PATCH 3/5] fix style again --- src/KingSystem/System/DebugFinder.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp index 2f10e1dd..ff61e1f2 100644 --- a/src/KingSystem/System/DebugFinder.cpp +++ b/src/KingSystem/System/DebugFinder.cpp @@ -8,5 +8,4 @@ DebugFinder::DebugFinder() = default; void DebugFinder::init(sead::Heap* heap) {} -} // namespace ksys - +} // namespace ksys \ No newline at end of file From 66aa5f139b7a743c0ef144f139326c52e3d3edb7 Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Mon, 23 Aug 2021 12:10:41 -0700 Subject: [PATCH 4/5] add trailing new line and make DebugFinder destructor not virtual --- src/KingSystem/System/DebugFinder.cpp | 2 +- src/KingSystem/System/DebugFinder.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp index ff61e1f2..10ddadf7 100644 --- a/src/KingSystem/System/DebugFinder.cpp +++ b/src/KingSystem/System/DebugFinder.cpp @@ -8,4 +8,4 @@ DebugFinder::DebugFinder() = default; void DebugFinder::init(sead::Heap* heap) {} -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/System/DebugFinder.h b/src/KingSystem/System/DebugFinder.h index 95205051..9beed3ff 100644 --- a/src/KingSystem/System/DebugFinder.h +++ b/src/KingSystem/System/DebugFinder.h @@ -8,7 +8,7 @@ namespace ksys { class DebugFinder { SEAD_SINGLETON_DISPOSER(DebugFinder) DebugFinder(); - virtual ~DebugFinder(); + ~DebugFinder(); public: void init(sead::Heap* heap); @@ -19,4 +19,4 @@ private: u32 unused_3 = 0; }; -} // namespace ksys \ No newline at end of file +} // namespace ksys From e3a6211fc24f3114c578a7538e3102af0880cfc2 Mon Sep 17 00:00:00 2001 From: iTNTPiston Date: Mon, 23 Aug 2021 12:30:48 -0700 Subject: [PATCH 5/5] Add listing for DebugFinder dtors --- data/uking_functions.csv | 4 ++-- src/KingSystem/System/DebugFinder.cpp | 2 +- src/KingSystem/System/DebugFinder.h | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 75efdfdc..aa800f7b 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -94020,8 +94020,8 @@ Address,Quality,Size,Name 0x000000710124a494,O,000100,_ZN4ksys11DebugFinder18SingletonDisposer_D1Ev 0x000000710124a4f8,O,000108,_ZN4ksys11DebugFinder18SingletonDisposer_D0Ev 0x000000710124a564,O,000292,_ZN4ksys11DebugFinder14createInstanceEPN4sead4HeapE -0x000000710124a688,O,000004,_ZN4ksys11DebugFinder4initEPN4sead4HeapE -0x000000710124a68c,U,000004, +0x000000710124a688,O,000004,_ZN4ksys11DebugFinderD1Ev +0x000000710124a68c,O,000004,_ZN4ksys11DebugFinderD0Ev 0x000000710124a690,U,000008, 0x000000710124a698,U,000108, 0x000000710124a704,U,000108, diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp index 10ddadf7..7e5a1d82 100644 --- a/src/KingSystem/System/DebugFinder.cpp +++ b/src/KingSystem/System/DebugFinder.cpp @@ -6,6 +6,6 @@ SEAD_SINGLETON_DISPOSER_IMPL(DebugFinder) DebugFinder::DebugFinder() = default; -void DebugFinder::init(sead::Heap* heap) {} +DebugFinder::~DebugFinder() = default; } // namespace ksys diff --git a/src/KingSystem/System/DebugFinder.h b/src/KingSystem/System/DebugFinder.h index 9beed3ff..16eb4e4c 100644 --- a/src/KingSystem/System/DebugFinder.h +++ b/src/KingSystem/System/DebugFinder.h @@ -8,10 +8,7 @@ namespace ksys { class DebugFinder { SEAD_SINGLETON_DISPOSER(DebugFinder) DebugFinder(); - ~DebugFinder(); - -public: - void init(sead::Heap* heap); + virtual ~DebugFinder(); private: sead::FixedSafeString<0x40> unused_1;