summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar Sean2014-10-29 19:12:39 -0400
committerGravatar Sean2014-10-29 20:26:15 -0400
commit9a012ff007df4187c84c01f4e48545d19bd1f918 (patch)
tree1eb367a264392ddf7422470a263b240ccacb4050 /src/core/hle
parentMerge pull request #151 from archshift/dyncom-enabled (diff)
downloadyuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.tar.gz
yuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.tar.xz
yuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.zip
Fix some warnings
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/archive.cpp6
-rw-r--r--src/core/hle/svc.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 09b4e75a5..4a6140c71 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -153,7 +153,7 @@ public:
153 u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32; 153 u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32;
154 u32 length = cmd_buff[3]; 154 u32 length = cmd_buff[3];
155 u32 address = cmd_buff[5]; 155 u32 address = cmd_buff[5];
156 DEBUG_LOG(KERNEL, "Read %s %s: offset=0x%x length=%d address=0x%x", 156 DEBUG_LOG(KERNEL, "Read %s %s: offset=0x%llx length=%d address=0x%x",
157 GetTypeName().c_str(), GetName().c_str(), offset, length, address); 157 GetTypeName().c_str(), GetName().c_str(), offset, length, address);
158 cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address)); 158 cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address));
159 break; 159 break;
@@ -166,7 +166,7 @@ public:
166 u32 length = cmd_buff[3]; 166 u32 length = cmd_buff[3];
167 u32 flush = cmd_buff[4]; 167 u32 flush = cmd_buff[4];
168 u32 address = cmd_buff[6]; 168 u32 address = cmd_buff[6];
169 DEBUG_LOG(KERNEL, "Write %s %s: offset=0x%x length=%d address=0x%x, flush=0x%x", 169 DEBUG_LOG(KERNEL, "Write %s %s: offset=0x%llx length=%d address=0x%x, flush=0x%x",
170 GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush); 170 GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush);
171 cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address)); 171 cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address));
172 break; 172 break;
@@ -184,7 +184,7 @@ public:
184 case FileCommand::SetSize: 184 case FileCommand::SetSize:
185 { 185 {
186 u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32); 186 u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
187 DEBUG_LOG(KERNEL, "SetSize %s %s size=%d", GetTypeName().c_str(), GetName().c_str(), size); 187 DEBUG_LOG(KERNEL, "SetSize %s %s size=%llu", GetTypeName().c_str(), GetName().c_str(), size);
188 backend->SetSize(size); 188 backend->SetSize(size);
189 break; 189 break;
190 } 190 }
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 490e05cde..1eda36c53 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -115,7 +115,7 @@ Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
115 115
116 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle); 116 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
117 117
118 DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%d", handle, object->GetTypeName().c_str(), 118 DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(),
119 object->GetName().c_str(), nano_seconds); 119 object->GetName().c_str(), nano_seconds);
120 120
121 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!"); 121 _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!");
@@ -138,7 +138,7 @@ Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wa
138 bool unlock_all = true; 138 bool unlock_all = true;
139 bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated 139 bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated
140 140
141 DEBUG_LOG(SVC, "called handle_count=%d, wait_all=%s, nanoseconds=%d", 141 DEBUG_LOG(SVC, "called handle_count=%d, wait_all=%s, nanoseconds=%lld",
142 handle_count, (wait_all ? "true" : "false"), nano_seconds); 142 handle_count, (wait_all ? "true" : "false"), nano_seconds);
143 143
144 // Iterate through each handle, synchronize kernel object 144 // Iterate through each handle, synchronize kernel object
@@ -324,7 +324,7 @@ Result ClearEvent(Handle evt) {
324 324
325/// Sleep the current thread 325/// Sleep the current thread
326void SleepThread(s64 nanoseconds) { 326void SleepThread(s64 nanoseconds) {
327 DEBUG_LOG(SVC, "called nanoseconds=%d", nanoseconds); 327 DEBUG_LOG(SVC, "called nanoseconds=%lld", nanoseconds);
328} 328}
329 329
330/// This returns the total CPU ticks elapsed since the CPU was powered-on 330/// This returns the total CPU ticks elapsed since the CPU was powered-on