Linux tweaks.

2015-08-18 14:18:00 -07:00
parent 19299fad4b
commit 8b0d4fb51c
37 changed files with 200 additions and 111 deletions
--- a/src/xenia/cpu/elf_module.cc
+++ b/src/xenia/cpu/elf_module.cc
@@ -79,7 +79,7 @@ bool ElfModule::Load(const std::string& name, const std::string& path,
    XELOGE(
        "ELF: Could not load ELF because target machine is not PPC! (target: "
        "%d)",
-        hdr->e_machine);
+        uint32_t(hdr->e_machine));
    return false;
  }

@@ -108,8 +108,8 @@ bool ElfModule::Load(const std::string& name, const std::string& path,
      // Allocate and copy into memory.
      // Base address @ 0x80000000
      uint32_t virtual_addr = phdr[i].p_vaddr < 0x80000000
-                                  ? phdr[i].p_vaddr + 0x80000000
-                                  : phdr[i].p_vaddr;
+                                  ? uint32_t(phdr[i].p_vaddr) + 0x80000000
+                                  : uint32_t(phdr[i].p_vaddr);
      if (!memory()
               ->LookupHeap(virtual_addr)
               ->AllocFixed(