Merge b2a57f4391 into 0fdf1cc386

Android: Remove unused BiMap class

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/BiMap.java

@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BiMap<K, V>
-{
-
-  private Map<K, V> forward = new HashMap<>();
-  private Map<V, K> backward = new HashMap<>();
-
-  public synchronized void add(K key, V value)
-  {
-    forward.put(key, value);
-    backward.put(value, key);
-  }
-
-  public synchronized V getForward(K key)
-  {
-    return forward.get(key);
-  }
-
-  public synchronized K getBackward(V key)
-  {
-    return backward.get(key);
-  }
-}

Source/Core/Core/Boot/ElfReader.cpp

@@ -143,17 +143,23 @@ bool ElfReader::LoadIntoMemory(Core::System& system, bool only_in_mem1) const
   {
     Elf32_Phdr* p = segments + i;
 
-    INFO_LOG_FMT(BOOT, "Type: {} Vaddr: {:08x} Filesz: {} Memsz: {}", p->p_type, p->p_vaddr,
-                 p->p_filesz, p->p_memsz);
+    INFO_LOG_FMT(BOOT, "Type: {} Vaddr: {:08x} Paddr: {:08x} Filesz: {} Memsz: {}", p->p_type,
+                 p->p_vaddr, p->p_paddr, p->p_filesz, p->p_memsz);
 
     if (p->p_type == PT_LOAD)
     {
-      u32 writeAddr = p->p_vaddr;
+      // Check LMA (paddr) first - some are nonsense, so fall back to VMA (vaddr) if invalid
+      u32 writeAddr = p->p_paddr;
+      if (writeAddr)
+        writeAddr |= 0x80000000;  // map to virtual address
+      else
+        writeAddr = p->p_vaddr;  // LMA is empty, fall back to VMA
+
       const u8* src = GetSegmentPtr(i);
       u32 srcSize = p->p_filesz;
       u32 dstSize = p->p_memsz;
 
-      if (only_in_mem1 && p->p_vaddr >= memory.GetRamSizeReal())
+      if (only_in_mem1 && writeAddr >= memory.GetRamSizeReal())
         continue;
 
       memory.CopyToEmu(writeAddr, src, srcSize);

Source/Core/Core/DolphinAnalytics.cpp

@@ -57,10 +57,19 @@ void DolphinAnalytics::AndroidSetGetValFunc(std::function<std::string(std::strin
 
 DolphinAnalytics::DolphinAnalytics()
 {
+  m_last_analytics_enabled = Config::Get(Config::MAIN_ANALYTICS_ENABLED);
+
   ReloadConfig();
   MakeBaseBuilder();
 
-  m_config_changed_callback_id = Config::AddConfigChangedCallback([this] { ReloadConfig(); });
+  m_config_changed_callback_id = Config::AddConfigChangedCallback([this] {
+    bool current_analytics_enabled = Config::Get(Config::MAIN_ANALYTICS_ENABLED);
+    if (m_last_analytics_enabled != current_analytics_enabled)
+    {
+      m_last_analytics_enabled = current_analytics_enabled;
+      ReloadConfig();
+    }
+  });
 }
 
 DolphinAnalytics::~DolphinAnalytics()
@@ -80,7 +89,7 @@ void DolphinAnalytics::ReloadConfig()
 
   // Install the HTTP backend if analytics support is enabled.
   std::unique_ptr<Common::AnalyticsReportingBackend> new_backend;
-  if (Config::Get(Config::MAIN_ANALYTICS_ENABLED))
+  if (m_last_analytics_enabled)
   {
     new_backend = std::make_unique<Common::HttpAnalyticsBackend>(ANALYTICS_ENDPOINT);
   }

Source/Core/Core/DolphinAnalytics.h

@@ -203,4 +203,5 @@ private:
   std::mutex m_reporter_mutex;
   Common::AnalyticsReporter m_reporter;
   Config::ConfigChangedCallbackID m_config_changed_callback_id{};
+  bool m_last_analytics_enabled = false;
 };