Changeset 359 for trunk/hal/x86_64

Timestamp:

Aug 10, 2017, 11:21:32 AM (7 years ago)

Author:

max@…

Message:

Synchronize tls_intr between context switches.

Location:

trunk/hal/x86_64/core

Files:

• hal_context.c (modified) (1 diff)
• hal_cpu.S (modified) (1 diff)
• hal_kentry.h (modified) (2 diffs)
• hal_segmentation.h (modified) (2 diffs)

trunk/hal/x86_64/core/hal_context.c

@@ -61 +61 @@
         ctx->ctx_rsp0 = kstacktop & ~0xF;
         ctx->ctx_tf = (uint64_t)&ctx->ctx_hidden_tf;
+        ctx->ctx_intr = INTRS_ENABLED;
 
         /*

trunk/hal/x86_64/core/hal_cpu.S

@@ -196 +196 @@
         movq    CTX_TF(%r13),%rsp
         addq    $TF_SIZE,%rsp   /* end of the structure */
+
+        /*
+         * Save the TLS intr flag, and set the new one.
+         */
+        movq    TLSVAR(INTR),%rax
+        movq    %rax,CTX_INTR(%r13)
+        movq    CTX_INTR(%r12),%rax
+        movq    %rax,TLSVAR(INTR)
 
         /* Build the trap frame */

trunk/hal/x86_64/core/hal_kentry.h

@@ -170 +170 @@
         uint64_t ctx_rsp0;
         uint64_t ctx_tf;
+        uint64_t ctx_intr;
         hal_trapframe_t ctx_hidden_tf;
 } hal_cpu_context_t;
@@ -202 +203 @@
 #define CTX_RSP0  0
 #define CTX_TF    8
+#define CTX_INTR  16
 
 #endif

trunk/hal/x86_64/core/hal_segmentation.h

@@ -155 +155 @@
         uint32_t tls_lid;
         uint64_t tls_rsp0; /* pointer for fast access */
+        reg_t tls_intr;
         void *tls_thr;
-        reg_t tls_intr;
 } __packed;
 typedef struct tls tls_t;
@@ -175 +175 @@
 #define TLS_LID         12
 #define TLS_RSP0        16
+#define TLS_INTR        24
 
 /* system segments and gate types */