wip

Author: emesare

view/sharedcache/core/FileAccessorCache.h

@@ -63,6 +63,7 @@ class WeakFileAccessor
     // File path for re-opening if needed
     std::string m_filePath;
 
+    // Used to re-add writes once the file accessor is "revived".
     std::shared_ptr<FileAccessorWriteLog> m_writeLog;
 
     // TODO: Store a weak_ptr/shared_ptr to FileAccessorCache? That way we dont access Global()

view/sharedcache/core/SharedCacheController.cpp

@@ -127,13 +127,17 @@ bool SharedCacheController::ApplyRegion(BinaryView& view, const CacheRegion& reg
     }
 
     // Unique memory region name so that we don't cause collisions.
+    // TODO: Better name? I dont really think so...
     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(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());
+    // If we are not associated with an image we can create a section here to set the semantics.
+    // This is important for stub regions, as they will deref non image data that we want to retrieve the value of.
+    if (region.type != CacheRegionType::Image)
+        view.AddUserSection(memoryRegionName, region.start, region.size, region.SectionSemanticsForRegion());
 
     m_loadedRegions.insert(region.start);
 

view/sharedcache/workflow/SharedCacheWorkflow.cpp

@@ -160,14 +160,8 @@ void FixupStubs(Ref<AnalysisContext> ctx)
 		{
 			// Update all the functions inside our current activities function section.
 			for (const auto &sectFunc : view->GetAnalysisFunctionList())
-			{
 				if (section->GetStart() <= sectFunc->GetStart() && sectFunc->GetStart() < section->GetEnd())
-				{
-					// If there are any new functions we should re-analyze the current function.
-					func->Reanalyze();
-					break;
-				}
-			}
+					sectFunc->Reanalyze();
 		}
 
 		workflowState->loadMutex.unlock();
@@ -184,7 +178,6 @@ void FixupStubs(Ref<AnalysisContext> ctx)
 			if (dest.operation == MLIL_CONST_PTR)
 			{
 				// We're ready, everything is here
-				// TODO: what the fuck does the above mean?
 				func->SetAutoInlinedDuringAnalysis(true);
 				return;
 			}
@@ -388,7 +381,7 @@ void SharedCacheWorkflow::Register()
 	ObjCActivity::Register(*workflow);
 	workflow->RegisterActivity(new Activity("core.analysis.sharedCache.stubs", &FixupStubs));
 	workflow->RegisterActivity(new Activity("core.analysis.sharedCache.calls", &FixupOffImageCalls));
-	// workflow->Insert("core.function.analyzeTailCalls", "core.analysis.dsc.stubs");
+	workflow->Insert("core.function.analyzeTailCalls", "core.analysis.sharedCache.stubs");
 	workflow->Insert("core.function.analyzeTailCalls", "core.analysis.sharedCache.calls");
 
 	Workflow::RegisterWorkflow(workflow, WORKFLOW_DESCRIPTION);