Consolidate metadata for RTTI processors and a bunch of misc fixes

Also allows for both processors to be ran for a single binary

1 files changed, 6 insertions, 15 deletions

diff --git a/plugins/rtti/itanium.h b/plugins/rtti/itanium.h
index 01a765bb..98fe7052 100644
--- a/plugins/rtti/itanium.h
+++ b/plugins/rtti/itanium.h
@@ -108,29 +108,20 @@ namespace BinaryNinja::RTTI::Itanium {
 		PointerToMemberTypeInfo(BinaryView *view, uint64_t address);
 	};
 
-	class ItaniumRTTIProcessor
+	class ItaniumRTTIProcessor : public RTTIProcessor
 	{
-		Ref<BinaryView> m_view;
-		Ref<Logger> m_logger;
 		bool allowMangledClassNames;
 		bool checkWritableRData;
 		bool virtualFunctionTableSweep;
 
-		std::map<uint64_t, ClassInfo> m_classInfo;
-
-		void DeserializedMetadata(const Ref<Metadata> &metadata);
-
-		std::optional<VirtualFunctionTableInfo> ProcessVTT(uint64_t vttAddr, const ClassInfo &classInfo);
+		std::optional<ClassInfo> ProcessRTTI(uint64_t objectAddr) override;
 
+		std::optional<VirtualFunctionTableInfo> ProcessVFT(uint64_t vftAddr, ClassInfo &classInfo) override;
 	public:
-		ItaniumRTTIProcessor(const Ref<BinaryView> &view, bool useMangled = true, bool checkRData = true, bool vttSweep = true);
-
-		Ref<Metadata> SerializedMetadata();
-
-		void ProcessRTTI();
+		explicit ItaniumRTTIProcessor(const Ref<BinaryView> &view, bool useMangled = true, bool checkRData = true, bool vttSweep = true);
 
-		std::optional<ClassInfo> ProcessRTTI(uint64_t objectAddr);
+		void ProcessRTTI() override;
 
-		void ProcessVTT();
+		void ProcessVFT() override;
 	};
 }
\ No newline at end of file