Changeset 29 for trunk/hal/x86_64/hal_boot.h

Timestamp:

Jun 21, 2017, 8:35:30 AM (7 years ago)

Author:

max@…

Message:

Update. The kernel now enables the GDT/IDT, and has trap entries. A
x86_printf function is added for debugging purposes only. The new Makefile
will come in another commit.

File:

• trunk/hal/x86_64/hal_boot.h (modified) (4 diffs)

trunk/hal/x86_64/hal_boot.h

@@ -2 +2 @@
  * hal_boot.h - General values used by the boot procedure
  * 
- * Author        Maxime Villard (2017)
+ * Copyright (c) 2017 Maxime Villard
+ * 
+ * This file is part of ALMOS-MKH.
  *
- * Copyright (c) UPMC Sorbonne Universites
- * 
- * This file is part of ALMOS-kernel.
- *
- * ALMOS-kernel is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-kernel is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -18 +16 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
@@ -36 +34 @@
 /* -------------------------------------------------------------------------- */
 
+#define ASM_ALIGN_TEXT  .align 16
+#define ASM_ENTRY(x) \
+        .text; ASM_ALIGN_TEXT; .globl x; .type x,@function; x:
+
+/* -------------------------------------------------------------------------- */
+
 #define PSL_MBO         0x00000002
 
 #define STKPAGES        4
+#define STKSIZE         (PAGE_SIZE * STKPAGES)
 
 #define NKL4_KIMG_ENTRIES       1
@@ -107 +112 @@
 #define L4_SLOT_KERNBASE        511
 
+/*
+ * L3 = (KERNBASE % NBPD_L4) / NBPD_L3
+ * L2 = (KERNBASE % NBPD_L3) / NBPD_L2
+ */
+#define L3_SLOT_KERNBASE        510
+#define L2_SLOT_KERNBASE        0
+
 #define PDIR_SLOT_KERN  L4_SLOT_KERN
 #define PDIR_SLOT_PTE   L4_SLOT_PTE