Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2724 → Rev 2725

/trunk/kernel/arch/ia32/src/boot/boot.S
109,8 → 109,7
cmpl $MULTIBOOT_LOADER_MAGIC, %eax # compare GRUB signature
je valid_boot
xorl %ecx, %ecx # no memory size or map available
movl %ecx, e801memorysize
xorl %ecx, %ecx # no memory map available
movl %ecx, e820counter
jmp invalid_boot
119,19 → 118,6
movl (%ebx), %eax # ebx = physical address of struct multiboot_info
bt $0, %eax # mbi->flags[0] (mem_lower, mem_upper valid)
jc mem_valid
xorl %ecx, %ecx
jmp mem_invalid
mem_valid:
movl 4(%ebx), %ecx # mbi->mem_lower
addl 8(%ebx), %ecx # mbi->mem_upper
mem_invalid:
movl %ecx, e801memorysize
bt $3, %eax # mbi->flags[3] (mods_count, mods_addr valid)
jc mods_valid