From 5088febc53fb9f0d6496a410baf8b393befb845d Mon Sep 17 00:00:00 2001
From: Brandon Miller <brandon@vector35.com>
Date: Wed, 15 May 2024 09:44:37 -0400
Subject: Removed loader.architecture override from views

Architecture is derived from platform object and can be overriden
using loader.platform
---
 view/macho/machoview.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'view/macho/machoview.cpp')

diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
index f84d0565..5f3aa041 100644
--- a/view/macho/machoview.cpp
+++ b/view/macho/machoview.cpp
@@ -1099,13 +1099,20 @@ bool MachoView::Init()
 
 	SetOriginalBase(initialImageBase);
 	uint64_t preferredImageBase = initialImageBase;
-	if (settings && settings->Contains("loader.imageBase") && settings->Contains("loader.architecture")) // handle overrides
+	if (settings)
 	{
-		preferredImageBase = settings->Get<uint64_t>("loader.imageBase", this);
+		if (settings->Contains("loader.imageBase"))
+			preferredImageBase = settings->Get<uint64_t>("loader.imageBase", this);
 
-		Ref<Architecture> arch = Architecture::GetByName(settings->Get<string>("loader.architecture", this));
-		if (!m_arch || (arch && (arch->GetName() != m_arch->GetName())))
-			m_arch = arch;
+		if (settings->Contains("loader.platform"))
+		{
+			Ref<Platform> platform = Platform::GetByName(settings->Get<string>("loader.platform", this));
+			if (platform)
+			{
+				m_plat = platform;
+				m_arch = platform->GetArchitecture();
+			}
+		}
 	}
 
 	m_imageBaseAdjustment = 0;
@@ -1807,13 +1814,6 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 		if (header.m_entryPoints.size() > 0)
 			platform = platform->GetAssociatedPlatformByAddress(header.m_entryPoints[0]);
 
-		if (settings && settings->Contains("loader.platform")) // handle overrides
-		{
-			Ref<Platform> platformOverride = Platform::GetByName(settings->Get<string>("loader.platform", this));
-			if (platformOverride)
-				platform = platformOverride;
-		}
-
 		SetDefaultPlatform(platform);
 		SetDefaultArchitecture(platform->GetArchitecture());
 
@@ -3345,7 +3345,7 @@ Ref<Settings> MachoViewType::GetLoadSettingsForData(BinaryView* data)
 	Ref<Settings> settings = GetDefaultLoadSettingsForData(viewRef);
 
 	// specify default load settings that can be overridden
-	vector<string> overrides = {"loader.architecture", "loader.imageBase", "loader.platform"};
+	vector<string> overrides = {"loader.imageBase", "loader.platform"};
 	if (!viewRef->IsRelocatable())
 		settings->UpdateProperty("loader.imageBase", "message", "Note: File indicates image is not relocatable.");
 
-- 
cgit v1.3.1