diff options
author | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
---|---|---|
committer | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
commit | ae2cdd83ba4a0cae161db0b29031d5591005fa34 (patch) | |
tree | 82fbdfcbb1fe4e3b5e232db195c8c331d69489fd /kernel/entry.S | |
parent | Started writing fat.c (diff) | |
parent | fs header changes (diff) | |
download | comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.gz comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.bz2 comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.zip |
Merge branch 'main' of https://github.com/kenshineto/kern into fat32
Merging main into here
Diffstat (limited to 'kernel/entry.S')
-rw-r--r-- | kernel/entry.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/entry.S b/kernel/entry.S index aa4c38d..4b5415b 100644 --- a/kernel/entry.S +++ b/kernel/entry.S @@ -7,8 +7,10 @@ .globl kernel_pd_0_ents .globl kernel_pd_1 .globl paging_pt + .globl GDT + .globl kern_stack_end + .globl kern_stack_start .extern main - .extern GDT .section .multiboot @@ -155,6 +157,7 @@ GDT: # TSS segment (0x28) .equ GDT.TSS, . - GDT + .quad 0 .quad 0 # to be modified in kernel # GDT Pointer |