Changeset 276 for trunk/hal/x86_64

Timestamp:

Jul 26, 2017, 1:24:51 PM (7 years ago)

Author:

max@…

Message:

update

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (2 diffs)
• hal_init.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_exception.c

@@ -30 +30 @@
 #include <hal_kentry.h>
 #include <hal_internal.h>
+#include <hal_segmentation.h>
 
 static const char *exc_type[] = {
@@ -74 +75 @@
         x86_printf("-> rip = %Z\n", ctx->tf_rip);
         x86_printf("-> rsp = %Z\n", ctx->tf_rsp);
+        x86_printf("-> tls = %Z (gid=%Z)\n", (uint64_t)curcpu(),
+            (uint64_t)hal_get_gid());
         x86_printf("-> err = %Z\n", ctx->tf_err);
         if (excno == T_PAGEFLT)

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");
-
 
 /*