WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri_pe/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 862 $
+$Revision: 863 $
 public _rd_fat_end
 public _rd_root
 public _rd_root_end
+extrn __edata
 extrn _16bit_start
 extrn _16bit_end
+extrn _enter_bootscreen
-extrn _enter_bootscreen
+extrn _poweroff
 extrn _init
            xor eax, eax
            mov [cpu_caps], eax
            mov [cpu_caps+4], eax
-           pushfd
-           pop eax
-           mov ecx, eax
-           xor eax, 0x40000
-           push eax
-           popfd
-           pushfd
-           pop eax
-           xor eax, ecx
-           mov [cpu_type], CPU_386
-           jz .end_cpuid
-           push ecx
-           popfd
-           mov [cpu_type], CPU_486
-           mov eax, ecx
-           xor eax, 0x200000
-           push eax
-           popfd
-           pushfd
-           pop eax
-           xor eax, ecx
-           je .end_cpuid
-           mov [cpu_id], 1
            xor eax, eax
            cpuid
            mov [cpu_vendor], ebx
            ret
 endp
 align 4
+_copy_pg_balloc  dd 0
 _high_code:
 	   mov ax,os_stack
            mov dx,app_data
            call test_cpu
            call _init
+           mov eax, [_pg_balloc]
+           mov [_copy_pg_balloc], eax
 	   mov [tss._ss0], os_stack
            mov [tss._esp0], __os_stack
            mov [tss._esp], __os_stack
 	   mov [tss._cs],os_code
 	   mov	ax,tss0
 	   ltr	ax
+__core_restart:
            mov ecx, 1280*1024
            fastcall _balloc
            mov [_display_data], eax
 	   pop	eax
 	   call sys_cd_audio
 yes_shutdown_param:
 	   cli
-	   mov	eax, kernel_file ; load kernel.mnt to 0x7000:0
-	   push 12
-	   pop	esi
-	   xor	ebx,ebx
-	   or	ecx,-1
-	   mov	edx, OS_BASE+0x70000
-	   call fileread
-   ;        mov  esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
-   ;        mov  edi,OS_BASE+0x40000
-   ;        mov  ecx,1000
+           cmp byte [BOOT_VAR+0x9030], 3
+           je _sys_reboot
+           cmp byte [BOOT_VAR+0x9030], 4
+           je _sys_restart
    ;        rep  movsb
            cld
            mov  esi, BOOT_VAR    ; restore 0x0 - 0xffff
-           mov  edi, OS_BASE
-           mov  ecx,0x10000/4
+           mov  edi, OS_BASE
+           mov  ecx,0x10000/4
+           rep movsd
-           cld
+           mov esi, _16bit_start + OS_BASE
+           mov ecx, _16bit_end
-           rep movsd
+           shr ecx, 2
-	   call restorefatchain
-	   mov al, 0xFF
-	   out 0x21, al
+           mov edi, _16BIT_BASE + OS_BASE
-	   out 0xA1, al
+           rep movsd
-if 1
-       ;    mov  word [OS_BASE+0x467+0],pr_mode_exit
-       ;    mov  word [OS_BASE+0x467+2],0x1000
-	   mov	al,0x0F
-	   out	0x70,al
+           mov dword [_sys_pdbr],   PG_LARGE+PG_SW
-	   mov	al,0x05
+           mov eax, _sys_pdbr + (0x100000000-OS_BASE)
-	   out	0x71,al
+           mov cr3, eax
+           jmp far 0x60:_poweroff;
-	   mov	al,0xFE
-	   out	0x64,al
+_sys_restart:
-	   hlt
+           mov ax,os_stack
-else
+           mov dx,app_data
-	cmp	byte [OS_BASE + 0x9030], 2
-	jnz	no_acpi_power_off
+	   mov ss,ax
-; scan for RSDP
+           mov esp, __os_stack
-; 1) The first 1 Kb of the Extended BIOS Data Area (EBDA).
-	movzx	eax, word [OS_BASE + 0x40E]
-	shl	eax, 4
-	jz	@f
-	mov	ecx, 1024/16
-	call	scan_rsdp
-	jnc	.rsdp_found
+           mov ds, dx
-@@:
-; 2) The BIOS read-only memory space between 0E0000h and 0FFFFFh.
+           mov es, dx
-	mov	eax, 0xE0000
+           mov fs, dx
-	mov	ecx, 0x2000
+           mov gs, dx
-	call	scan_rsdp
-	jc	no_acpi_power_off
-.rsdp_found:
-	mov	esi, [eax+16]	; esi contains physical address of the RSDT
-	mov	ebp, [ipc_tmp]
-	stdcall map_page, ebp, esi, PG_MAP
-	lea	eax, [esi+1000h]
-	lea	edx, [ebp+1000h]
-	stdcall map_page, edx, eax, PG_MAP
-	and	esi, 0xFFF
-	add	esi, ebp
-	cmp	dword [esi], 'RSDT'
-	jnz	no_acpi_power_off
-	mov	ecx, [esi+4]
-	sub	ecx, 24h
-	jbe	no_acpi_power_off
-	shr	ecx, 2
-	add	esi, 24h
+           call restorefatchain
-.scan_fadt:
-	lodsd
-	mov	ebx, eax
-	lea	eax, [ebp+2000h]
-	stdcall map_page, eax, ebx, PG_MAP
-	lea	eax, [ebp+3000h]
-	add	ebx, 0x1000
-	stdcall map_page, eax, ebx, PG_MAP
-	and	ebx, 0xFFF
-	lea	ebx, [ebx+ebp+2000h]
-	cmp	dword [ebx], 'FACP'
-	jz	.fadt_found
-	loop	.scan_fadt
-	jmp	no_acpi_power_off
-.fadt_found:
+           cld
-; ebx is linear address of FADT
-	mov	edx, [ebx+48]
-	test	edx, edx
-	jz	.nosmi
-	mov	al, [ebx+52]
+           mov  esi, BOOT_VAR    ; restore 0x0 - 0xffff
-	out	dx, al
-	mov	edx, [ebx+64]
-@@:
-	in	ax, dx
-	test	al, 1
+           mov  edi, OS_BASE
-	jz	@b
+           mov  ecx,0x10000/4
-.nosmi:
-	mov	edx, [ebx+64]
-	in	ax, dx
-	and	ax, 203h
-	or	ax, 3C00h
-	out	dx, ax
-	mov	edx, [ebx+68]
+           rep movsd
+           mov eax, [_copy_pg_balloc]
+           mov [_pg_balloc], eax
+           mov dword [_sys_pdbr],   PG_LARGE+PG_SW
+           mov eax, _sys_pdbr + (0x100000000-OS_BASE)
+           mov cr3, eax
+           mov ecx, LAST_PAGE
+           mov edi, cur_saved_data
-	test	edx, edx
+           sub edi, OS_BASE
-	jz	@f
+           sub ecx, edi
-	in	ax, dx
+           shr ecx, 2
-	and	ax, 203h
+           xor eax, eax
-	or	ax, 3C00h
+           rep stosd
 	out	dx, ax
-@@:
+           call test_cpu
 	   out	0x64,al
 	   hlt
-scan_rsdp:
-	add	eax, OS_BASE
-.s:
-	cmp	dword [eax], 'RSD '
-	jnz	.n
-	cmp	dword [eax+4], 'PTR '
-	jnz	.n
-	xor	edx, edx
-	xor	esi, esi
-@@:
-	add	dl, [eax+esi]
-	inc	esi
-	cmp	esi, 20
-	jnz	@b
-	test	dl, dl
-	jz	.ok
-.n:
-	add	eax, 10h
-	loop	.s
-	stc
-.ok:
-	ret
-end if
 include "data32.inc"

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/kernel.asm – Rev 862 → 863