No longer builds, but this is a good intermediate save point.

[akaros.git] / kern / arch / x86 / trap64.c

diff --git a/kern/arch/x86/trap64.c b/kern/arch/x86/trap64.c
index 30a397d..754c90b 100644 (file)
--- a/kern/arch/x86/trap64.c
+++ b/kern/arch/x86/trap64.c
@@ -23,25 +23,6 @@
 #include <kdebug.h>
 #include <kmalloc.h>
 
-/* Starts running the current TF, just using ret. */
-void pop_kernel_ctx(struct kernel_ctx *ctx)
-{
-       struct sw_trapframe *tf = &ctx->sw_tf;
-       /* We're starting at rbx's spot in the sw_tf */
-       asm volatile ("movq %0, %%rsp;          "
-                                 "popq %%rbx;              "
-                                 "popq %%rbp;              "
-                                 "popq %%r12;              "
-                                 "popq %%r13;              "
-                                 "popq %%r14;              "
-                                 "popq %%r15;              "
-                                 "popq %%rax;              " /* pop rip */
-                                 "popq %%rsp;              "
-                                 "jmp *%%rax;              " /* stored rip */
-                                 : : "g"(&ctx->sw_tf.tf_rbx) : "memory");
-       panic("ret failed");
-}
-
 void print_trapframe(struct hw_trapframe *hw_tf)
 {
        static spinlock_t ptf_lock = SPINLOCK_INITIALIZER_IRQSAVE;
@@ -115,36 +96,14 @@ void print_swtrapframe(struct sw_trapframe *sw_tf)
        pcpui->__lock_checking_enabled++;
 }
 
-void page_fault_handler(struct hw_trapframe *hw_tf)
+void __arch_reflect_trap_hwtf(struct hw_trapframe *hw_tf, unsigned int trap_nr,
+                              unsigned int err, unsigned long aux)
 {
-       uintptr_t fault_va = rcr2();
-       int prot = hw_tf->tf_err & PF_ERROR_WRITE ? PROT_WRITE : PROT_READ;
-       int err;
-
-       /* TODO - handle kernel page faults */
-       if ((hw_tf->tf_cs & 3) == 0) {
-               print_trapframe(hw_tf);
-               backtrace_kframe(hw_tf);
-               panic("Page Fault in the Kernel at %p!", fault_va);
-               /* if we want to do something like kill a process or other code, be
-                * aware we are in a sort of irq-like context, meaning the main kernel
-                * code we 'interrupted' could be holding locks - even irqsave locks. */
-       }
-       /* safe to reenable after rcr2 */
-       enable_irq();
-       if ((err = handle_page_fault(current, fault_va, prot))) {
-               /* Destroy the faulting process */
-               printk("[%08x] user %s fault va %p ip %p on core %d with err %d\n",
-                      current->pid, prot & PROT_READ ? "READ" : "WRITE", fault_va,
-                      hw_tf->tf_rip, core_id(), err);
-               print_trapframe(hw_tf);
-               /* Turn this on to help debug bad function pointers */
-               printd("rsp %p\n\t 0(rsp): %p\n\t 8(rsp): %p\n\t 16(rsp): %p\n"
-                      "\t24(rsp): %p\n", hw_tf->tf_rsp,
-                      *(uintptr_t*)(hw_tf->tf_rsp +  0),
-                      *(uintptr_t*)(hw_tf->tf_rsp +  8),
-                      *(uintptr_t*)(hw_tf->tf_rsp + 16),
-                      *(uintptr_t*)(hw_tf->tf_rsp + 24));
-               proc_destroy(current);
-       }
+       hw_tf->tf_trapno = trap_nr;
+       /* this can be necessary, since hw_tf is the pcpui one, and the err that
+        * came in probably came from the kernel stack's hw_tf. */
+       hw_tf->tf_err = err;
+       hw_tf->tf_padding4 = (uint32_t)(aux);
+       hw_tf->tf_padding5 = (uint32_t)(aux >> 32);
+       hw_tf->tf_padding3 = ROS_ARCH_REFL_ID;
 }