Changeset 11485dec in mainline

Timestamp:

2005-07-26T19:58:32Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

117183b

Parents:

e2e56fa9

Message:

Fix IA-32's get_memory_size() to return size of memory in bytes instead of in kilobytes.
Some cosmetics in memory map detection.
The IA-32 kernel is functional again.

Files:

• arch/ia32/src/boot/memmap.S (modified) (4 diffs)
• arch/ia32/src/mm/memory_init.c (modified) (1 diff)
• src/main/main.c (modified) (1 diff)

arch/ia32/src/boot/memmap.S

@@ -49 +49 @@
         movw    %bx,%es
         movw    $e820table,%di
-        movb    $E820_MAX_RECORDS,(e820counter)
+        movb    $E820_MAX_RECORDS,e820counter
 e820loop:       
         movl    $E820_SMAP,%edx         # control sequence "SMAP"
@@ -68 +68 @@
         movw    %ax,%di
                 
-        decb    (e820counter) # buffer is full
+        decb    e820counter # buffer is full
         jz      e820end
         
@@ -76 +76 @@
 e820end:
         movb    $E820_MAX_RECORDS,%al
-        subb    (e820counter),%al
-        movb    %al,(e820counter) # store # of valid entries in e820counter
+        subb    e820counter,%al
+        movb    %al,e820counter # store # of valid entries in e820counter
 
         jmp     e801begin
 
 e820err:
-        movb    $0,(e820counter)
+        movb    $0,e820counter
 
 # method e801 - get size of memory
@@ -110 +110 @@
         andl    $0xffff,%ecx
         addl    %ecx,%edx
-        addl    $0x0400,%edx  # add lower 1 MB - its not count by e801 method
-        movl    %edx,(e801memorysize)           
+        addl    $0x0400,%edx  # add lower 1 MB - it's not included by e801 method
+        movl    %edx,e801memorysize
 e801end:
         ret

arch/ia32/src/mm/memory_init.c

@@ -32 +32 @@
 size_t get_memory_size(void) 
 {
-        return e801memorysize;  
+        return e801memorysize*1024;
 }
 

src/main/main.c

@@ -136 +136 @@
         
         smp_init();
+        printf("config.memory_size=%dM\n", config.memory_size/(1024*1024));
         printf("config.cpu_count=%d\n", config.cpu_count);