From 189a524abfe1eb5822ba3046e6c67919c344cc17 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Mon, 14 May 2007 04:27:51 +0000 Subject: [PATCH] fixed mtrr in VGA modes git-svn-id: svn://kolibrios.org@490 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/memory.inc | 16 ++++++++-------- kernel/trunk/kernel.asm | 8 +++----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/kernel/trunk/core/memory.inc b/kernel/trunk/core/memory.inc index dffd55d3f5..5c4a59ce7b 100644 --- a/kernel/trunk/core/memory.inc +++ b/kernel/trunk/core/memory.inc @@ -242,6 +242,8 @@ proc init_LFB mov [BOOT_VAR+0x901c],byte 2 ret @@: + call init_mtrr + mov edx, LFB_BASE mov esi, [LFBAddress] mov edi, 0x00800000 @@ -968,15 +970,13 @@ new_services: stdcall load_library, ebx mov [esp+36], eax ret - @@: - cmp eax, 20 - ja .fail - mov eax, ecx - call user_realloc - mov [esp+36], eax - ret - + cmp eax, 20 + ja .fail + mov eax, ecx + call user_realloc + mov [esp+36], eax + ret .fail: xor eax, eax mov [esp+36], eax diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index c1bc98bf07..c393f98d01 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -449,8 +449,6 @@ high_code: ltr ax mov [LFBSize], 0x800000 - call init_mtrr - call init_LFB call init_fpu call init_malloc @@ -567,9 +565,9 @@ no_lib_load: mov eax,char2 call file_system_lfn pop eax - popad - - + popad + + mov esi,boot_fonts call boot_log