diff options
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/cpumgr.C | 7 | ||||
-rw-r--r-- | src/kernel/taskmgr.C | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/kernel/cpumgr.C b/src/kernel/cpumgr.C index d43b28ca8..a04d0e1fe 100644 --- a/src/kernel/cpumgr.C +++ b/src/kernel/cpumgr.C @@ -6,6 +6,7 @@ #include <kernel/pagemgr.H> #include <kernel/console.H> #include <util/singleton.H> +#include <kernel/ppcarch.H> CpuManager::CpuManager() { @@ -15,8 +16,7 @@ CpuManager::CpuManager() cpu_t* CpuManager::getCurrentCPU() { - register task_t* current_task = NULL; - asm volatile("mfsprg3 %0" : "=r" (current_task) ); + register task_t* current_task = (task_t*) ppc_getSPRG3(); return current_task->cpu; } @@ -59,8 +59,7 @@ void CpuManager::startCPU(ssize_t i) if (currentCPU) { - register task_t* idle_task = iv_cpus[i]->scheduler->getIdleTask(); - asm volatile("mtsprg3 %0" :: "r" (idle_task)); + ppc_setSPRG3((uint64_t) iv_cpus[i]->scheduler->getIdleTask()); // TODO: Set up decrementer properly. register uint64_t decrementer = 0x0f000000; diff --git a/src/kernel/taskmgr.C b/src/kernel/taskmgr.C index 35042c021..42826e61d 100644 --- a/src/kernel/taskmgr.C +++ b/src/kernel/taskmgr.C @@ -2,6 +2,7 @@ #include <kernel/taskmgr.H> #include <kernel/task.H> #include <kernel/pagemgr.H> +#include <kernel/ppcarch.H> void TaskManager::idleTaskLoop(void* unused) { @@ -12,15 +13,13 @@ void TaskManager::idleTaskLoop(void* unused) task_t* TaskManager::getCurrentTask() { - register task_t* current_task = NULL; - asm volatile("mfsprg3 %0" : "=r" (current_task) ); + register task_t* current_task = (task_t*) ppc_getSPRG3(); return current_task; } void TaskManager::setCurrentTask(task_t* t) { - register task_t* _t = t; - asm volatile("mtsprg3 %0" :: "r" (_t)); + ppc_setSPRG3((uint64_t)t); return; } |