diff options
| author | Frans Kaashoek <[email protected]> | 2011-08-09 21:51:17 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-08-09 21:51:17 -0400 |
| commit | 22c73411ca8d2766469218175715b1f7cc3d0ede (patch) | |
| tree | c4fa2fa4d8bb22d2bf49cfd06e0d00af5324f3c4 | |
| parent | 5460667c9cf89f1c728e9af117e9978fcec8fd8d (diff) | |
| download | xv6-labs-22c73411ca8d2766469218175715b1f7cc3d0ede.tar.gz xv6-labs-22c73411ca8d2766469218175715b1f7cc3d0ede.tar.bz2 xv6-labs-22c73411ca8d2766469218175715b1f7cc3d0ede.zip | |
Shorten boot assembly
| -rw-r--r-- | multiboot.S | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/multiboot.S b/multiboot.S index 84f4aa0..cd6a62b 100644 --- a/multiboot.S +++ b/multiboot.S @@ -37,23 +37,8 @@ multiboot_header: .long multiboot_entry # Multiboot entry point. Machine is mostly set up. -# Configure the GDT to match the environment that our usual -# boot loader - bootasm.S - sets up. .globl multiboot_entry multiboot_entry: -# lgdt V2P_WO(gdtdesc) -# ljmp $(SEG_KCODE<<3), $mbstart32 - -mbstart32: - # Set up the protected-mode data segment registers - movw $(SEG_KDATA<<3), %ax # Our data segment selector - movw %ax, %ds # -> DS: Data Segment - movw %ax, %es # -> ES: Extra Segment - movw %ax, %ss # -> SS: Stack Segment - movw $0, %ax # Zero segments not ready for use - movw %ax, %fs # -> FS - movw %ax, %gs # -> GS - movl $(V2P_WO(bootpgdir)), %eax movl %eax, %cr3 # Turn on paging. |