Changeset 71eef11 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2008-02-06T14:24:13Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7208b6c

Parents:

1b067315

Message:

remove config.memory_size, get_memory_size() and memory_init.{c|d}
the amount of available memory can be calculated from the sizes of the zones
add FRAMES2SIZE, SIZE2KB and SIZE2MB functions/macros (code readability)

File:

• kernel/arch/ia32/src/boot/boot.S (modified) (2 diffs)

kernel/arch/ia32/src/boot/boot.S

@@ -110 +110 @@
         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
                 
@@ -119 +118 @@
                 
                 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)