wip

Author: emesare

view/sharedcache/core/MachO.cpp

@@ -434,10 +434,7 @@ std::optional<SharedCacheMachOHeader> SharedCacheMachOHeader::ParseHeaderForAddr
 			char sectionName[17];
 			memcpy(sectionName, section.sectname, sizeof(section.sectname));
 			sectionName[16] = 0;
-			if (header.identifierPrefix.empty())
-				header.sectionNames.emplace_back(sectionName);
-			else
-				header.sectionNames.push_back(header.identifierPrefix + "::" + sectionName);
+			header.sectionNames.push_back(header.identifierPrefix + "::" + sectionName);
 		}
 	}
 	catch (ReadException&)
@@ -565,30 +562,40 @@ std::optional<CacheSymbol> SharedCacheMachOHeader::AddExportTerminalSymbol(const
     if (symbolName.empty() || symbolAddress == 0)
         return std::nullopt;
 
-    CacheSymbol exportSym;
-    exportSym.name = symbolName;
-    exportSym.type = DataSymbol;
-    exportSym.address = symbolAddress;
-
-    uint32_t sectionFlags = 0;
-    for (const auto& section : sections)
-    {
-        if (section.addr < symbolAddress && section.addr + section.size > symbolAddress)
-        {
-            // Take the flags from the first containing section.
-            sectionFlags = section.flags;
-            break;
-        }
-    }
-
-	// TODO: Is this enough to determine a function symbol?
-	// TODO: Might be the cause of https://github.com/Vector35/binaryninja-api/issues/6526
-    // Check the sections flags to see if we actually have a function symbol instead.
-    if ((sectionFlags & S_ATTR_PURE_INSTRUCTIONS) == S_ATTR_PURE_INSTRUCTIONS
-        || (sectionFlags & S_ATTR_SOME_INSTRUCTIONS) == S_ATTR_SOME_INSTRUCTIONS)
-        exportSym.type = FunctionSymbol;
-
-    return exportSym;
+	// Tries to get the symbol type based off the section containing it.
+	auto sectionSymbolType = [&]() -> BNSymbolType {
+		uint32_t sectionFlags = 0;
+		for (const auto& section : sections)
+		{
+			if (symbolAddress >= section.addr && symbolAddress < section.addr + section.size)
+			{
+				// Take the flags from the first containing section.
+				sectionFlags = section.flags;
+				break;
+			}
+		}
+
+		// TODO: Is this enough to determine a function symbol?
+		// TODO: Might be the cause of https://github.com/Vector35/binaryninja-api/issues/6526
+		// Check the sections flags to see if we actually have a function symbol instead.
+		if (sectionFlags & S_ATTR_PURE_INSTRUCTIONS || sectionFlags & S_ATTR_SOME_INSTRUCTIONS)
+			return FunctionSymbol;
+
+		// By default, just return data symbol.
+		return DataSymbol;
+	};
+
+	switch (symbolFlags & EXPORT_SYMBOL_FLAGS_KIND_MASK)
+	{
+	case EXPORT_SYMBOL_FLAGS_KIND_REGULAR:
+	case EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL:
+		return CacheSymbol(sectionSymbolType(), symbolAddress, symbolName);
+	case EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE:
+		return CacheSymbol(DataSymbol, symbolAddress, symbolName);
+	default:
+		LogWarn("Unhandled export symbol kind: %x", symbolFlags & EXPORT_SYMBOL_FLAGS_KIND_MASK);
+		return std::nullopt;
+	}
 }
 
 // TODO: This is like 90% of the runtime.

view/sharedcache/core/MachO.h

@@ -12,6 +12,7 @@ struct SharedCacheMachOHeader
 	uint64_t textBase = 0;
 	uint64_t loadCommandOffset = 0;
 	BinaryNinja::mach_header_64 ident;
+	// NOTE: This should never be empty.
 	std::string identifierPrefix;
 	std::string installName;
 

view/sharedcache/core/SharedCache.h

@@ -38,8 +38,6 @@ enum class CacheRegionType
 	NonImage,
 };
 
-// TODO: Make an ImageCacheRegion that holds the image start?
-// TODO: Holding the image start here is annoying AF
 struct CacheRegion
 {
 	CacheRegionType type;

view/sharedcache/core/SharedCacheController.cpp

@@ -126,9 +126,12 @@ bool SharedCacheController::ApplyRegion(BinaryView& view, const CacheRegion& reg
         return false;
     }
 
+    // Unique memory region name so that we don't cause collisions.
+    const auto memoryRegionName = fmt::format("{}_0x{:x}", region.name, region.start);
+
     // NOTE: Adding a data memory region will store the entire contents of the region in the BNDB.
     // TODO: We can use the AddRemoteMemoryRegion if we want to reload on view init.
-    view.GetMemoryMap()->AddDataMemoryRegion(region.name, region.start, buffer, region.flags);
+    view.GetMemoryMap()->AddDataMemoryRegion(memoryRegionName, region.start, buffer, region.flags);
     // TODO: We might want to make this auto if we decide to "reload" all loaded region in view init.
     // view.AddUserSection(region.name, region.start, region.size, region.SectionSemanticsForRegion());