diff options
| author | rsc <rsc> | 2007-08-28 18:02:49 +0000 |
|---|---|---|
| committer | rsc <rsc> | 2007-08-28 18:02:49 +0000 |
| commit | a491dba00c4ff5c76a6287f40d045aa9aedc0d61 (patch) | |
| tree | 1190b86b4993dc36bf5de93cfd037fdca40033d8 | |
| parent | d844f0f9d955d9ddb2cb4cda1b0e544e7f9ed6ce (diff) | |
| download | xv6-labs-a491dba00c4ff5c76a6287f40d045aa9aedc0d61.tar.gz xv6-labs-a491dba00c4ff5c76a6287f40d045aa9aedc0d61.tar.bz2 xv6-labs-a491dba00c4ff5c76a6287f40d045aa9aedc0d61.zip | |
more cmain -> bootmain
| -rw-r--r-- | bootmain.c | 2 | ||||
| -rw-r--r-- | bootother.S | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2,7 +2,7 @@ // // The BIOS loads boot sector (bootasm.S) from sector 1 of the disk // 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 // kernel entry routine. diff --git a/bootother.S b/bootother.S index f243f41..b4a3107 100644 --- a/bootother.S +++ b/bootother.S @@ -16,7 +16,7 @@ # This code is identical to bootasm.S except: # - it does not need to enable A20 # - 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_DSEG, 0x10 # kernel data segment selector |