ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

even more explicit that entry.S is linked into kernel, unlike bootasm.S.

Browse source
This commit is contained in:
Robert Morris 2016-08-10 11:22:36 -04:00
parent 858475e4df
commit 0a69dc9b17
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
entry.S
View file

@ -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. # Multiboot header, for multiboot boot loaders like GNU Grub.
# http://www.gnu.org/software/grub/manual/multiboot/multiboot.html # http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
# #

2
entryother.S
View file

@ -53,7 +53,7 @@ start32:
movl %cr4, %eax movl %cr4, %eax
orl $(CR4_PSE), %eax orl $(CR4_PSE), %eax
movl %eax, %cr4 movl %eax, %cr4
# Use enterpgdir as our initial page table # Use entrypgdir as our initial page table
movl (start-12), %eax movl (start-12), %eax
movl %eax, %cr3 movl %eax, %cr3
# Turn on paging. # Turn on paging.