diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2011-03-05 10:01:45 -0600 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2011-03-05 10:01:45 -0600 |
| commit | 706243ac48cf646d503a3f1ec9e6a28c916694bd (patch) | |
| tree | 5d583486a145a9646eccb9d3c4bce4dad45a2a84 /src/kernel/exception.C | |
| parent | 5c20d316d21e231daee6455f0a78d5940d59cf23 (diff) | |
| download | talos-hostboot-706243ac48cf646d503a3f1ec9e6a28c916694bd.tar.gz talos-hostboot-706243ac48cf646d503a3f1ec9e6a28c916694bd.zip | |
Merge of PowerHAL project up to commit:
dd45c30bd53d8e6c123165b83842d08117558a3c
Diffstat (limited to 'src/kernel/exception.C')
| -rw-r--r-- | src/kernel/exception.C | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/exception.C b/src/kernel/exception.C index 568d80842..cbbf3cf89 100644 --- a/src/kernel/exception.C +++ b/src/kernel/exception.C @@ -2,7 +2,7 @@ #include <kernel/console.H> #include <kernel/task.H> #include <kernel/taskmgr.H> -#include <kernel/ppcarch.H> +#include <arch/ppc.H> #include <kernel/vmmmgr.H> namespace Systemcalls { void TaskEnd(task_t*); } @@ -18,7 +18,7 @@ extern "C" void kernel_execute_prog_ex() { task_t* t = TaskManager::getCurrentTask(); - uint64_t exception = ppc_getSRR1() & EXCEPTION_SRR1_MASK; + uint64_t exception = getSRR1() & EXCEPTION_SRR1_MASK; bool handled = false; switch(exception) @@ -41,7 +41,7 @@ extern "C" void kernel_execute_data_storage() { task_t* t = TaskManager::getCurrentTask(); - uint64_t exception = ppc_getDSISR() & EXCEPTION_DSISR_MASK; + uint64_t exception = getDSISR() & EXCEPTION_DSISR_MASK; bool handled = false; switch(exception) @@ -53,7 +53,7 @@ void kernel_execute_data_storage() if (!handled) { printk("Data Storage exception on %d: %lx, %lx\n", - t->tid, ppc_getDAR(), ppc_getDSISR()); + t->tid, getDAR(), getDSISR()); Systemcalls::TaskEnd(t); } } |
