Changeset 274

Timestamp:

Jul 26, 2017, 10:54:49 AM (7 years ago)

Author:

max@…

Message:

Add tls_tf.

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (2 diffs)
• hal_interrupt.c (modified) (2 diffs)
• hal_segmentation.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -405 +405 @@
         start_secondary_cpus();
 
-        kernel_init(&btinfo);
-
-        x86_printf("[+] kernel_init called\n");
-
         reg_t dummy;
         hal_enable_irq(&dummy);
+
+        while (1);
+
+        kernel_init(&btinfo);
+
+        x86_printf("[+] kernel_init called\n");
+
+
 /*
         void *ptr;
@@ -428 +432 @@
         ppm_free_pages(ptr);
 */
-        while (1);
+
 
 //      void x86_stop();

trunk/hal/x86_64/core/hal_interrupt.c

@@ -30 +30 @@
 #include <hal_internal.h>
 #include <hal_special.h>
+#include <hal_segmentation.h>
 
 /* -------------------------------------------------------------------------- */
@@ -45 +46 @@
             tf->tf_rip, hal_get_current_thread());
         return;
+
+        core_t *core = CURRENT_THREAD->core;
+        curcpu()->tls_tf = tf;
+
+        core_clock(core);
 }
 

trunk/hal/x86_64/core/hal_segmentation.h

@@ -155 +155 @@
         void *tls_thr;
         reg_t tls_intr;
+        void *tls_tf;
 } __packed;
 typedef struct tls tls_t;