Changeset 339 for trunk/hal/x86_64/core/hal_context.c

Timestamp:

Aug 7, 2017, 3:11:45 PM (7 years ago)

Author:

max@…

Message:

Add support for context switch - not tested yet, due to some other bugs in
the mapper. This cswitch is similar to that of TSAR.

File:

• trunk/hal/x86_64/core/hal_context.c (modified) (4 diffs)

trunk/hal/x86_64/core/hal_context.c

@@ -39 +39 @@
         hal_trapframe_t *tf;
         hal_cpu_context_t *ctx;
+        uint64_t kstacktop;
         kmem_req_t req;
+
+        kstacktop = (uint64_t)thread->k_stack_base + thread->k_stack_size;
 
         /* allocate memory for cpu_context */
@@ -56 +59 @@
          * Build the context
          */
-        ctx->ctx_rsp0 = ((uint64_t)thread->k_stack_base) + thread->k_stack_size;
-        ctx->ctx_rsp0 &= ~0xF;
-        /* XXX: ctx_rsp */
+        ctx->ctx_rsp0 = kstacktop & ~0xF;
+        ctx->ctx_tf = (uint64_t)&ctx->ctx_hidden_tf;
 
         /*
          * Build the trap frame
          */
-        tf = (void *)(((uint64_t)thread->k_stack_base +
-            thread->k_stack_size) & ~0xF);
+        tf = &ctx->ctx_hidden_tf;
         tf->tf_gs = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
         tf->tf_fs = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
@@ -78 +79 @@
         } else {
                 tf->tf_cs = GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL);
-                tf->tf_rsp = ((uint64_t)thread->k_stack_base) +
-                    thread->k_stack_size;
+                tf->tf_rsp = kstacktop;
         }
 
@@ -99 +99 @@
 {
         x86_panic((char *)__func__);
+
+        /* Switch the VM space */
+        // TODO
+
+        /* Switch the CPU context */
+        cpu_context_switch(old->cpu_context, new->cpu_context);
 }