remove all trailing whitespace
This commit is contained in:
fzielcke
parent
d2d4966571
commit
b39f9d20a9
222 changed files with 3286 additions and 3286 deletions
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <grub/boot.h>
|
||||
#include <grub/machine/boot.h>
|
||||
|
||||
|
||||
/*
|
||||
* defines for the code go here
|
||||
*/
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
in real mode. */
|
||||
.code16
|
||||
|
||||
.globl _start, start;
|
||||
.globl _start, start;
|
||||
_start:
|
||||
start:
|
||||
/*
|
||||
|
|
@ -70,7 +70,7 @@ start:
|
|||
/* scratch space */
|
||||
mode:
|
||||
.byte 0
|
||||
disk_address_packet:
|
||||
disk_address_packet:
|
||||
sectors:
|
||||
.long 0
|
||||
heads:
|
||||
|
|
@ -91,7 +91,7 @@ cylinder_start:
|
|||
* End of BIOS parameter block.
|
||||
*/
|
||||
|
||||
boot_version:
|
||||
boot_version:
|
||||
.byte GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
|
||||
kernel_address:
|
||||
.word GRUB_BOOT_MACHINE_KERNEL_ADDR
|
||||
|
|
@ -99,7 +99,7 @@ kernel_segment:
|
|||
.word GRUB_BOOT_MACHINE_KERNEL_SEG
|
||||
kernel_sector:
|
||||
.long 1, 0
|
||||
boot_drive:
|
||||
boot_drive:
|
||||
.byte 0xff /* the disk to load kernel from */
|
||||
/* 0xff means use the boot drive */
|
||||
root_drive:
|
||||
|
|
@ -124,7 +124,7 @@ boot_drive_check:
|
|||
jnz 1f
|
||||
movb $0x80, %dl
|
||||
1:
|
||||
|
||||
|
||||
/*
|
||||
* ljmp to the next instruction because some bogus BIOSes
|
||||
* jump to 07C0:0000 instead of 0000:7C00.
|
||||
|
|
@ -136,7 +136,7 @@ boot_drive_check:
|
|||
ljmp $0, $ABS(real_start)
|
||||
#endif
|
||||
|
||||
real_start:
|
||||
real_start:
|
||||
|
||||
/* set up %ds and %ss as offset from 0 */
|
||||
xorw %ax, %ax
|
||||
|
|
@ -176,17 +176,17 @@ real_start:
|
|||
#else
|
||||
movw $ABS(disk_address_packet), %si
|
||||
#endif
|
||||
|
||||
|
||||
/* do not probe LBA if the drive is a floppy */
|
||||
testb $GRUB_BOOT_MACHINE_BIOS_HD_FLAG, %dl
|
||||
jz chs_mode
|
||||
|
||||
|
||||
/* check if LBA is supported */
|
||||
movb $0x41, %ah
|
||||
movw $0x55aa, %bx
|
||||
int $0x13
|
||||
|
||||
/*
|
||||
/*
|
||||
* %dl may have been clobbered by INT 13, AH=41H.
|
||||
* This happens, for example, with AST BIOS 1.04.
|
||||
*/
|
||||
|
|
@ -200,15 +200,15 @@ real_start:
|
|||
|
||||
andw $1, %cx
|
||||
jz chs_mode
|
||||
|
||||
|
||||
lba_mode:
|
||||
xorw %ax, %ax
|
||||
movw %ax, 4(%si)
|
||||
|
||||
incw %ax
|
||||
incw %ax
|
||||
/* set the mode to non-zero */
|
||||
movb %al, -1(%si)
|
||||
|
||||
|
||||
/* the blocks */
|
||||
movw %ax, 2(%si)
|
||||
|
||||
|
|
@ -249,8 +249,8 @@ lba_mode:
|
|||
|
||||
movw $GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
|
||||
jmp copy_buffer
|
||||
|
||||
chs_mode:
|
||||
|
||||
chs_mode:
|
||||
/*
|
||||
* Determine the hard disk geometry from the BIOS!
|
||||
* We do this first, so that LS-120 IDE floppies work correctly.
|
||||
|
|
@ -272,7 +272,7 @@ final_init:
|
|||
/* set the mode to zero */
|
||||
movzbl %dh, %eax
|
||||
movb %ah, -1(%si)
|
||||
|
||||
|
||||
/* save number of heads */
|
||||
incw %ax
|
||||
movl %eax, 4(%si)
|
||||
|
|
@ -303,7 +303,7 @@ setup_sectors:
|
|||
|
||||
orl %eax, %eax
|
||||
jnz geometry_error
|
||||
|
||||
|
||||
/* load logical sector start (bottom half) */
|
||||
#ifdef APPLE_CC
|
||||
movl (kernel_sector_abs), %eax
|
||||
|
|
@ -371,7 +371,7 @@ setup_sectors:
|
|||
jc read_error
|
||||
|
||||
movw %es, %bx
|
||||
|
||||
|
||||
copy_buffer:
|
||||
#ifdef APPLE_CC
|
||||
kernel_segment_abs = ABS (kernel_segment)
|
||||
|
|
@ -386,14 +386,14 @@ copy_buffer:
|
|||
*/
|
||||
pusha
|
||||
pushw %ds
|
||||
|
||||
|
||||
movw $0x100, %cx
|
||||
movw %bx, %ds
|
||||
xorw %si, %si
|
||||
xorw %di, %di
|
||||
|
||||
|
||||
cld
|
||||
|
||||
|
||||
rep
|
||||
movsw
|
||||
|
||||
|
|
@ -472,7 +472,7 @@ message:
|
|||
*/
|
||||
|
||||
. = _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
|
||||
nt_magic:
|
||||
nt_magic:
|
||||
.long 0
|
||||
.word 0
|
||||
|
||||
|
|
@ -482,7 +482,7 @@ nt_magic:
|
|||
* sneaky, huh?
|
||||
*/
|
||||
|
||||
part_start:
|
||||
part_start:
|
||||
. = _start + GRUB_BOOT_MACHINE_PART_START
|
||||
|
||||
probe_values:
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ bi_reserved:
|
|||
|
||||
/* Root drive will default to boot drive */
|
||||
movb $0xFF, %dh
|
||||
|
||||
|
||||
ljmp $(DATA_ADDR >> 4), $0
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
|
||||
#include <grub/machine/boot.h>
|
||||
|
||||
|
||||
/*
|
||||
* defines for the code go here
|
||||
*/
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
This makes the assembler generate the address without support
|
||||
from the linker. (ELF can't relocate 16-bit addresses!) */
|
||||
#define ABS(x) (x-_start+GRUB_BOOT_MACHINE_KERNEL_ADDR)
|
||||
|
||||
|
||||
/* Print message string */
|
||||
#ifdef APPLE_CC
|
||||
#define MSG(x) x ## _abs = ABS(x); mov $x ## _abs, %esi; call message
|
||||
|
|
@ -44,18 +44,18 @@
|
|||
|
||||
.globl start, _start
|
||||
start:
|
||||
_start:
|
||||
_start:
|
||||
/*
|
||||
* _start is loaded at 0x2000 and is jumped to with
|
||||
* CS:IP 0:0x2000 in kernel.
|
||||
*/
|
||||
|
||||
/*
|
||||
/*
|
||||
* we continue to use the stack for boot.img and assume that
|
||||
* some registers are set to correct values. See boot.S
|
||||
* for more information.
|
||||
*/
|
||||
|
||||
|
||||
/* save drive reference first thing! */
|
||||
pushw %dx
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ _start:
|
|||
pushw %si
|
||||
MSG(notification_string)
|
||||
popw %si
|
||||
|
||||
|
||||
/* this sets up for the first run through "bootloop" */
|
||||
#ifdef APPLE_CC
|
||||
firstlist_off_abs = ABS (firstlist - GRUB_BOOT_MACHINE_LIST_SIZE)
|
||||
|
|
@ -84,14 +84,14 @@ bootloop:
|
|||
/* if zero, go to the start function */
|
||||
je bootit
|
||||
|
||||
setup_sectors:
|
||||
setup_sectors:
|
||||
/* check if we use LBA or CHS */
|
||||
cmpb $0, -1(%si)
|
||||
|
||||
/* jump to chs_mode if zero */
|
||||
je chs_mode
|
||||
|
||||
lba_mode:
|
||||
lba_mode:
|
||||
/* load logical sector start */
|
||||
movl (%di), %ebx
|
||||
movl 4(%di), %ecx
|
||||
|
|
@ -109,7 +109,7 @@ lba_mode:
|
|||
/* if less than, set to total */
|
||||
movw 8(%di), %ax
|
||||
|
||||
1:
|
||||
1:
|
||||
/* subtract from total */
|
||||
subw %ax, 8(%di)
|
||||
|
||||
|
|
@ -154,8 +154,8 @@ lba_mode:
|
|||
|
||||
movw $GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
|
||||
jmp copy_buffer
|
||||
|
||||
chs_mode:
|
||||
|
||||
chs_mode:
|
||||
/* load logical sector start (top half) */
|
||||
movl 4(%di), %eax
|
||||
orl %eax, %eax
|
||||
|
|
@ -202,7 +202,7 @@ chs_mode:
|
|||
/* if less than, set to total */
|
||||
movw 8(%di), %ax
|
||||
|
||||
2:
|
||||
2:
|
||||
/* subtract from total */
|
||||
subw %ax, 8(%di)
|
||||
|
||||
|
|
@ -258,8 +258,8 @@ chs_mode:
|
|||
|
||||
/* save source segment */
|
||||
movw %es, %bx
|
||||
|
||||
copy_buffer:
|
||||
|
||||
copy_buffer:
|
||||
|
||||
/* load addresses for copy from disk buffer to destination */
|
||||
movw 10(%di), %es /* load destination segment */
|
||||
|
|
@ -291,7 +291,7 @@ copy_buffer:
|
|||
rep /* sets a repeat */
|
||||
movsw /* this runs the actual copy */
|
||||
|
||||
/* restore addressing regs and print a dot with correct DS
|
||||
/* restore addressing regs and print a dot with correct DS
|
||||
(MSG modifies SI, which is saved, and unused AX and BX) */
|
||||
popw %ds
|
||||
MSG(notification_step)
|
||||
|
|
@ -339,7 +339,7 @@ notification_string: .asciz "loading"
|
|||
|
||||
notification_step: .asciz "."
|
||||
notification_done: .asciz "\r\n"
|
||||
|
||||
|
||||
geometry_error_string: .asciz "Geom"
|
||||
read_error_string: .asciz "Read"
|
||||
general_error_string: .asciz " Error"
|
||||
|
|
@ -379,7 +379,7 @@ lastlist:
|
|||
.word 0
|
||||
|
||||
. = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
|
||||
|
||||
|
||||
/* fill the first data listing with the default */
|
||||
blocklist_default_start:
|
||||
/* this is the sector start parameter, in logical sectors from
|
||||
|
|
@ -392,5 +392,5 @@ blocklist_default_len:
|
|||
blocklist_default_seg:
|
||||
/* this is the segment of the starting address to load the data into */
|
||||
.word (GRUB_BOOT_MACHINE_KERNEL_SEG + 0x20)
|
||||
|
||||
|
||||
firstlist: /* this label has to be after the list data!!! */
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <multiboot.h>
|
||||
|
||||
.file "lnxboot.S"
|
||||
|
||||
|
||||
#ifdef APPLE_CC
|
||||
#error Building lnxboot.img with Apple's as results in an unusable image
|
||||
#endif
|
||||
|
|
@ -50,7 +50,7 @@ data_start:
|
|||
. = data_start + 0x1F1
|
||||
|
||||
setup_sects:
|
||||
/* Apple's cc can't fill this value. */
|
||||
/* Apple's cc can't fill this value. */
|
||||
#ifdef APPLE_CC
|
||||
.byte 0
|
||||
#else
|
||||
|
|
@ -135,8 +135,8 @@ data_leng:
|
|||
linux_init:
|
||||
|
||||
#ifdef APPLE_CC
|
||||
reg_edx_rel = reg_edx - start
|
||||
code32_start_rel = code32_start - start
|
||||
reg_edx_rel = reg_edx - start
|
||||
code32_start_rel = code32_start - start
|
||||
movw %cs:(reg_edx_rel), %dx
|
||||
movl %cs:(code32_start_rel), %ebp
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
|
||||
/* Start with the prehistoric environment... */
|
||||
.code16
|
||||
|
||||
|
||||
/* Let's go */
|
||||
.globl start, _start;
|
||||
.globl start, _start;
|
||||
_start:
|
||||
start:
|
||||
start:
|
||||
|
||||
/* Root drive will default to boot drive */
|
||||
movb $0xFF, %dh
|
||||
movb $0x7F, %dl
|
||||
|
||||
|
||||
/* Jump to the real world */
|
||||
ljmp $0, $0x8200
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue