WebSVN – Kolibri OS – Diff – /kernel/trunk/bootloader/uefi4kos/uefi32kos.asm

         mov     eax, [esi+EFI_SYSTEM_TABLE.BootServices]
         ccall   [eax+EFI_BOOT_SERVICES.AllocatePages], \
                 EFI_ALLOCATE_MAX_ADDRESS, EFI_RESERVED_MEMORY_TYPE, 1, \
-                devicesdat_data
-        test    eax, eax
+                devicesdat_data
-        jnz     .error
+        call    halt_on_error
         mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
         call    num2hex
         mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
         ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg
-        mov     eax, [status]
-        test    eax, eax
-        jz      @f
+        mov     eax, [status]
-        call    clearbuf
-        mov     edi, msg
-        call    num2hex
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg_error
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg
-        jmp     $
-@@:
+        call    halt_on_error
         mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
         add     ebx, 4
         jmp     .next_gop_handle
-@@:
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
-                msg_look_for_rsdp
-        mov     ebx, [efi_table]
-        mov     edi, [ebx+EFI_SYSTEM_TABLE.ConfigurationTable]
-        mov     ecx, [ebx+EFI_SYSTEM_TABLE.NumberOfTableEntries]
-.next_table:
-        dec     ecx
-        js      .all_tables_done
-        ; EFI_ACPI_TABLE_GUID
-        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x0], 0x8868e871
-        jnz     .not_acpi20
-        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x4], 0x11d3e4f1
-        jnz     .not_acpi20
-        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x8], 0x800022bc
-        jnz     .not_acpi20
-        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0xc], 0x81883cc7
-        jnz     .not_acpi20
-        mov     eax, [edi+EFI_CONFIGURATION_TABLE.VendorTable]
-        mov     edx, BOOT_LO.acpi_rsdp
-        mov     [edx], eax
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
+@@:
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
-                msg_rsdp_found
-        jmp     .all_tables_done
-.not_acpi20:
-        add     edi, sizeof.EFI_CONFIGURATION_TABLE
         jmp     .next_table
-.all_tables_done:
+        call    find_rsdp
 @@:
         movzx   ecx, [cfg_opt_value_vmode]
         mov     eax, [gop_interface]
-        ccall   [eax+EFI_GRAPHICS_OUTPUT_PROTOCOL.SetMode], eax, ecx
-        test    eax, eax
-        jz      @f
+        ccall   [eax+EFI_GRAPHICS_OUTPUT_PROTOCOL.SetMode], eax, ecx
-        call    clearbuf
-        mov     edi, msg
-        call    num2hex
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg
-        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg_error
-        jmp     $
-@@:
+        call    halt_on_error
         mov     ecx, [gop_interface]
         mov     edx, [ecx+EFI_GRAPHICS_OUTPUT_PROTOCOL.Mode]
         mov     byte[edx+BOOT_LO.pci_data+1], 8    ; last bus, don't know how to count them
         mov     byte[edx+BOOT_LO.pci_data+2], 0x10 ; PCI version
         mov     byte[edx+BOOT_LO.pci_data+3], 0x02
         mov     dword[edx+BOOT_LO.pci_data+4], 0xe3
-        mov     eax, [efi_table]
-        mov     eax, [eax+EFI_SYSTEM_TABLE.BootServices]
-        ccall   [eax+EFI_BOOT_SERVICES.AllocatePages], \
-                EFI_ALLOCATE_ANY_PAGES, EFI_RESERVED_MEMORY_TYPE, \
-                MEMORY_MAP_SIZE/0x1000, memory_map
-        test    eax, eax
-        jnz     .error
-        mov     eax, [efi_table]
-        mov     eax, [eax+EFI_SYSTEM_TABLE.BootServices]
-        ccall   [eax+EFI_BOOT_SERVICES.GetMemoryMap], memory_map_size, \
-                [memory_map], memory_map_key, descriptor_size, descriptor_ver
-        test    eax, eax
-        jnz     .error
-        mov     edi, BOOT_LO.memmap_block_cnt
-        mov     dword[edi], 0
-        mov     edi, BOOT_LO.memmap_blocks
-        mov     eax, [memory_map_size]
-        xor     edx, edx
-        mov     ecx, [descriptor_size]
-        div     ecx
-        mov     ecx, eax
-        cmp     ecx, MAX_MEMMAP_BLOCKS
-        jbe     @f
-        mov     ecx, MAX_MEMMAP_BLOCKS
-@@:
-        xor     eax, eax
-        mov     [eax+BOOT_LO.memmap_block_cnt], 0
-        mov     esi, [memory_map]
-.next_descr:
-        call    add_uefi_memmap
-        add     esi, [descriptor_size]
-        add     edi, sizeof.e820entry
-        dec     ecx
-        jnz     .next_descr
         ; kernel
 ;        eficall BootServices, AllocatePages, EFI_RESERVED_MEMORY_TYPE, \
 ;                450000/0x1000, EFI_ALLOCATE_ADDRESS
         ; ramdisk
+;        eficall BootServices, AllocatePages, EFI_RESERVED_MEMORY_TYPE, \
+;                2880*512/0x1000, EFI_ALLOCATE_ADDRESS
-;        eficall BootServices, AllocatePages, EFI_RESERVED_MEMORY_TYPE, \
+        call    calc_memmap
-;                2880*512/0x1000, EFI_ALLOCATE_ADDRESS
+;        call    dump_memmap
         mov     eax, [efi_table]
-        mov     eax, [eax+EFI_SYSTEM_TABLE.BootServices]
-        ccall   [eax+EFI_BOOT_SERVICES.ExitBootServices], [efi_handle], \
+        mov     eax, [eax+EFI_SYSTEM_TABLE.BootServices]
-                [memory_map_key]
-        test    eax, eax
+        ccall   [eax+EFI_BOOT_SERVICES.ExitBootServices], [efi_handle], \
-        jnz     .error
+                [memory_map_key]
         call    halt_on_error
         mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
         ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
                 msg_error
         jmp     $
+halt_on_error:
-; linux/arch/x86/platform/efi/efi.c
+        test    eax, eax
+        jz      @f
-; do_add_efi_memmap
+        call    clearbuf
-proc add_uefi_memmap
+        mov     edi, msg
+        call    num2hex
+        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
+        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
+                msg_error
+        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
-locals
+        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, msg
-  pew dd ?
+        jmp     $
-endl
+@@:
+        ret
-        pushad
+proc find_rsdp
+        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
+        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
+                msg_look_for_rsdp
+        mov     edi, [esi+EFI_SYSTEM_TABLE.ConfigurationTable]
+        mov     ecx, [esi+EFI_SYSTEM_TABLE.NumberOfTableEntries]
+.next_table:
+        dec     ecx
+        js      .all_tables_done
+        ; EFI_ACPI_TABLE_GUID
+        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x0], 0x8868e871
+        jnz     .not_acpi20
+        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x4], 0x11d3e4f1
+        jnz     .not_acpi20
+        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0x8], 0x800022bc
+        jnz     .not_acpi20
+        cmp     dword[edi+EFI_CONFIGURATION_TABLE.VendorGUID+0xc], 0x81883cc7
-        mov     edx, [esi+EFI_MEMORY_DESCRIPTOR.Type]
+        jnz     .not_acpi20
+        mov     eax, [edi+EFI_CONFIGURATION_TABLE.VendorTable]
+        mov     edx, BOOT_LO.acpi_rsdp
+        mov     [edx], eax
+        mov     eax, [esi+EFI_SYSTEM_TABLE.ConOut]
+        ccall   [eax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], eax, \
+                msg_rsdp_found
+        jmp     .all_tables_done
+.not_acpi20:
+        add     edi, sizeof.EFI_CONFIGURATION_TABLE
+        jmp     .next_table
+.all_tables_done:
+        ret
+endp
-        mov     eax, [esi+EFI_MEMORY_DESCRIPTOR.PhysicalStart.lo] ; FIXME hi
-        mov     [edi+e820entry.addr], eax
+proc calc_memmap
+        mov     eax, [esi+EFI_SYSTEM_TABLE.BootServices]
+        ccall   [eax+EFI_BOOT_SERVICES.AllocatePages], EFI_ALLOCATE_ANY_PAGES, \
+                EFI_RESERVED_MEMORY_TYPE, MEMORY_MAP_SIZE/0x1000, memory_map
+        call    halt_on_error
-        mov     eax, [esi+EFI_MEMORY_DESCRIPTOR.NumberOfPages]
-        shl     eax, 12
+        mov     eax, [esi+EFI_SYSTEM_TABLE.BootServices]
-        mov     [edi+e820entry.size], eax
+        ccall   [eax+EFI_BOOT_SERVICES.GetMemoryMap], memory_map_size, \
+                [memory_map], memory_map_key, descriptor_size, descriptor_ver
-        cmp     edx, EFI_LOADER_CODE
-        jz      .case0
+        call    halt_on_error
-        cmp     edx, EFI_LOADER_DATA
-        jz      .case0
+        push    esi
-        cmp     edx, EFI_BOOT_SERVICES_CODE
-        jz      .case0
+        mov     edi, BOOT_LO.memmap_blocks
-        cmp     edx, EFI_BOOT_SERVICES_DATA
+        mov     dword[edi-4], 0 ; memmap_block_cnt
-        jz      .case0
+        mov     esi, [memory_map]
-        cmp     edx, EFI_CONVENTIONAL_MEMORY
-        jz      .case0
+        mov     ebx, esi
-        cmp     edx, EFI_ACPI_RECLAIM_MEMORY
-        jz      .case1
+        add     ebx, [memory_map_size]
-        cmp     edx, EFI_ACPI_MEMORY_NVS
+.next_descr:
+        call    add_uefi_memmap
+        add     esi, [descriptor_size]
+        cmp     esi, ebx
-        jz      .case2
+        jb      .next_descr
-        cmp     edx, EFI_UNUSABLE_MEMORY
+        pop     esi
-        jz      .case3
+        ret
+endp
+; linux/arch/x86/platform/efi/efi.c
+; do_add_efi_memmap
+proc add_uefi_memmap
+        cmp     [BOOT_LO.memmap_block_cnt], MAX_MEMMAP_BLOCKS
+        jz      .done
-        cmp     edx, EFI_PERSISTENT_MEMORY
+        mov     eax, [esi+EFI_MEMORY_DESCRIPTOR.PhysicalStart.lo]
-        jz      .case4
+        mov     edx, [esi+EFI_MEMORY_DESCRIPTOR.PhysicalStart.hi]
+        mov     [edi+e820entry.addr.lo], eax
+        mov     [edi+e820entry.addr.hi], edx
-        jmp     .default
+        mov     eax, [esi+EFI_MEMORY_DESCRIPTOR.NumberOfPages.lo]
+        mov     edx, [esi+EFI_MEMORY_DESCRIPTOR.NumberOfPages.hi]
+        shld    edx, eax, 12
+        shl     eax, 12
+        mov     [edi+e820entry.size.lo], eax
+        mov     [edi+e820entry.size.hi], edx
+        mov     ecx, [esi+EFI_MEMORY_DESCRIPTOR.Type]
-.case0:
+        cmp     ecx, EFI_LOADER_CODE
+        jz      .mem_ram_if_wb
-        test    [esi+EFI_MEMORY_DESCRIPTOR.Attribute.lo], EFI_MEMORY_WB
+        cmp     ecx, EFI_LOADER_DATA
+        jz      .mem_ram_if_wb
-        jz      @f
+        cmp     ecx, EFI_BOOT_SERVICES_CODE
-        mov     eax, E820_RAM
+        jz      .mem_ram_if_wb
-        jmp     .done
+        cmp     ecx, EFI_BOOT_SERVICES_DATA
-    @@:
+        jz      .mem_ram_if_wb
-        mov     eax, E820_RESERVED
+        cmp     ecx, EFI_CONVENTIONAL_MEMORY
-        jmp     .done
+        jz      .mem_ram_if_wb
-.case1:
+        cmp     ecx, EFI_ACPI_RECLAIM_MEMORY
         mov     eax, E820_ACPI
-        jmp     .done
+        jz      .type_done
-.case2:
+        cmp     ecx, EFI_ACPI_MEMORY_NVS
         mov     eax, E820_NVS
+        jz      .type_done
+        cmp     ecx, EFI_UNUSABLE_MEMORY
+        mov     eax, E820_UNUSABLE
+        jz      .type_done
+        cmp     ecx, EFI_PERSISTENT_MEMORY
-        jmp     .done
+        mov     eax, E820_PMEM
-.case3:
+        jz      .type_done
-        mov     eax, E820_UNUSABLE
-        jmp     .done
-.case4:
+        jmp     .reserved
-        mov     eax, E820_PMEM
+.mem_ram_if_wb:
-        jmp     .done
+        test    [esi+EFI_MEMORY_DESCRIPTOR.Attribute.lo], EFI_MEMORY_WB
+        mov     eax, E820_RAM
-.default:
+        jnz     .type_done
-        mov     eax, E820_RESERVED
+.reserved:
-        jmp     .done
+        mov     eax, E820_RESERVED
+.type_done:
-.done:
+        mov     [edi+e820entry.type], eax
-        mov     [edi+e820entry.type], eax
+        cmp     eax, E820_RAM
         jnz     @f

Subversion Repositories Kolibri OS

(root)/kernel/trunk/bootloader/uefi4kos/uefi32kos.asm – Rev 8206 → 8220