summaryrefslogtreecommitdiff
path: root/kernel/startup.S
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-03-27 11:39:12 -0400
committerFreya Murphy <freya@freyacat.org>2025-03-27 11:39:12 -0400
commit0ff301cda68669c59351e5854ce98f2cf460543f (patch)
treecfe8f976261962420ada64b821559b9da0a56841 /kernel/startup.S
parentadd compile_flags.txt for clangd lsp (diff)
downloadcomus-0ff301cda68669c59351e5854ce98f2cf460543f.tar.gz
comus-0ff301cda68669c59351e5854ce98f2cf460543f.tar.bz2
comus-0ff301cda68669c59351e5854ce98f2cf460543f.zip
pull upstream changes, add auto formatting
Diffstat (limited to 'kernel/startup.S')
-rw-r--r--kernel/startup.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/startup.S b/kernel/startup.S
index 1cae13c..73a081e 100644
--- a/kernel/startup.S
+++ b/kernel/startup.S
@@ -15,7 +15,7 @@
#define KERNEL_SRC
#define ASM_SRC
- .arch i386
+# .arch i386
#include <common.h>
#include <bootstrap.h>
@@ -75,11 +75,11 @@ _start:
*/
.globl __bss_start, _end
- movl $V2P(__bss_start), %edi
+ movl $V2PNC(__bss_start), %edi
clearbss:
movl $0, (%edi)
addl $4, %edi
- cmpl $V2P(_end), %edi
+ cmpl $V2PNC(_end), %edi
jb clearbss
#endif /* CLEAR_BSS */
@@ -96,7 +96,7 @@ clearbss:
# set the page directory
.globl firstpdir
- movl $(V2P(firstpdir)+0x1000), %eax
+ movl $(V2PNC(firstpdir)), %eax
movl %eax, %cr3
# turn on paging