From 0a69dc9b1745e863f0c16e50dba78804ba0925f7 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Wed, 10 Aug 2016 11:22:36 -0400 Subject: [PATCH] even more explicit that entry.S is linked into kernel, unlike bootasm.S. --- entry.S | 4 ++++ entryother.S | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/entry.S b/entry.S index 5f4e124..bc79bab 100644 --- a/entry.S +++ b/entry.S @@ -1,3 +1,7 @@ +# The xv6 kernel starts executing in this file. This file is linked with +# the kernel C code, so it can refer to kernel symbols such as main(). +# The boot block (bootasm.S and bootmain.c) jumps to entry below. + # Multiboot header, for multiboot boot loaders like GNU Grub. # http://www.gnu.org/software/grub/manual/multiboot/multiboot.html # diff --git a/entryother.S b/entryother.S index 9f94cd3..8a8a020 100644 --- a/entryother.S +++ b/entryother.S @@ -53,7 +53,7 @@ start32: movl %cr4, %eax orl $(CR4_PSE), %eax movl %eax, %cr4 - # Use enterpgdir as our initial page table + # Use entrypgdir as our initial page table movl (start-12), %eax movl %eax, %cr3 # Turn on paging.