WebSVN – Kolibri OS – Diff – /kernel/branches/flat_kernel/core/memory.inc

            dec [pg_data.pg_mutex]
            ret
 .expand:
-           add edi, new_app_base
+         ;  add edi, new_app_base
-           add esi, new_app_base
+         ;  add esi, new_app_base
            push esi
            push edi
         .err_addr equ ebp-4
            pushad
-     push eax
+;     push eax
-     push edx
+;     push edx
-     mov edx, 0x400   ;bocsh
+;     mov edx, 0x400   ;bocsh
-     mov al,0xff      ;bocsh
+;     mov al,0xff      ;bocsh
-     out dx, al       ;bocsh
+;     out dx, al       ;bocsh
-     pop edx
+;     pop edx
-     pop eax
+;     pop eax
            mov ebp, esp
            mov eax, cr2
            inc [pg_data.pages_faults]
+           mov ebx, [.err_addr]
-           mov ebx, [.err_addr]
+           mov eax, [.err_code]
-           cmp ebx, 0x80000000
-           jae .kernel_space
-           cmp ebx, page_tabs+0x200000
-           jae .tab_space
-           cmp ebx, app_page_tabs
+           cmp ebx, OS_BASE
-           jae .alloc
+           jb .user_space      ;ñòðàíèöà â ïàìÿòè ïðèëîæåíè
+           cmp ebx, page_tabs
+           jb .kernel_space    ;ñòðàíèöà â ïàìÿòè ÿäðà
+           cmp ebx, kernel_tabs
+           jb .alloc;.app_tabs ;òàáëèöû ñòðàíèö ïðèëîæåíè
+                               ;ïðîñòî ñîçäàäèì îäíó
+           cmp ebx, LFB_BASE
+           jb .core_tabs       ;òàáëèöû ñòðàíèö ÿäðà
-           cmp ebx, 0x7DC00000
+                               ;Îøèáêà
+.lfb:
-           jae .lfb_addr
+                               ;îáëàñòü LFB
+                               ;Îøèáêà
+           jmp .fail
+align 4
 .user_space:
-;           cmp ebx, 0x1000000
+           test eax, PG_MAP
-;           jb .exit
+           jnz .err_access     ;Ñòðàíèöà ïðèñóòñòâóåò
                                ;Îøèáêà äîñòóïà ?
-.user_space:
            shr ebx, 12
+           mov ecx, ebx
-           mov ecx, ebx
+           shr ecx, 10
-           shr ecx, 10
+           mov edx, [master_tab+ecx*4]
-           mov edx, [master_tab+ecx*4]
+           test edx, PG_MAP
+           jz .fail            ;òàáëèöà ñòðàíèö íå ñîçäàíà
-           test edx, 1
+                               ;íåâåðíûé àäðåñ â ïðîãðàììå
            jz .fail
            mov eax, [page_tabs+ebx*4]
-           mov eax, [page_tabs+ebx*4]
+           test eax, 2
-           test eax, 2
+           jz .fail            ;àäðåñ íå çàðåçåðâèðîâàí äë
-           jz .fail
+                               ;èñïîëüçîâàíèÿ. Îøèáêà
 .alloc:
            mov esp, ebp
            popad
            add esp, 4
            iretd
 .fail:
+.err_access:
+;íèêîãäà íå ïðîèñõîäèò
+           jmp .fail
+.kernel_space:
+           test eax, PG_MAP
+           jz .fail        ;ñòðàíèöà íå ïðèñóòñòâóåò
+           test eax, 4     ;U/S
+           jnz .fail       ;ïðèëîæåíèå îáðàòèëîñü ê ïàìÿòè
+                           ;ÿäðà
+           test eax, 8
+           jnz .fail       ;óñòàíîâëåí çàðåçåðâèðîâàííûé áèò
+                           ;â òàáëèöàõ ñòðàíèö. äîáàâëåíî â P4/Xeon
+;ïîïûòêà çàïèñè â çàùèù¸ííóþ ñòðàíèöó ÿäðà
+;íå îáðàáàòûâàåì. Îøèáêà
+.core_tabs:
+.fail:
            pop es
            pop ds
            mov esp, ebp
            popad
            add esp, 4
            mov bl, 14
            jmp exc_c
            iretd
-.kernel_space:
+;.kernel_space:
 ;           shr ebx, 12
 ;           mov eax, [page_tabs+ebx*4]
 ;           shr ebx, 10
 ;           mov eax, [master_tab+ebx*4]
            jmp .exit
-.old_addr:
+;.old_addr:
 ;           shr ebx, 12
 ;           mov eax, [page_tabs+ebx*4]
 ;           shr ebx, 10
 ;           mov eax, [master_tab+ebx*4]
            jmp .exit
-.lfb_addr:
+;.lfb_addr:
 ;           shr ebx, 22
 ;           ;mov ecx, [sys_page_dir]
 ;           mov eax, [master_tab+ebx*4]
            jmp .exit
-.tab_space:
+;.tab_space:
 ;           shr ebx, 12
 ;           mov eax, [page_tabs+ebx*4]
 ;           shr ebx, 10
 ;           ;mov ecx, [sys_page_dir]
 ;           mov eax, [master_tab+ebx*4]
-           jmp .exit
+;           jmp .exit
 endp
 align 4
            cli
            mov  [eax+0xA0],ebx     ;set fields in extended information area
            mov  [eax+0xA4],ecx
-           add ebx,  new_app_base
+        ;   add ebx,  new_app_base
            add ecx, ebx
            add ecx, 4095
            and ecx, not 4095
            test edi,edi
            jz   .no_ipc_area
            mov ebx, edi
-           add edi, new_app_base
+       ;    add edi, new_app_base
            and ebx, 0xFFF
            mov [dst_offset], ebx
            mov esi, [eax+SLOT_BASE+0xa4]
            mov [edi+4], ecx
            add edi, 8
            mov esi, [msg_addr]
-           add esi, new_app_base
+       ;    add esi, new_app_base
            cld
            rep movsb
            mov ebx, [ipc_tmp]
 align 4
 sysfn_meminfo:
-           add ebx, new_app_base
+        ;   add ebx, new_app_base
-           cmp ebx, new_app_base
+           cmp ebx, OS_BASE
-           jb .fail
+           jae .fail
            mov eax, [pg_data.pages_count]
            mov [ebx], eax
            ret
 @@:
            cmp eax, 13
            ja @f
-           add ebx, new_app_base
+       ;    add ebx, new_app_base
            stdcall user_free, ebx
            mov [esp+36], eax
            ret
 @@:
            cmp eax, 14
            ja @f
-           add ebx, new_app_base
+      ;     add ebx, new_app_base
-           cmp ebx, new_app_base
+           cmp ebx, OS_BASE
-           jb .fail
+           jae .fail
            stdcall get_event_ex, ebx, ecx
            mov [esp+36], eax
            ret
 @@:
            cmp eax, 15
            ja @f
            ja @f
            test ebx, ebx
            jz .fail
-           add ebx, new_app_base
+     ;      add ebx, new_app_base
-           cmp ebx, new_app_base
+           cmp ebx, OS_BASE
-           jb .fail
+           jae .fail
            stdcall get_service, ebx
            mov [esp+36], eax
            ret
 @@:
            cmp eax, 17
            ret
 @@:
            cmp eax, 19
            ja .fail
-           add ebx, new_app_base
+      ;     add ebx, new_app_base
-           cmp ebx, new_app_base
+           cmp ebx, OS_BASE
-           jb .fail
+           jae .fail
            stdcall load_library, ebx
            mov [esp+36], eax
            ret
 .fail:

Subversion Repositories Kolibri OS

(root)/kernel/branches/flat_kernel/core/memory.inc – Rev 418 → 419