diff options
| author | 2014-12-12 23:20:01 -0500 | |
|---|---|---|
| committer | 2014-12-12 23:20:01 -0500 | |
| commit | af1cd769e7b407af71496e788e218add31f8b2b0 (patch) | |
| tree | 1e3fd71256c04a15970b09abd3f7280f8b1ff678 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #267 from bunnei/apt-shared-font (diff) | |
| parent | Remove old logging system (diff) | |
| download | yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.tar.gz yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.tar.xz yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.zip | |
Merge pull request #258 from yuriks/log-ng
New logging system
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 80a34c2d5..b38be0a49 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -35,7 +35,7 @@ Handle ObjectPool::Create(Object* obj, int range_bottom, int range_top) { | |||
| 35 | return i + HANDLE_OFFSET; | 35 | return i + HANDLE_OFFSET; |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | ERROR_LOG(HLE, "Unable to allocate kernel object, too many objects slots in use."); | 38 | LOG_ERROR(Kernel, "Unable to allocate kernel object, too many objects slots in use."); |
| 39 | return 0; | 39 | return 0; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| @@ -62,7 +62,7 @@ void ObjectPool::Clear() { | |||
| 62 | 62 | ||
| 63 | Object* &ObjectPool::operator [](Handle handle) | 63 | Object* &ObjectPool::operator [](Handle handle) |
| 64 | { | 64 | { |
| 65 | _dbg_assert_msg_(KERNEL, IsValid(handle), "GRABBING UNALLOCED KERNEL OBJ"); | 65 | _dbg_assert_msg_(Kernel, IsValid(handle), "GRABBING UNALLOCED KERNEL OBJ"); |
| 66 | return pool[handle - HANDLE_OFFSET]; | 66 | return pool[handle - HANDLE_OFFSET]; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| @@ -70,7 +70,7 @@ void ObjectPool::List() { | |||
| 70 | for (int i = 0; i < MAX_COUNT; i++) { | 70 | for (int i = 0; i < MAX_COUNT; i++) { |
| 71 | if (occupied[i]) { | 71 | if (occupied[i]) { |
| 72 | if (pool[i]) { | 72 | if (pool[i]) { |
| 73 | INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(), | 73 | LOG_DEBUG(Kernel, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(), |
| 74 | pool[i]->GetName().c_str()); | 74 | pool[i]->GetName().c_str()); |
| 75 | } | 75 | } |
| 76 | } | 76 | } |
| @@ -82,7 +82,7 @@ int ObjectPool::GetCount() const { | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | Object* ObjectPool::CreateByIDType(int type) { | 84 | Object* ObjectPool::CreateByIDType(int type) { |
| 85 | ERROR_LOG(COMMON, "Unimplemented: %d.", type); | 85 | LOG_ERROR(Kernel, "Unimplemented: %d.", type); |
| 86 | return nullptr; | 86 | return nullptr; |
| 87 | } | 87 | } |
| 88 | 88 | ||