wip

Author: emesare

view/sharedcache/core/MachO.cpp

@@ -448,22 +448,18 @@ std::optional<SharedCacheMachOHeader> SharedCacheMachOHeader::ParseHeaderForAddr
 	return header;
 }
 
+// TODO: Support reading from .symbols file.
 // TODO: Replace view with address size?
 std::vector<CacheSymbol> SharedCacheMachOHeader::ReadSymbolTable(BinaryView& view, VirtualMemory& vm) const
 {
 	auto addressSize = view.GetAddressSize();
 	// NOTE: The symbol table will exist within the link edit segment, the table offsets are relative to the file not the linkedit segment.
 	uint64_t symbolsAddress = GetLinkEditFileBase() + symtab.symoff;
 	uint64_t stringsAddress = GetLinkEditFileBase() + symtab.stroff;
-	uint64_t link = GetLinkEditFileBase();
-	if (!vm.IsAddressMapped(link))
-	{
-		LogError("Link edit segment not mapped %llx", link);
-		return {};
-	}
 
 	// TODO: This needs to be passed in as an optional argument.
 	// TODO: Sometimes symbol tables are shared and we have to offset into the table for a specific header.
+	// TODO: The "shared" symbol tables are stored in .symbols files.
 	int nlistStartIndex = 0;
 
 	std::vector<CacheSymbol> symbolList;

view/sharedcache/core/SharedCache.cpp

@@ -51,6 +51,7 @@ std::optional<CacheEntry> CacheEntry::FromFile(const std::string& filePath, Cach
         return std::nullopt;
 
     // Read the header, this _should_ be compatible with all known DSC formats.
+    // Mason: the above is not true! https://github.com/Vector35/binaryninja-api/issues/6073
     dyld_cache_header header = {};
     file->Read(&header, 0, sizeof(header));
 
@@ -341,6 +342,8 @@ void SharedCache::ProcessEntry(const CacheEntry &entry)
             // std::vector<CacheSymbol> symbols = imageHeader->ReadSymbolTable(view, *m_vm);
             // AddSymbols(std::move(symbols));
 
+            // TODO: Process
+
             // TODO: Should export symbols be put in a different bucket? How are they consumed differently?
             std::vector<CacheSymbol> exportSymbols = imageHeader->ReadExportSymbolTable(*m_vm);
             AddSymbols(std::move(exportSymbols));

view/sharedcache/core/SharedCacheView.cpp

@@ -180,6 +180,9 @@ bool SharedCacheView::Init()
 	char magic[17];
 	GetParentView()->Read(&magic, 0, 16);
 	magic[16] = 0;
+
+	// TODO: Do we want to add any warnings about platform support here?
+	// TODO: Do we still consider macos experimental?
 	switch (platform)
 	{
 		case DSCPlatformMacOS:

view/sharedcache/ui/dsctriage.cpp

@@ -121,6 +121,7 @@ DSCTriageView::DSCTriageView(QWidget* parent, BinaryViewRef data) : QWidget(pare
 
 		auto refreshDataButton = new CustomStyleFlatPushButton();
 		{
+			// TODO: Might want to introduce a cooldown for this button (if we even keep it)
 			connect(refreshDataButton, &QPushButton::clicked, [this](bool) { RefreshData(); });
 			refreshDataButton->setText("Refresh");
 

view/sharedcache/ui/symboltable.cpp

@@ -113,10 +113,12 @@ SymbolTableView::~SymbolTableView() {
 
 void SymbolTableView::populateSymbols(BinaryView &view)
 {
-	auto controller = SharedCacheController::GetController(view);
-	if (controller) {
+	if (auto controller = SharedCacheController::GetController(view)) {
 		BackgroundThread::create(this)
-			->thenBackground([this, controller](){ m_symbols = controller->GetSymbols(); })
+			->thenBackground([this, controller]() {
+				std::vector<CacheSymbol> newSymbols = controller->GetSymbols();
+				m_symbols.swap(newSymbols);
+			})
 			->thenMainThread([this](){ m_model->updateSymbols(); })
 			->start();
 	}