KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

Improved readability, no semantic changes.

Browse Source 
git-svn-id: svn://kolibrios.org@7965 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2020-05-21 13:55:36 +00:00
parent 709f961e4c
commit 9ab5b699d5
3 changed files with 307 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trunk/core/dll.inc
View File

@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;; ;; Copyright (C) KolibriOS team 2004-2020. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License. ;; ;; Distributed under terms of the GNU General Public License. ;;
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -1228,7 +1228,7 @@ proc load_library stdcall, file_name:dword, encoding:dword
mov [eax+HDLL.parent], esi mov [eax+HDLL.parent], esi
mov edx, ebx mov edx, ebx
shr edx, 12 shr edx, 12
or dword [page_tabs+(edx-1)*4], DONT_FREE_BLOCK or dword [page_tabs+(edx-1)*4], MEM_BLOCK_DONT_FREE
; copy entries of page table from kernel-side image to usermode ; copy entries of page table from kernel-side image to usermode
; use copy-on-write for user-mode image, so map as readonly ; use copy-on-write for user-mode image, so map as readonly
xor edi, edi xor edi, edi

610
kernel/trunk/core/heap.inc
View File

File diff suppressed because it is too large Load Diff

8
kernel/trunk/kernel.asm
View File

@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;; Copyright (C) KolibriOS team 2004-2020. All rights reserved.
;; PROGRAMMING: ;; PROGRAMMING:
;; Ivan Poddubny ;; Ivan Poddubny
;; Marat Zakiyanov (Mario79) ;; Marat Zakiyanov (Mario79)
@ -2799,7 +2799,7 @@ align 4
jz .nomem jz .nomem
mov ebx, eax mov ebx, eax
shr ebx, 12 shr ebx, 12
or dword [page_tabs+(ebx-1)*4], DONT_FREE_BLOCK or dword [page_tabs+(ebx-1)*4], MEM_BLOCK_DONT_FREE
mov esi, [img_background] mov esi, [img_background]
shr esi, 12 shr esi, 12
mov ecx, [mem_BACKGROUND] mov ecx, [mem_BACKGROUND]
@ -2844,7 +2844,7 @@ nosb6:
mov ebx, ecx mov ebx, ecx
shr eax, 12 shr eax, 12
mov ecx, [page_tabs+(eax-1)*4] mov ecx, [page_tabs+(eax-1)*4]
test cl, USED_BLOCK+DONT_FREE_BLOCK test cl, MEM_BLOCK_USED or MEM_BLOCK_DONT_FREE
jz .err jz .err
jnp .err jnp .err
push eax push eax
@ -2862,7 +2862,7 @@ align 4
inc eax inc eax
loop @b loop @b
pop eax pop eax
and dword [page_tabs+(eax-1)*4], not DONT_FREE_BLOCK and dword [page_tabs+(eax-1)*4], not MEM_BLOCK_DONT_FREE
stdcall user_free, ebx stdcall user_free, ebx
mov [esp+32], eax mov [esp+32], eax
and [bgrlockpid], 0 and [bgrlockpid], 0