System: Support loading ELF files

stenzek · Nov 5, 2024 · ead9e56 · ead9e56 · crashGG · Nov 6, 2024
1 parent 65f3dcb
commit ead9e56
Show file tree

Hide file tree

Showing 13 changed files with 424 additions and 21 deletions.
diff --git a/src/common/log_channels.h b/src/common/log_channels.h
@@ -22,6 +22,7 @@
   X(DInputSource)                                                                                                      \
   X(DMA)                                                                                                               \
   X(DynamicLibrary)                                                                                                    \
+  X(FileLoader)                                                                                                        \
   X(FileSystem)                                                                                                        \
   X(FullscreenUI)                                                                                                      \
   X(GDBProtocol)                                                                                                       \
@@ -55,7 +56,6 @@
   X(Multitap)                                                                                                          \
   X(NeGconRumble)                                                                                                      \
   X(PCDrv)                                                                                                             \
-  X(PSFLoader)                                                                                                         \
   X(Pad)                                                                                                               \
   X(PerfMon)                                                                                                           \
   X(PlatformMisc)                                                                                                      \

diff --git a/src/core/bus.cpp b/src/core/bus.cpp
@@ -23,6 +23,7 @@
 #include "timing_event.h"
 
 #include "util/cd_image.h"
+#include "util/elf_file.h"
 #include "util/state_wrapper.h"
 
 #include "common/align.h"
@@ -170,6 +171,7 @@ static void SetRAMPageWritable(u32 page_index, bool writable);
 static void KernelInitializedHook();
 static bool SideloadEXE(const std::string& path, Error* error);
 static bool InjectCPE(std::span<const u8> buffer, bool set_pc, Error* error);
+static bool InjectELF(const ELFFile& elf, bool set_pc, Error* error);
 
 static void SetHandlers();
 static void UpdateMappedRAMSize();
@@ -972,15 +974,12 @@ bool Bus::InjectExecutable(std::span<const u8> buffer, bool set_pc, Error* error
     return false;
   }
 
-  if (header.memfill_size > 0)
+  if (header.memfill_size > 0 &&
+      !CPU::SafeZeroMemoryBytes(header.memfill_start & ~UINT32_C(3), Common::AlignDownPow2(header.memfill_size, 4)))
   {
-    const u32 words_to_write = header.memfill_size / 4;
-    u32 address = header.memfill_start & ~UINT32_C(3);
-    for (u32 i = 0; i < words_to_write; i++)
-    {
-      CPU::SafeWriteMemoryWord(address, 0);
-      address += sizeof(u32);
-    }
+    Error::SetStringFmt(error, "Failed to zero {} bytes of memory at address 0x{:08X}.", header.memfill_start,
+                        header.memfill_size);
+    return false;
   }
 
   const u32 data_load_size =
@@ -1145,6 +1144,34 @@ bool Bus::InjectCPE(std::span<const u8> buffer, bool set_pc, Error* error)
   return true;
 }
 
+bool Bus::InjectELF(const ELFFile& elf, bool set_pc, Error* error)
+{
+  const bool okay = elf.LoadExecutableSections(
+    [](std::span<const u8> data, u32 dest_addr, u32 dest_size, Error* error) {
+      if (!data.empty() && !CPU::SafeWriteMemoryBytes(dest_addr, data))
+      {
+        Error::SetStringFmt(error, "Failed to load {} bytes to 0x{:08X}", data.size(), dest_addr);
+        return false;
+      }
+
+      const u32 zero_addr = dest_addr + static_cast<u32>(data.size());
+      const u32 zero_bytes = dest_size - static_cast<u32>(data.size());
+      if (zero_bytes > 0 && !CPU::SafeZeroMemoryBytes(zero_addr, zero_bytes))
+      {
+        Error::SetStringFmt(error, "Failed to zero {} bytes at 0x{:08X}", zero_bytes, zero_addr);
+        return false;
+      }
+
+      return true;
+    },
+    error);
+
+  if (okay && set_pc)
+    CPU::SetPC(elf.GetEntryPoint());
+
+  return okay;
+}
+
 void Bus::KernelInitializedHook()
 {
   if (s_kernel_initialize_hook_run)
@@ -1179,8 +1206,7 @@ void Bus::KernelInitializedHook()
 
 bool Bus::SideloadEXE(const std::string& path, Error* error)
 {
-  const std::optional<DynamicHeapArray<u8>> exe_data =
-    FileSystem::ReadBinaryFile(System::GetExeOverride().c_str(), error);
+  std::optional<DynamicHeapArray<u8>> exe_data = FileSystem::ReadBinaryFile(path.c_str(), error);
   if (!exe_data.has_value())
   {
     Error::AddPrefixFmt(error, "Failed to read {}: ", Path::GetFileName(path));
@@ -1195,6 +1221,14 @@ bool Bus::SideloadEXE(const std::string& path, Error* error)
   {
     okay = InjectCPE(exe_data->cspan(), true, error);
   }
+  else if (StringUtil::EndsWithNoCase(filename, ".elf"))
+  {
+    ELFFile elf;
+    if (!elf.Open(std::move(exe_data.value()), error))
+      return false;
+
+    okay = InjectELF(elf, true, error);
+  }
   else
   {
     // look for a libps.exe next to the exe, if it exists, load it

diff --git a/src/core/cpu_core.cpp b/src/core/cpu_core.cpp
@@ -3212,6 +3212,47 @@ bool CPU::SafeWriteMemoryBytes(VirtualMemoryAddress addr, const std::span<const
   return SafeWriteMemoryBytes(addr, data.data(), static_cast<u32>(data.size()));
 }
 
+bool CPU::SafeZeroMemoryBytes(VirtualMemoryAddress addr, u32 length)
+{
+  using namespace Bus;
+
+  const u32 seg = (addr >> 29);
+  if ((seg != 0 && seg != 4 && seg != 5) || (((addr + length) & PHYSICAL_MEMORY_ADDRESS_MASK) >= RAM_MIRROR_END) ||
+      (((addr & g_ram_mask) + length) > g_ram_size))
+  {
+    while ((addr & 3u) != 0 && length > 0)
+    {
+      if (!CPU::SafeWriteMemoryByte(addr, 0)) [[unlikely]]
+        return false;
+
+      addr++;
+      length--;
+    }
+    while (length >= 4)
+    {
+      if (!CPU::SafeWriteMemoryWord(addr, 0)) [[unlikely]]
+        return false;
+
+      addr += 4;
+      length -= 4;
+    }
+    while (length > 0)
+    {
+      if (!CPU::SafeWriteMemoryByte(addr, 0)) [[unlikely]]
+        return false;
+
+      addr++;
+      length--;
+    }
+
+    return true;
+  }
+
+  // Fast path: all in RAM, no wraparound.
+  std::memset(&g_ram[addr & g_ram_mask], 0, length);
+  return true;
+}
+
 void* CPU::GetDirectReadMemoryPointer(VirtualMemoryAddress address, MemoryAccessSize size, TickCount* read_ticks)
 {
   using namespace Bus;

diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h
@@ -185,6 +185,7 @@ bool SafeWriteMemoryHalfWord(VirtualMemoryAddress addr, u16 value);
 bool SafeWriteMemoryWord(VirtualMemoryAddress addr, u32 value);
 bool SafeWriteMemoryBytes(VirtualMemoryAddress addr, const void* data, u32 length);
 bool SafeWriteMemoryBytes(VirtualMemoryAddress addr, const std::span<const u8> data);
+bool SafeZeroMemoryBytes(VirtualMemoryAddress addr, u32 length);
 
 // External IRQs
 void SetIRQRequest(bool state);

diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp
@@ -949,8 +949,8 @@ void FullscreenUI::DestroyResources()
 
 ImGuiFullscreen::FileSelectorFilters FullscreenUI::GetDiscImageFilters()
 {
-  return {"*.bin",    "*.cue", "*.iso", "*.img", "*.chd",     "*.ecm", "*.mds", "*.psexe",
-          "*.ps-exe", "*.exe", "*.psx", "*.psf", "*.minipsf", "*.m3u", "*.pbp"};
+  return {"*.bin",   "*.cue",    "*.iso", "*.img", "*.chd", "*.ecm",     "*.mds", "*.cpe", "*.elf",
+          "*.psexe", "*.ps-exe", "*.exe", "*.psx", "*.psf", "*.minipsf", "*.m3u", "*.pbp"};
 }
 
 void FullscreenUI::DoStartPath(std::string path, std::string state, std::optional<bool> fast_boot)

diff --git a/src/core/psf_loader.cpp b/src/core/psf_loader.cpp
@@ -15,7 +15,7 @@
 
 #include <cstring>
 
-LOG_CHANNEL(PSFLoader);
+LOG_CHANNEL(FileLoader);
 
 namespace PSFLoader {
 static bool LoadLibraryPSF(const std::string& path, bool use_pc_sp, Error* error, u32 depth = 0);

diff --git a/src/core/system.cpp b/src/core/system.cpp
@@ -793,7 +793,7 @@ bool System::IsExePath(std::string_view path)
 {
   return (StringUtil::EndsWithNoCase(path, ".exe") || StringUtil::EndsWithNoCase(path, ".psexe") ||
           StringUtil::EndsWithNoCase(path, ".ps-exe") || StringUtil::EndsWithNoCase(path, ".psx") ||
-          StringUtil::EndsWithNoCase(path, ".cpe"));
+          StringUtil::EndsWithNoCase(path, ".cpe") || StringUtil::EndsWithNoCase(path, ".elf"));
 }
 
 bool System::IsPsfPath(std::string_view path)
@@ -811,7 +811,7 @@ bool System::IsLoadablePath(std::string_view path)
 {
   static constexpr const std::array extensions = {
     ".bin",    ".cue",        ".img",       ".iso", ".chd", ".ecm", ".mds", // discs
-    ".exe",    ".psexe",      ".ps-exe",    ".psx", ".cpe",                 // exes
+    ".exe",    ".psexe",      ".ps-exe",    ".psx", ".cpe", ".elf",         // exes
     ".psf",    ".minipsf",                                                  // psf
     ".psxgpu", ".psxgpu.zst", ".psxgpu.xz",                                 // gpu dump
     ".m3u",                                                                 // playlists

diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp
@@ -61,11 +61,12 @@
 LOG_CHANNEL(Host);
 
 static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
-  "MainWindow", "All File Types (*.bin *.img *.iso *.cue *.chd *.ecm *.mds *.pbp *.exe *.psexe *.ps-exe *.psx *.psf "
-                "*.minipsf *.m3u *.psxgpu);;Single-Track Raw Images (*.bin *.img *.iso);;Cue Sheets (*.cue);;MAME CHD "
-                "Images (*.chd);;Error Code Modeler Images (*.ecm);;Media Descriptor Sidecar Images "
-                "(*.mds);;PlayStation EBOOTs (*.pbp *.PBP);;PlayStation Executables (*.exe *.psexe *.ps-exe, "
-                "*.psx);;Portable Sound Format Files (*.psf *.minipsf);;Playlists (*.m3u);;PSX GPU Dumps (*.psxgpu)");
+  "MainWindow",
+  "All File Types (*.bin *.img *.iso *.cue *.chd *.cpe *.ecm *.mds *.pbp *.elf *.exe *.psexe *.ps-exe *.psx *.psf "
+  "*.minipsf *.m3u *.psxgpu);;Single-Track Raw Images (*.bin *.img *.iso);;Cue Sheets (*.cue);;MAME CHD Images "
+  "(*.chd);;Error Code Modeler Images (*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp "
+  "*.PBP);;PlayStation Executables (*.cpe *.elf *.exe *.psexe *.ps-exe, *.psx);;Portable Sound Format Files (*.psf "
+  "*.minipsf);;Playlists (*.m3u);;PSX GPU Dumps (*.psxgpu)");
 
 MainWindow* g_main_window = nullptr;
 

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -19,6 +19,8 @@ add_library(util
   compress_helpers.h
   cue_parser.cpp
   cue_parser.h
+  elf_file.cpp
+  elf_file.h
   gpu_device.cpp
   gpu_device.h
   gpu_framebuffer_manager.h