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

more cmain -> bootmain

Browse source
This commit is contained in:
rsc 2007-08-28 18:02:49 +00:00
parent d844f0f9d9
commit a491dba00c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootmain.c
View file

@ -2,7 +2,7 @@
// //
// The BIOS loads boot sector (bootasm.S) from sector 1 of the disk // The BIOS loads boot sector (bootasm.S) from sector 1 of the disk
// into memory and executes it. The boot sector puts the processor // into memory and executes it. The boot sector puts the processor
// in 32-bit mode and calls cmain below, which loads an ELF kernel // in 32-bit mode and calls bootmain below, which loads an ELF kernel
// image from the disk starting at sector 2 and then jumps to the // image from the disk starting at sector 2 and then jumps to the
// kernel entry routine. // kernel entry routine.

2
bootother.S
View file

@ -16,7 +16,7 @@
# This code is identical to bootasm.S except: # This code is identical to bootasm.S except:
# - it does not need to enable A20 # - it does not need to enable A20
# - it uses the address at start-4 for the %esp # - it uses the address at start-4 for the %esp
# - it jumps to the address at start-8 instead of calling cmain # - it jumps to the address at start-8 instead of calling bootmain
.set PROT_MODE_CSEG, 0x8 # kernel code segment selector .set PROT_MODE_CSEG, 0x8 # kernel code segment selector
.set PROT_MODE_DSEG, 0x10 # kernel data segment selector .set PROT_MODE_DSEG, 0x10 # kernel data segment selector