Changeset 342 for trunk/hal

Timestamp:

Aug 8, 2017, 11:17:28 AM (8 years ago)

Author:

max@…

Message:

Initialize tf_ss, and don't forget to update tls_thr.

File:

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

trunk/hal/x86_64/core/hal_context.c

@@ -75 +75 @@
         if (thread->type == THREAD_USER) {
                 tf->tf_cs = GDT_FIXED_SEL(GDT_UCODE_SEL, SEL_UPL);
+                tf->tf_ss = GDT_FIXED_SEL(GDT_UDATA_SEL, SEL_UPL);
                 tf->tf_rsp = ((uint64_t)thread->u_stack_base) +
                     thread->u_stack_size;
         } else {
                 tf->tf_cs = GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL);
+                tf->tf_ss = GDT_FIXED_SEL(GDT_KDATA_SEL, SEL_KPL);
                 tf->tf_rsp = kstacktop;
         }
@@ -98 +100 @@
 void hal_cpu_context_switch(thread_t *old, thread_t *new)
 {
-        x86_panic((char *)__func__);
+        curtls()->tls_thr = new;
 
         /* Switch the VM space */