From ed47d8bf86b53abf7c43b68a9d15d2ce29689538 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Wed, 7 Mar 2007 05:42:05 +0000 Subject: [PATCH] fixed #pf handler git-svn-id: svn://kolibrios.org@395 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/flat_kernel/core/memory.inc | 5 ++++- kernel/branches/flat_kernel/kernel.asm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/branches/flat_kernel/core/memory.inc b/kernel/branches/flat_kernel/core/memory.inc index 99f7e5c7d3..38fc19d447 100644 --- a/kernel/branches/flat_kernel/core/memory.inc +++ b/kernel/branches/flat_kernel/core/memory.inc @@ -478,7 +478,7 @@ proc page_fault_handler cmp ebx, 0x80000000 jae .kernel_space - cmp ebx, page_tabs+0x800 + cmp ebx, page_tabs+0x200000 jae .tab_space cmp ebx, app_page_tabs @@ -487,6 +487,9 @@ proc page_fault_handler cmp ebx, 0x7DC00000 jae .lfb_addr +; cmp ebx, 0x1000000 +; jb .exit + .user_space: shr ebx, 12 mov ecx, ebx diff --git a/kernel/branches/flat_kernel/kernel.asm b/kernel/branches/flat_kernel/kernel.asm index d55919ebe9..bc25b26828 100644 --- a/kernel/branches/flat_kernel/kernel.asm +++ b/kernel/branches/flat_kernel/kernel.asm @@ -336,7 +336,7 @@ high_code: ; and the contents of this field, plus 8, are copied into the SS register. ; mov edx, (os_code + 16) * 65536 + os_code - mov edx, 0x1B0013 + mov edx, 0x1B0008 mov eax, syscall_entry mov ecx, MSR_AMD_STAR