summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/core.cpp2
-rw-r--r--src/core/hle/kernel/shared_memory.cpp2
-rw-r--r--src/core/hle/kernel/svc.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index eeba4e2da..5a80d03dc 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -99,7 +99,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
99 99
100 ResultStatus init_result{Init(emu_window, system_mode.first.get())}; 100 ResultStatus init_result{Init(emu_window, system_mode.first.get())};
101 if (init_result != ResultStatus::Success) { 101 if (init_result != ResultStatus::Success) {
102 LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!", init_result); 102 LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!", static_cast<int>(init_result));
103 System::Shutdown(); 103 System::Shutdown();
104 return init_result; 104 return init_result;
105 } 105 }
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 1875dd8d0..c8bda8494 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -126,7 +126,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
126 if (address != 0) { 126 if (address != 0) {
127 // TODO(shinyquagsire23): Check for virtual/mappable memory here too? 127 // TODO(shinyquagsire23): Check for virtual/mappable memory here too?
128 if (address >= Memory::HEAP_VADDR && address < Memory::HEAP_VADDR_END) { 128 if (address >= Memory::HEAP_VADDR && address < Memory::HEAP_VADDR_END) {
129 LOG_ERROR(Kernel, "cannot map id=%u, address=0x%llx name=%s, invalid address", 129 LOG_ERROR(Kernel, "cannot map id=%u, address=0x%lx name=%s, invalid address",
130 GetObjectId(), address, name.c_str()); 130 GetObjectId(), address, name.c_str());
131 return ERR_INVALID_ADDRESS; 131 return ERR_INVALID_ADDRESS;
132 } 132 }
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 062bcf29e..311ab4187 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -39,7 +39,7 @@ static ResultCode SetHeapSize(VAddr* heap_addr, u64 heap_size) {
39} 39}
40 40
41static ResultCode SetMemoryAttribute(VAddr addr, u64 size, u32 state0, u32 state1) { 41static ResultCode SetMemoryAttribute(VAddr addr, u64 size, u32 state0, u32 state1) {
42 LOG_WARNING(Kernel_SVC, "(STUBBED) called, addr=0x%llx", addr); 42 LOG_WARNING(Kernel_SVC, "(STUBBED) called, addr=0x%lx", addr);
43 return RESULT_SUCCESS; 43 return RESULT_SUCCESS;
44} 44}
45 45