Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / aarch64 / exception / handler.c

diff --git a/lunaix-os/arch/aarch64/exception/handler.c b/lunaix-os/arch/aarch64/exception/handler.c
index ab2b80674c7d0e773ed562f1d254904fc41d2c2e..0c861bbc6e4c2b33c79938ae3c5577ef41db13d8 100644 (file)
--- a/lunaix-os/arch/aarch64/exception/handler.c
+++ b/lunaix-os/arch/aarch64/exception/handler.c
@@ -1,5 +1,7 @@
 #include <lunaix/process.h>
 #include <asm/hart.h>
 #include <lunaix/process.h>
 #include <asm/hart.h>

+#include <asm/aa64_exception.h>
+

 
 static inline void
 update_thread_context(struct hart_state* state)
 
 static inline void
 update_thread_context(struct hart_state* state)


@@ -10,18 +12,56 @@ update_thread_context(struct hart_state* state)
 
     struct hart_state* parent = current_thread->hstate;
     hart_push_state(parent, state);
 
     struct hart_state* parent = current_thread->hstate;
     hart_push_state(parent, state);

+

     current_thread->hstate = state;
     current_thread->hstate = state;

+    current_thread->ustack_top = state->execp.sp_el0;

 
     if (parent) {
         state->depth = parent->depth + 1;
     }
 }
 
 
     if (parent) {
         state->depth = parent->depth + 1;
     }
 }
 

+extern void 
+handle_mm_abort(struct hart_state* state);
+
+static void
+handle_sync_exception(struct hart_state* hstate)
+{
+    unsigned int ec;
+
+    ec = esr_ec(hstate->execp.syndrome);
+
+    switch (ec)
+    {
+    case EC_I_ABORT:
+    case EC_D_ABORT:
+    case EC_I_ABORT_EL:
+    case EC_D_ABORT_EL:
+        handle_mm_abort(hstate);
+        break;
+    
+    default:
+        fail("unhandled exception (synced)");
+        break;
+    }
+}
+
+static void
+handle_async_exception(struct hart_state* hstate)
+{
+
+}

 
 struct hart_state*
 handle_exception(struct hart_state* hstate)
 {
     update_thread_context(hstate);
 
 
 struct hart_state*
 handle_exception(struct hart_state* hstate)
 {
     update_thread_context(hstate);
 

+    if (hart_vector_stamp(hstate) == EXCEPTION_SYNC) {
+        handle_sync_exception(hstate);
+    } else {
+        handle_async_exception(hstate);
+    }
+

     return hstate;
 }
\ No newline at end of file
     return hstate;
 }
\ No newline at end of file