Changeset 167 for trunk/hal/x86_64/core

Timestamp:

Jul 10, 2017, 10:23:29 AM (7 years ago)

Author:

max@…

Message:

define the TLS in hal_segmentation.h

Location:

trunk/hal/x86_64/core

Files:

• hal_segmentation.h (modified) (1 diff)
• hal_special.c (modified) (4 diffs)

trunk/hal/x86_64/core/hal_segmentation.h

@@ -145 +145 @@
 
 #define IOMAP_INVALOFF  0xffff
+
+/*
+ * Our definition of Thread-Local Storage.
+ */
+struct tls {
+        void *tls_self;
+        uint32_t tls_gid;
+        uint32_t tls_lid;
+        void *tls_thr;
+} __packed;
+typedef struct tls tls_t;
 
 void lgdt(struct region_descriptor *);

trunk/hal/x86_64/core/hal_special.c

@@ -25 +25 @@
 #include <hal_register.h>
 #include <hal_internal.h>
+#include <hal_segmentation.h>
 
 #include <core.h>
@@ -31 +32 @@
 struct thread_s;
 
-struct cpu_info {
-        void *ci_self;
-        uint32_t ci_gid;
-        uint32_t ci_lid;
-        struct thread_s *ci_thr;
-} __packed;
-typedef struct cpu_info cpu_info_t;
+tls_t cpu0 __in_kdata;
 
-cpu_info_t cpu0 __in_kdata;
-
-cpu_info_t *curcpu()
+tls_t *curcpu()
 {
-        cpu_info_t *ci;
+        tls_t *cputls;
 
         __asm volatile("movq %%gs:%1, %0" :
-            "=r" (ci) :
+            "=r" (cputls) :
             "m"
-            (*(cpu_info_t * const *)offsetof(cpu_info_t, ci_self)));
-        return ci;
+            (*(tls_t * const *)offsetof(tls_t, tls_self)));
+        return cputls;
 }
 
-static void hal_tls_load_cpu(cpu_info_t *ci)
+static void hal_tls_load_cpu(tls_t *cputls)
 {
         wrmsr(MSR_FSBASE, 0);
-        wrmsr(MSR_GSBASE, (uint64_t)ci);
+        wrmsr(MSR_GSBASE, (uint64_t)cputls);
         wrmsr(MSR_KERNELGSBASE, 0);
 }
@@ -61 +54 @@
 void hal_tls_init_cpu0()
 {
-        cpu_info_t *ci = &cpu0;
+        tls_t *cputls = &cpu0;
 
-        memset(ci, 0, sizeof(cpu_info_t));
+        memset(cputls, 0, sizeof(tls_t));
 
-        ci->ci_self = ci;
-        ci->ci_gid = hal_lapic_gid();
-        ci->ci_lid = 0; /* XXX */
+        cputls->tls_self = cputls;
+        cputls->tls_gid = hal_lapic_gid();
+        cputls->tls_lid = 0; /* XXX */
 
-        hal_tls_load_cpu(ci);
+        hal_tls_load_cpu(cputls);
 }
 
 gid_t hal_get_gid()
 {
-        return curcpu()->ci_gid;
+        return curcpu()->tls_gid;
 }
 
@@ -99 +92 @@
 struct thread_s *hal_get_current_thread()
 {
-        return curcpu()->ci_thr;
+        return curcpu()->tls_thr;
 }
 
 void hal_set_current_thread( struct thread_s * thread )
 {
-        curcpu()->ci_thr = thread;
+        curcpu()->tls_thr = thread;
 }