[modules] Support ET_SCE_EXEC

This elf segment type requires loading of segments at p_vaddr
Vita3K · May 2, 2018 · 3137d1f · 3137d1f
1 parent 8b41f68
commit 3137d1f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/emulator/kernel/src/load_self.cpp b/src/emulator/kernel/src/load_self.cpp
@@ -29,6 +29,8 @@
 #undef SCE_ELF_DEFS_TARGET
 #include <self.h>
 
+#define ET_SCE_EXEC 0xFE00
+
 #define NID_MODULE_STOP 0x79F8E492
 #define NID_MODULE_EXIT 0x913482A9
 #define NID_MODULE_START 0x935CD196
@@ -279,7 +281,13 @@ SceUID load_self(Ptr<const void> &entry_point, KernelState &kernel, MemState &me
 
         assert(segment_infos[segment_index].encryption == 2);
         if (src.p_type == PT_LOAD) {
-            const Ptr<void> address(alloc(mem, src.p_memsz, path));
+            Address segment_address = 0;
+            if (elf.e_type == ET_SCE_EXEC) {
+                segment_address = alloc_at(mem, src.p_vaddr, src.p_memsz, path);
+            } else {
+                segment_address = alloc(mem, src.p_memsz, path);
+            }
+            const Ptr<void> address(segment_address);
             if (!address) {
                 LOG_ERROR("Failed to allocate memory for segment.");
                 return -1;

diff --git a/src/emulator/mem/include/mem/mem.h b/src/emulator/mem/include/mem/mem.h
@@ -51,5 +51,6 @@ constexpr size_t GB(size_t gb) {
 
 bool init(MemState &state);
 Address alloc(MemState &state, size_t size, const char *name);
+Address alloc_at(MemState &state, Address address, size_t size, const char *name);
 void free(MemState &state, Address address);
 const char *mem_name(Address address, const MemState &state);
diff --git a/src/emulator/mem/src/mem.cpp b/src/emulator/mem/src/mem.cpp
@@ -117,6 +117,15 @@ Address alloc(MemState &state, size_t size, const char *name) {
     return address;
 }
 
+Address alloc_at(MemState &state, Address address, size_t size, const char *name) {
+    const size_t page_count = (size + (state.page_size - 1)) / state.page_size;
+    const Allocated::iterator block = state.allocated_pages.begin() + (address / state.page_size);
+
+    alloc_inner(state, address, page_count, block, name);
+
+    return address;
+}
+
 void free(MemState &state, Address address) {
     const size_t page = address / state.page_size;
     assert(page >= 0);