summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2018-07-02 10:13:26 -0600
committerGravatar bunnei2018-07-02 21:45:47 -0400
commit638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch)
tree5783dda790575e047fa757d8c56e11f3fffe7646 /src/core/hle/kernel/thread.cpp
parentMerge pull request #608 from Subv/depth (diff)
downloadyuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip
Rename logging macro back to LOG_*
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 2f333ec34..01c346520 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -104,7 +104,7 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) {
104 const auto proper_handle = static_cast<Handle>(thread_handle); 104 const auto proper_handle = static_cast<Handle>(thread_handle);
105 SharedPtr<Thread> thread = wakeup_callback_handle_table.Get<Thread>(proper_handle); 105 SharedPtr<Thread> thread = wakeup_callback_handle_table.Get<Thread>(proper_handle);
106 if (thread == nullptr) { 106 if (thread == nullptr) {
107 NGLOG_CRITICAL(Kernel, "Callback fired for invalid thread {:08X}", proper_handle); 107 LOG_CRITICAL(Kernel, "Callback fired for invalid thread {:08X}", proper_handle);
108 return; 108 return;
109 } 109 }
110 110
@@ -290,19 +290,19 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
290 SharedPtr<Process> owner_process) { 290 SharedPtr<Process> owner_process) {
291 // Check if priority is in ranged. Lowest priority -> highest priority id. 291 // Check if priority is in ranged. Lowest priority -> highest priority id.
292 if (priority > THREADPRIO_LOWEST) { 292 if (priority > THREADPRIO_LOWEST) {
293 NGLOG_ERROR(Kernel_SVC, "Invalid thread priority: {}", priority); 293 LOG_ERROR(Kernel_SVC, "Invalid thread priority: {}", priority);
294 return ERR_OUT_OF_RANGE; 294 return ERR_OUT_OF_RANGE;
295 } 295 }
296 296
297 if (processor_id > THREADPROCESSORID_MAX) { 297 if (processor_id > THREADPROCESSORID_MAX) {
298 NGLOG_ERROR(Kernel_SVC, "Invalid processor id: {}", processor_id); 298 LOG_ERROR(Kernel_SVC, "Invalid processor id: {}", processor_id);
299 return ERR_OUT_OF_RANGE_KERNEL; 299 return ERR_OUT_OF_RANGE_KERNEL;
300 } 300 }
301 301
302 // TODO(yuriks): Other checks, returning 0xD9001BEA 302 // TODO(yuriks): Other checks, returning 0xD9001BEA
303 303
304 if (!Memory::IsValidVirtualAddress(*owner_process, entry_point)) { 304 if (!Memory::IsValidVirtualAddress(*owner_process, entry_point)) {
305 NGLOG_ERROR(Kernel_SVC, "(name={}): invalid entry {:016X}", name, entry_point); 305 LOG_ERROR(Kernel_SVC, "(name={}): invalid entry {:016X}", name, entry_point);
306 // TODO (bunnei): Find the correct error code to use here 306 // TODO (bunnei): Find the correct error code to use here
307 return ResultCode(-1); 307 return ResultCode(-1);
308 } 308 }
@@ -343,7 +343,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
343 auto& linheap_memory = memory_region->linear_heap_memory; 343 auto& linheap_memory = memory_region->linear_heap_memory;
344 344
345 if (linheap_memory->size() + Memory::PAGE_SIZE > memory_region->size) { 345 if (linheap_memory->size() + Memory::PAGE_SIZE > memory_region->size) {
346 NGLOG_ERROR(Kernel_SVC, 346 LOG_ERROR(Kernel_SVC,
347 "Not enough space in region to allocate a new TLS page for thread"); 347 "Not enough space in region to allocate a new TLS page for thread");
348 return ERR_OUT_OF_MEMORY; 348 return ERR_OUT_OF_MEMORY;
349 } 349 }