Refactor and fixup MSVC and Itanium RTTI

Bunch of misc fixes and performance improvements

1 files changed, 19 insertions, 7 deletions

diff --git a/plugins/rtti/rtti.h b/plugins/rtti/rtti.h
index 474253ec..e2913db4 100644
--- a/plugins/rtti/rtti.h
+++ b/plugins/rtti/rtti.h
@@ -16,7 +16,7 @@ namespace BinaryNinja::RTTI {
 	{
 		uint64_t funcAddr;
 
-		Ref<Metadata> SerializedMetadata();
+		Ref<Metadata> SerializedMetadata() const;
 
 		static VirtualFunctionInfo DeserializedMetadata(const Ref<Metadata> &metadata);
 	};
@@ -26,7 +26,7 @@ namespace BinaryNinja::RTTI {
 		uint64_t address;
 		std::vector<VirtualFunctionInfo> virtualFunctions;
 
-		Ref<Metadata> SerializedMetadata();
+		Ref<Metadata> SerializedMetadata(bool serializeFunctions = true) const;
 
 		static VirtualFunctionTableInfo DeserializedMetadata(const Ref<Metadata> &metadata);
 	};
@@ -37,17 +37,29 @@ namespace BinaryNinja::RTTI {
 		Itanium = 1,
 	};
 
+	struct BaseClassInfo
+	{
+		std::string className;
+		// TODO: This has to be optional, as we might need to resolve this at a later stage.
+		// TODO: The offset also might literally not exist.
+		uint64_t offset;
+		std::optional<VirtualFunctionTableInfo> vft;
+
+		Ref<Metadata> SerializedMetadata() const;
+
+		static BaseClassInfo DeserializedMetadata(const Ref<Metadata> &metadata);
+	};
+
 	// TODO: This needs to have some flags. Virtual, pure iirc.
 	struct ClassInfo
 	{
 		RTTIProcessorType processor;
 		std::string className;
-		std::optional<std::string> baseClassName;
-		std::optional<uint64_t> classOffset;
+
 		std::optional<VirtualFunctionTableInfo> vft;
-		std::optional<VirtualFunctionTableInfo> baseVft;
+		std::vector<BaseClassInfo> baseClasses;
 
-		Ref<Metadata> SerializedMetadata();
+		Ref<Metadata> SerializedMetadata() const;
 
 		static ClassInfo DeserializedMetadata(const Ref<Metadata> &metadata);
 	};
@@ -63,7 +75,7 @@ namespace BinaryNinja::RTTI {
 
 		virtual std::optional<ClassInfo> ProcessRTTI(uint64_t objectAddr) = 0;
 
-		virtual std::optional<VirtualFunctionTableInfo> ProcessVFT(uint64_t vftAddr, ClassInfo &classInfo) = 0;
+		virtual std::optional<VirtualFunctionTableInfo> ProcessVFT(uint64_t vftAddr, ClassInfo &classInfo, std::optional<BaseClassInfo> baseClassInfo) = 0;
 	public:
 		virtual ~RTTIProcessor() = default;