Changeset 371 for trunk/hal

Timestamp:

Aug 14, 2017, 1:03:39 PM (7 years ago)

Author:

max@…

Message:

Treat user/kern exceptions differently.

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (2 diffs)
• hal_special.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_exception.c

@@ -56 +56 @@
 int     exc_types = __arraycount(exc_type);
 
-/*
- * Hexception handler.
- */
-void hal_exception_entry(hal_trapframe_t *ctx)
+static void hal_exception_kern(hal_trapframe_t *tf)
 {
-        uint64_t excno = ctx->tf_trapno;
+        uint64_t trapno = tf->tf_trapno;
         const char *buf;
 
-        if (excno < exc_types) {
-                buf = exc_type[excno];
+        if (trapno < exc_types) {
+                buf = exc_type[trapno];
         } else {
                 buf = "unknown exception";
@@ -71 +68 @@
 
         x86_lock();
-        x86_printf("\n****** EXCEPTION OCCURRED ******\n");
+        x86_printf("\n****** EXCEPTION OCCURRED IN KERNEL MODE ******\n");
         x86_printf("%s\n", (char *)buf);
-        x86_printf("-> rip = %Z\n", ctx->tf_rip);
-        x86_printf("-> rdi = %Z\n", ctx->tf_rdi);
-        x86_printf("-> rbp = %Z\n", ctx->tf_rbp);
+        x86_printf("-> rip = %Z\n", tf->tf_rip);
+        x86_printf("-> rdi = %Z\n", tf->tf_rdi);
+        x86_printf("-> rbp = %Z\n", tf->tf_rbp);
         x86_printf("-> tls = %Z (gid=%Z)\n", (uint64_t)curtls(),
             (uint64_t)hal_get_gid());
-        x86_printf("-> err = %Z\n", ctx->tf_err);
-        if (excno == T_PAGEFLT)
+        x86_printf("-> err = %Z\n", tf->tf_err);
+        if (trapno == T_PAGEFLT)
                 x86_printf("-> va  = %Z\n", rcr2());
-        x86_printf("****** EXCEPTION OCCURRED ******\n\n");
+        x86_printf("\n***********************************************\n");
         x86_unlock();
 
         while (1);
+}
+
+static void hal_exception_user(hal_trapframe_t *tf)
+{
+        switch (tf->tf_trapno) {
+                case T_PAGEFLT:
+                        // TODO
+                        //do_exception(curtls()->tls_thr, true);
+
+                default:
+                        x86_panic("userland not yet handled");
+        }
+}
+
+/*
+ * Exception handler.
+ */
+void hal_exception_entry(hal_trapframe_t *tf)
+{
+        if ((tf->tf_cs & SEL_RPL) == SEL_UPL)
+                hal_exception_user(tf);
+        else
+                hal_exception_kern(tf);
 }
 

trunk/hal/x86_64/core/hal_special.c

@@ -148 +148 @@
 }
 
-void hal_get_mmu_excp( intptr_t * mmu_ins_excp_code,
-                       intptr_t * mmu_ins_bad_vaddr,
-                       intptr_t * mmu_dat_excp_code,
-                       intptr_t * mmu_dat_bad_vaddr )
+void hal_get_mmu_excp(intptr_t *mmu_ins_excp_code, intptr_t *mmu_ins_bad_vaddr,
+    intptr_t *mmu_dat_excp_code, intptr_t *mmu_dat_bad_vaddr)
 {
         x86_panic((char *)__func__);
 }
+