Changeset 339e053 in mainline for arch/ia32/src/boot/memmap.S


Ignore:
Timestamp:
2005-09-04T09:59:13Z (20 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8ec9bae
Parents:
23f4b1fb
Message:

finish GRUB booting (including memory map and SMP)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • arch/ia32/src/boot/memmap.S

    r23f4b1fb r339e053  
    3030#include <arch/boot/memmapasm.h>
    3131
    32 E820_RECORD_SIZE = MEMMAP_E820_RECORD_SIZE
    33 E820_MAX_RECORDS = MEMMAP_E820_MAX_RECORDS
    3432E820_SMAP = 0x534d4150
    3533
    … …  
    4745        movw    %bx,%es
    4846        movw    $e820table_boot,%di
    49         movb    $E820_MAX_RECORDS,e820counter_boot
     47        movb    $MEMMAP_E820_MAX_RECORDS,e820counter_boot
    5048e820loop:       
    5149        movl    $E820_SMAP,%edx         # control sequence "SMAP"
    5250
    5351        movl    $0x0000e820,%eax        # service
    54         movl    $E820_RECORD_SIZE,%ecx
     52        movl    $MEMMAP_E820_RECORD_SIZE,%ecx
    5553        int     $0x15
    5654        jc      e820err
    … …  
    5957        jne     e820err
    6058
    61         cmpl    $E820_RECORD_SIZE,%ecx
     59        cmpl    $MEMMAP_E820_RECORD_SIZE,%ecx
    6260        jne     e820err                 # bad record size - bug in bios
    6361       
    6462        movw    %di,%ax         # next record
    65         addw    $E820_RECORD_SIZE,%ax
     63        addw    $MEMMAP_E820_RECORD_SIZE,%ax
    6664        movw    %ax,%di
    6765               
    … …  
    7371       
    7472e820end:
    75         movb    $E820_MAX_RECORDS,%al
     73        movb    $MEMMAP_E820_MAX_RECORDS,%al
    7674        subb    e820counter_boot,%al
    7775        movb    %al,e820counter_boot # store # of valid entries in e820counter
Note: See TracChangeset for help on using the changeset viewer.