Changeset 142 for trunk/hal/x86_64/core/hal_exception.c

Timestamp:

Jul 5, 2017, 10:49:55 AM (7 years ago)

Author:

max@…

Message:

remove hal_trap.c, and put its content in hal_interrupt.c and
hal_exception.c

File:

• trunk/hal/x86_64/core/hal_exception.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_exception.c

@@ -1 +1 @@
 /*
- * hal_exception.c - implementation of exception handler for TSAR-MIPS32.
- * 
- * Author   Alain Greiner (2016, 2017)
+ * hal_exception.c - Implementation of exception handler for x86_64
  *
- * Copyright (c) UPMC Sorbonne Universites
+ * Copyright (c) 2017 Maxime Villard
  *
  * This file is part of ALMOS-MKH.
@@ -18 +16 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-MKH; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
@@ -26 +24 @@
 #include <hal_exception.h>
 #include <thread.h>
-#include <printk.h>
-#include <vmm.h>
 #include <errno.h>
-#include <scheduler.h>
 #include <core.h>
-#include <signal.h>
-#include <syscalls.h>
 #include <do_exception.h>
-#include <remote_spinlock.h>
 
+
+#include <hal_kentry.h>
 #include <hal_internal.h>
 
-void hal_do_exception( thread_t * this, 
+static const char *exc_type[] = {
+        [T_PRIVINFLT]= "privileged instruction fault",
+        [T_BPTFLT] = "breakpoint trap",
+        [T_ARITHTRAP] = "arithmetic trap",
+        [T_ASTFLT] = "asynchronous system trap",
+        [T_PROTFLT] = "protection fault",
+        [T_TRCTRAP] = "trace trap",
+        [T_PAGEFLT] = "page fault",
+        [T_ALIGNFLT] = "alignment fault",
+        [T_DIVIDE] = "integer divide fault",
+        [T_NMI] = "non-maskable interrupt",
+        [T_OFLOW] = "overflow trap",
+        [T_BOUND] = "bounds check fault",
+        [T_DNA] = "FPU not available fault",
+        [T_DOUBLEFLT] = "double fault",
+        [T_FPOPFLT] = "FPU operand fetch fault",
+        [T_TSSFLT] = "invalid TSS fault",
+        [T_SEGNPFLT] = "segment not present fault",
+        [T_STKFLT] = "stack fault",
+        [T_MCA] = "machine check fault",
+        [T_XMM] = "SSE FP exception",
+};
+int     exc_types = __arraycount(exc_type);
+
+/*
+ * Hexception handler.
+ */
+void hal_exception_entry(struct small_trapframe *tf)
+{
+        uint64_t excno = tf->tf_trapno;
+        const char *buf;
+
+        if (excno < exc_types) {
+                buf = exc_type[excno];
+        } else {
+                buf = "unknown exception";
+        }
+
+        x86_printf("\n****** FAULT OCCURRED ******\n");
+        x86_printf("%s\n", (char *)buf);
+        x86_printf("-> rip = %Z\n", tf->tf_rip);
+        x86_printf("-> rsp = %Z\n", tf->tf_rsp);
+        x86_printf("-> err = %Z\n", tf->tf_err);
+        if (excno == T_PAGEFLT)
+                x86_printf("-> va  = %Z\n", rcr2());
+        x86_printf("****** FAULT OCCURRED ******\n\n");
+
+        while (1);
+}
+
+/* -------------------------------------------------------------------------- */
+
+void hal_do_exception( thread_t * this,
                        reg_t    * regs_tbl )
 {