Changeset 143 for trunk/hal/x86_64/core

Timestamp:

Jul 5, 2017, 10:56:06 AM (7 years ago)

Author:

max@…

Message:

style

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (3 diffs)
• hal_segmentation.h (modified) (3 diffs)

trunk/hal/x86_64/core/hal_exception.c

@@ -27 +27 @@
 #include <core.h>
 #include <do_exception.h>
-
 
 #include <hal_kentry.h>
@@ -70 +69 @@
         }
 
-        x86_printf("\n****** FAULT OCCURRED ******\n");
+        x86_printf("\n****** EXCEPTION OCCURRED ******\n");
         x86_printf("%s\n", (char *)buf);
         x86_printf("-> rip = %Z\n", tf->tf_rip);
@@ -77 +76 @@
         if (excno == T_PAGEFLT)
                 x86_printf("-> va  = %Z\n", rcr2());
-        x86_printf("****** FAULT OCCURRED ******\n\n");
+        x86_printf("****** EXCEPTION OCCURRED ******\n\n");
 
         while (1);

trunk/hal/x86_64/core/hal_segmentation.h

@@ -1 +1 @@
 /*
  * hal_segmentation.h - Segmentation-related values and structures
- * 
+ *
  * Copyright (c) 2017 Maxime Villard
- * 
+ *
  * This file is part of ALMOS-MKH.
  *
@@ -29 +29 @@
 #define GDT_UCODE_SEL   3       /* User code descriptor */
 #define GDT_UDATA_SEL   4       /* User data descriptor */
-#define NGDT_MEM        6               /* aligned */
+#define NGDT_MEM        6       /* aligned */
 
 #define GDT_CPU0TSS_SEL 0       /* cpu0's tss */
@@ -203 +203 @@
 
 /* debug only, will be removed soon */
-#define LAPIC_TIMER_VECTOR              (DYNVEC_MIN + 4)
+#define LAPIC_TIMER_VECTOR      (DYNVEC_MIN + 4)
 #define IOAPIC_KEYBOARD_VECTOR  (DYNVEC_MIN + 5)