From 0f147388c0c23a2f7267ee0bf58333939d7a5d84 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 24 Jul 2019 12:14:56 +0200 Subject: do not mix tabs and spaces in a single file --- cstart.S | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'cstart.S') diff --git a/cstart.S b/cstart.S index 9f2a269..6f5741c 100644 --- a/cstart.S +++ b/cstart.S @@ -10,12 +10,12 @@ ENTRY(pm_entry) mov %ax, %ss mov $0x7c00, %sp - mov %cr0, %eax - and $~((1 << 30) | (1 << 29)), %eax # clear CD and NW - or $1, %al - mov %eax, %cr0 - lgdtl %cs:0xff80 + gdt32_descr - pm_entry - ljmpl $8, $0xffffff80 + 2f - pm_entry + mov %cr0, %eax + and $~((1 << 30) | (1 << 29)), %eax # clear CD and NW + or $1, %al + mov %eax, %cr0 + lgdtl %cs:0xff80 + gdt32_descr - pm_entry + ljmpl $8, $0xffffff80 + 2f - pm_entry 2: .code32 mov $16, %ax @@ -27,16 +27,16 @@ ENTRY(pm_entry) ljmp $8, $0xffff0000 gdt32: - .quad 0 - .quad 0x00cf9b000000ffff // flat 32-bit code segment - .quad 0x00cf93000000ffff // flat 32-bit data segment - .quad 0x000f9b0f0000ffff // 64K 16-bit code segment at 0xF0000 - .quad 0x000f93000000ffff // 64K 16-bit data segment at 0x0 + .quad 0 + .quad 0x00cf9b000000ffff // flat 32-bit code segment + .quad 0x00cf93000000ffff // flat 32-bit data segment + .quad 0x000f9b0f0000ffff // 64K 16-bit code segment at 0xF0000 + .quad 0x000f93000000ffff // 64K 16-bit data segment at 0x0 gdt32_end: gdt32_descr: - .word gdt32_end - gdt32 - 1 - .long 0xffffff80 + gdt32 - pm_entry + .word gdt32_end - gdt32 - 1 + .long 0xffffff80 + gdt32 - pm_entry ENTRY_END(pm_entry) .code16gcc -- cgit v1.1