Changeset 335

Timestamp:

Aug 7, 2017, 11:19:27 AM (7 years ago)

Author:

max@…

Message:

Separate the CPU context from the trap frame.

Location:

trunk/hal/x86_64

Files:

• core/hal_context.c (modified) (5 diffs)
• core/hal_exception.c (modified) (1 diff)
• core/hal_interrupt.c (modified) (3 diffs)
• core/hal_kentry.h (modified) (2 diffs)
• drivers/ioc_ata.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_context.c

@@ -37 +37 @@
 error_t hal_cpu_context_create(struct thread_s *thread)
 {
-        hal_cpu_context_t *context;
+        hal_trapframe_t *tf;
+        hal_cpu_context_t *ctx;
         kmem_req_t req;
 
@@ -45 +46 @@
         req.flags = AF_KERNEL | AF_ZERO;
 
-        context = (hal_cpu_context_t *)kmem_alloc(&req);
-        if (context == NULL)
+        ctx = (hal_cpu_context_t *)kmem_alloc(&req);
+        if (ctx == NULL)
                 return ENOMEM;
 
         /* set cpu context pointer in thread */
-        thread->cpu_context = (void *)context;
+        thread->cpu_context = (void *)ctx;
 
-        /* build the context */
-        /* tf_gs */
-        /* tf_fs */
-        context->tf_es = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
-        context->tf_ds = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
-        context->tf_rip = (uint64_t)thread->entry_func;
-        context->tf_rflags = PSL_USERSET;
+        /*
+         * Build the context
+         */
+        ctx->ctx_rsp0 = ((uint64_t)thread->k_stack_base) + thread->k_stack_size;
+        ctx->ctx_rsp0 &= ~0xF;
+        /* XXX: ctx_rsp */
+
+        /*
+         * Build the trap frame
+         */
+        tf = (void *)(((uint64_t)thread->k_stack_base +
+            thread->k_stack_size) & ~0xF);
+        tf->tf_gs = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        tf->tf_fs = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        tf->tf_es = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        tf->tf_ds = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
+        tf->tf_rip = (uint64_t)thread->entry_func;
+        tf->tf_rflags = PSL_USERSET;
 
         if (thread->type == THREAD_USER) {
-                context->tf_cs = GDT_FIXED_SEL(GDT_UCODE_SEL, SEL_UPL);
-                context->tf_rsp = ((uint64_t)thread->u_stack_base) +
+                tf->tf_cs = GDT_FIXED_SEL(GDT_UCODE_SEL, SEL_UPL);
+                tf->tf_rsp = ((uint64_t)thread->u_stack_base) +
                     thread->u_stack_size;
         } else {
-                context->tf_cs = GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL);
-                context->tf_rsp = ((uint64_t)thread->k_stack_base) +
+                tf->tf_cs = GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL);
+                tf->tf_rsp = ((uint64_t)thread->k_stack_base) +
                     thread->k_stack_size;
         }
@@ -73 +85 @@
 }
 
-error_t hal_cpu_context_copy( thread_t * dst,
-                              thread_t * src )
+error_t hal_cpu_context_copy(thread_t *dst, thread_t *src)
 {
         x86_panic((char *)__func__);
@@ -80 +91 @@
 }
 
-void hal_cpu_context_destroy( thread_t * thread )
+void hal_cpu_context_destroy(thread_t *thread)
+{
+        x86_panic((char *)__func__);
+}
+
+void hal_cpu_context_switch(thread_t *old, thread_t *new)
+{
+        x86_panic((char *)__func__);
+}
+
+void hal_cpu_context_load( thread_t * thread )
 {
         x86_panic((char *)__func__);
@@ -103 +124 @@
 }
 
-void hal_cpu_context_switch( thread_t * old , thread_t * new )
-{
-        x86_panic((char *)__func__);
-}
-
-void hal_cpu_context_load( thread_t * thread )
-{
-        x86_panic((char *)__func__);
-}
-
 void hal_fpu_context_save( thread_t * thread )
 {

trunk/hal/x86_64/core/hal_exception.c

@@ -59 +59 @@
  * Hexception handler.
  */
-void hal_exception_entry(hal_cpu_context_t *ctx)
+void hal_exception_entry(hal_trapframe_t *ctx)
 {
         uint64_t excno = ctx->tf_trapno;

trunk/hal/x86_64/core/hal_interrupt.c

@@ -37 +37 @@
  * Timer interrupt
  */
-void hal_timer_intr(hal_cpu_context_t *tf)
+void hal_timer_intr(hal_trapframe_t *tf)
 {
         if (hal_get_gid() != 0) {
@@ -58 +58 @@
  * Serial Port (COM1) interrupt
  */
-void hal_com1_intr(hal_cpu_context_t *tf)
+void hal_com1_intr(hal_trapframe_t *tf)
 {
         static char prev;
@@ -132 +132 @@
  * Keyboard interrupt (8042 PS/2)
  */
-void hal_keyboard_intr(hal_cpu_context_t *tf)
+void hal_keyboard_intr(hal_trapframe_t *tf)
 {
         uint64_t val;

trunk/hal/x86_64/core/hal_kentry.h

@@ -128 +128 @@
 
 /*
- * The x86_64 CPU context.
+ * The x86_64 CPU trap frame.
  */
-typedef struct hal_cpu_context_s {
+typedef struct hal_trapframe_s {
         /* Pushed by INTR_SAVE_REGS */
         uint64_t tf_rax;
@@ -164 +164 @@
         uint64_t tf_rsp;
         uint64_t tf_ss;
+} hal_trapframe_t;
+
+typedef struct hal_cpu_context_s {
+        uint64_t ctx_rsp0;
+        uint64_t ctx_rsp;
+        uint64_t ctx_rbp;
 } hal_cpu_context_t;
 

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -226 +226 @@
 }
 
-void ioc_ata_isr(hal_cpu_context_t *ctx)
+void ioc_ata_isr(hal_trapframe_t *ctx)
 {
         x86_printf("rip = %Z\n", ctx->tf_rip);