| 139,14 → 139,10 |
|---|
| dec [pg_data.kernel_tables-OS_BASE] |
| |
| mov [edx], eax |
| add eax, 0x00400000 |
| add edx, 4 |
| |
| mov eax, 0x400000+PG_SW |
| mov ecx, [tmp_page_tabs] |
| sub ecx, 0x400000 |
| shr ecx, 12 ;ecx/=4096 |
| jmp .map_low |
| mov edi, [tmp_page_tabs] |
| jmp .map_kernel_heap ; new kernel fits to the first 4Mb - nothing to do with ".map_low" |
| .no_PSE: |
| mov eax, PG_SW |
| mov ecx, [tmp_page_tabs] |
| 159,6 → 155,7 |
|---|
| dec ecx |
| jnz @B |
| |
| .map_kernel_heap: |
| mov ecx, [pg_data.kernel_tables-OS_BASE] |
| shl ecx, 10 |
| xor eax, eax |
| 170,7 → 167,6 |
|---|
| mov edi, edx |
| |
| .map_kernel_tabs: |
| |
| stosd |
| add eax, 0x1000 |
| dec ecx |
| 270,7 → 266,6 |
|---|
| add ebx, [pg_data.pagemap_size-OS_BASE] |
| mov [page_end-OS_BASE], ebx |
| |
| mov [pg_data.pg_mutex-OS_BASE], 0 |
| ret |
| endp |
| |
| 293,7 → 288,8 |
|---|
| mov esi, edi |
| xor eax, eax |
| cld ; paranoia |
| @@: lodsb |
| @@: |
| lodsb |
| add ah, al |
| loop @b |
| jnz .pcibios_nxt2 ; control summ must be zero |
| 436,3 → 432,123 |
|---|
| ret |
| endp |
| |
| uglobal |
| align 4 |
| acpi_rsdp rd 1 |
| acpi_rsdt rd 1 |
| acpi_madt rd 1 |
| |
| acpi_dev_data rd 1 |
| acpi_dev_size rd 1 |
| |
| acpi_rsdt_base rd 1 |
| acpi_madt_base rd 1 |
| acpi_lapic_base rd 1 |
| acpi_ioapic_base rd 1 |
| endg |
| |
| ACPI_HI_RSDP_WINDOW_START equ 0x000E0000 |
| ACPI_HI_RSDP_WINDOW_END equ 0x00100000 |
| ACPI_RSDP_CHECKSUM_LENGTH equ 20 |
| ACPI_MADT_SIGN equ 0x43495041 |
| |
| |
| acpi_locate: |
| push ebx |
| mov ebx, ACPI_HI_RSDP_WINDOW_START |
| .check: |
| cmp [ebx], dword 0x20445352 |
| jne .next |
| cmp [ebx+4], dword 0x20525450 |
| jne .next |
| |
| mov edx, ebx |
| mov ecx, ACPI_RSDP_CHECKSUM_LENGTH |
| xor eax, eax |
| .sum: |
| add al, [edx] |
| inc edx |
| loop .sum |
| |
| test al, al |
| jnz .next |
| |
| mov eax, ebx |
| pop ebx |
| ret |
| .next: |
| add ebx, 16 |
| cmp ebx, ACPI_HI_RSDP_WINDOW_END |
| jb .check |
| |
| pop ebx |
| xor eax, eax |
| ret |
| |
| align 4 |
| rsdt_find: ;ecx= rsdt edx= SIG |
| push ebx |
| push esi |
| |
| lea ebx, [ecx+36] |
| mov esi, [ecx+4] |
| add esi, ecx |
| .next: |
| mov eax, [ebx] |
| cmp [eax], edx |
| je .done |
| |
| add ebx, 4 |
| cmp ebx, esi |
| jb .next |
| |
| xor eax, eax |
| pop esi |
| pop ebx |
| ret |
| |
| .done: |
| mov eax, [ebx] |
| pop esi |
| pop ebx |
| ret |
| |
| |
| align 4 |
| |
| check_acpi: |
| |
| call acpi_locate |
| test eax, eax |
| jz .done |
| |
| mov ecx, [eax+16] |
| mov edx, ACPI_MADT_SIGN |
| mov [acpi_rsdt_base-OS_BASE], ecx |
| call rsdt_find |
| test eax, eax |
| jz .done |
| |
| mov [acpi_madt_base-OS_BASE], eax |
| mov ecx, [eax+36] |
| mov [acpi_lapic_base-OS_BASE], ecx |
| |
| lea edx, [eax+44] |
| mov ecx, [eax+4] |
| add ecx, eax |
| .check: |
| mov eax, [edx] |
| cmp al, 1 |
| je .ioapic |
| |
| .next: |
| movzx eax, ah |
| add edx, eax |
| cmp edx, ecx |
| jb .check |
| .done: |
| ret |
| .ioapic: |
| mov eax, [edx+4] |
| mov [acpi_ioapic_base-OS_BASE], eax |
| ret |