Refactor and fixup MSVC and Itanium RTTI

Bunch of misc fixes and performance improvements

1 files changed, 8 insertions, 16 deletions

diff --git a/plugins/rtti/microsoft.h b/plugins/rtti/microsoft.h
index b67431ec..b92bf7f3 100644
--- a/plugins/rtti/microsoft.h
+++ b/plugins/rtti/microsoft.h
@@ -57,32 +57,24 @@ namespace BinaryNinja::RTTI::Microsoft {
 		CompleteObjectLocator(BinaryView *view, uint64_t address);
 	};
 
-	class MicrosoftRTTIProcessor
+	class MicrosoftRTTIProcessor : public RTTIProcessor
 	{
-		Ref<BinaryView> m_view;
-		Ref<Logger> m_logger;
 		bool allowMangledClassNames;
 		bool allowAnonymousClassNames;
 		bool checkWritableRData;
 		bool virtualFunctionTableSweep;
 
-		std::map<uint64_t, ClassInfo> m_classInfo;
+		// This will process a CHD and store all `BaseClassInfo` in `classInfo`.
+		std::vector<BaseClassInfo> ProcessClassHierarchyDescriptor(uint64_t address, CompleteObjectLocator &coLocator, const ClassInfo &classInfo);
 
-		std::set<uint64_t> m_visitedClassHierarchyDescAddrs;
-
-		void DeserializedMetadata(const Ref<Metadata> &metadata);
-
-		std::optional<ClassInfo> ProcessRTTI(uint64_t coLocatorAddr);
-
-		std::optional<VirtualFunctionTableInfo> ProcessVFT(uint64_t vftAddr, const ClassInfo &classInfo);
+		std::optional<ClassInfo> ProcessRTTI(uint64_t objectAddr) override;
 
+		std::optional<VirtualFunctionTableInfo> ProcessVFT(uint64_t vftAddr, ClassInfo &classInfo, std::optional<BaseClassInfo> baseClassInfo) override;
 	public:
-		MicrosoftRTTIProcessor(const Ref<BinaryView> &view, bool useMangled = true, bool checkRData = true, bool vftSweep = true, bool allowAnonymous = true);
-
-		Ref<Metadata> SerializedMetadata();
+		explicit MicrosoftRTTIProcessor(const Ref<BinaryView> &view, bool useMangled = true, bool checkRData = true, bool vftSweep = true, bool allowAnonymous = true);
 
-		void ProcessRTTI();
+		void ProcessRTTI() override;
 
-		void ProcessVFT();
+		void ProcessVFT() override;
 	};
 }
\ No newline at end of file