diff options
| author | Robert Morris <[email protected]> | 2016-08-10 11:22:36 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2016-08-10 11:22:36 -0400 |
| commit | 0a69dc9b1745e863f0c16e50dba78804ba0925f7 (patch) | |
| tree | 4cd73d59b7e56ca994f9e7dbfc297733a210aefc | |
| parent | 858475e4dfabb61dc72ab5b4f105e2a0a636e7e8 (diff) | |
| download | xv6-labs-0a69dc9b1745e863f0c16e50dba78804ba0925f7.tar.gz xv6-labs-0a69dc9b1745e863f0c16e50dba78804ba0925f7.tar.bz2 xv6-labs-0a69dc9b1745e863f0c16e50dba78804ba0925f7.zip | |
even more explicit that entry.S is linked into kernel, unlike bootasm.S.
| -rw-r--r-- | entry.S | 4 | ||||
| -rw-r--r-- | entryother.S | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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. |