diff options
| author | Frans Kaashoek <[email protected]> | 2011-09-27 13:00:20 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-09-27 13:00:20 -0400 |
| commit | 0ca1c0407d3da826ad8415e3204e1c53e394e204 (patch) | |
| tree | 197b25b7f02b071369d2aa452848521e327a3f39 /bootasm.S | |
| parent | 9b972c06b172531e5792fc0e05d83319d325e0ee (diff) | |
| parent | 1e6f0146d2e194045188ba24826eaaaee05605cb (diff) | |
| download | xv6-labs-0ca1c0407d3da826ad8415e3204e1c53e394e204.tar.gz xv6-labs-0ca1c0407d3da826ad8415e3204e1c53e394e204.tar.bz2 xv6-labs-0ca1c0407d3da826ad8415e3204e1c53e394e204.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'bootasm.S')
| -rw-r--r-- | bootasm.S | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -12,8 +12,8 @@ start: cli # BIOS enabled interrupts; disable - # Set up the important data segment registers (DS, ES, SS). - xorw %ax,%ax # Segment number zero + # Zero data segment registers DS, ES, and SS. + xorw %ax,%ax # Set %ax to zero movw %ax,%ds # -> Data Segment movw %ax,%es # -> Extra Segment movw %ax,%ss # -> Stack Segment @@ -37,7 +37,7 @@ seta20.2: outb %al,$0x60 # Switch from real to protected mode. Use a bootstrap GDT that makes - # virtual addresses map dierctly to physical addresses so that the + # virtual addresses map directly to physical addresses so that the # effective memory map doesn't change during the transition. lgdt gdtdesc movl %cr0, %eax |