Changeset 71eef11 in mainline for kernel/arch/amd64/src

Timestamp:

2008-02-06T14:24:13Z (17 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)

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (1 diff)
• boot/boot.S (modified) (2 diffs)
• boot/memmap.c (moved) (moved from kernel/arch/ia32/include/mm/memory_init.h ) (1 diff)
• mm/memory_init.c (deleted)

kernel/arch/amd64/src/amd64.c

@@ -51 +51 @@
 
 #include <arch/bios/bios.h>
-#include <arch/mm/memory_init.h>
 #include <arch/cpu.h>
 #include <print.h>

kernel/arch/amd64/src/boot/boot.S

@@ -183 +183 @@
                 
                 xorl %ecx, %ecx                                 # no memory size or map available
-                movl %ecx, e801memorysize
                 movl %ecx, e820counter
                 
@@ -191 +190 @@
                 
                 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)

kernel/arch/amd64/src/boot/memmap.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32mm  
+/** @addtogroup amd64mm 
  * @{
  */
 /** @file
- * @ingroup ia32mm, am64mm
  */
 
-#ifndef KERN_ia32_MEMORY_INIT_H_
-#define KERN_ia32_MEMORY_INIT_H_
+#include <arch/boot/memmap.h>
 
-size_t get_memory_size(void);
-
-#endif
+uint8_t e820counter = 0xff;
+e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
 
 /** @}