N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #61 from lioncash/kernel-stuff

Browse source 
Core: Use std::array for managing kernel object space
This commit is contained in:
bunnei 2014-08-19 19:01:22 -04:00
parent 39fbb0d508 ab4648d3ca
commit 0db986d92a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/kernel.cpp
View file

@ -17,7 +17,6 @@ Handle g_main_thread = 0;
ObjectPool g_object_pool;
ObjectPool::ObjectPool() {
memset(occupied, 0, sizeof(bool) * MAX_COUNT);
next_id = INITIAL_NEXT_ID;
}
@ -57,7 +56,7 @@ void ObjectPool::Clear() {
delete pool[i];
occupied[i] = false;
}
memset(pool, 0, sizeof(Object*)*MAX_COUNT);
pool.fill(nullptr);
next_id = INITIAL_NEXT_ID;
}

7
src/core/hle/kernel/kernel.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <array>
#include <string>
#include "common/common.h"
@ -160,9 +161,9 @@ private:
INITIAL_NEXT_ID = 0x10,
};
Object* pool[MAX_COUNT];
bool occupied[MAX_COUNT];
int next_id;
std::array<Object*, MAX_COUNT> pool;
std::array<bool, MAX_COUNT> occupied;
int next_id;
};
extern ObjectPool g_object_pool;