wip

Author: emesare

view/sharedcache/core/SharedCache.cpp

@@ -180,7 +180,7 @@ CacheEntryId SharedCache::AddEntry(CacheEntry entry)
         m_vm->MapRegion(fileAccessor, {mapping.address, mapping.address + mapping.size}, mapping.fileOffset);
 
         // Recalculate the base address.
-        if (mapping.address < m_baseAddress)
+        if (mapping.address < m_baseAddress || m_baseAddress == 0)
             m_baseAddress = mapping.address;
     }
 
@@ -456,8 +456,7 @@ bool CacheProcessor::ProcessCache(SharedCache& cache)
     // NOTE: This is extremely error-prone!
     // We are going to start trying to find files next to this one on disk!
     std::filesystem::path basePath = std::filesystem::path(baseFilePath).parent_path();
-    std::string pattern = fmt::format(".*{}\\.([0-9]+|symbols|dylddata)$", FileName(baseFilePath));
-    auto subCachePattern = std::regex(pattern);
+    std::string baseFileName = FileName(baseFilePath);
     for (const auto &entry : std::filesystem::directory_iterator(basePath))
     {
         if (!entry.is_regular_file())
@@ -468,8 +467,8 @@ bool CacheProcessor::ProcessCache(SharedCache& cache)
         if (currentFilePath == baseFilePath)
             continue;
 
-        // Filter files that dont end with .NUMBER or .symbols or .dylddata
-        if (!std::regex_match(currentFilePath, subCachePattern))
+        // Filter files that don't contain the base file name i.e. "dyld_shared_cache_arm64e"
+        if (currentFilePath.find(baseFileName) == std::string::npos)
             continue;
 
         auto additionalEntry = CacheEntry::FromFile(currentFilePath, CacheEntryType::Secondary);

view/sharedcache/core/SharedCacheController.cpp

@@ -83,10 +83,13 @@ bool SharedCacheController::LoadRegion(BinaryView& view, const CacheRegion& regi
     }
 
     // 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);
     // 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());
 
+    LogInfo("Loaded region %s at %p", region.name.c_str(), region.start);
+
     m_loadedRegions.insert(region.start);
 
     return true;

view/sharedcache/core/Utility.cpp

@@ -109,10 +109,16 @@ void ApplySymbol(Ref<BinaryView> view, Ref<TypeLibrary> typeLib, Ref<Symbol> sym
             std::vector<FunctionParameter> callTypeParams;
             auto cc = view->GetDefaultArchitecture()->GetCallingConventionByName("apple-arm64-objc-fast-arc-" + num);
 
-            callTypeParams.emplace_back("obj", view->GetTypeByName({ "id" }), true, Variable());
-
-            auto funcType = Type::FunctionType(view->GetTypeByName({ "id" }), cc, callTypeParams);
-            func->SetUserType(funcType);
+        	if (auto idType = view->GetTypeByName({ "id" }))
+        	{
+        		callTypeParams.emplace_back("obj", idType, true, Variable());
+        		auto funcType = Type::FunctionType(idType, cc, callTypeParams);
+        		func->SetUserType(funcType);
+        	}
+        	else
+        	{
+        		LogWarn("Failed to find id type for %llx, objective-c processor not ran?", func->GetStart());
+        	}
         }
     }
 }