WebSVN – Kolibri OS – Diff – /kernel/trunk/core/dll.inc

 ;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1296 $
+$Revision: 1311 $
 ; scan for required DLL in list of already loaded for this process,
 ; ignore timestamp
 	   mov esi, [CURRENT_TASK]
-	   shl esi, 8
-	   lea ebx, [esi+SLOT_BASE+APP_OBJ_OFFSET]
-	   mov esi, [ebx+APPOBJ.fd]
+	   shl esi, 8
+	   lea edi, [fullname]
+	   mov ebx, [esi+SLOT_BASE+APPDATA.dlls_list_ptr]
+	   test ebx, ebx
+	   jz  .not_in_process
-	   lea edi, [fullname]
+	   mov esi, [ebx+HDLL.fd]
 .scan_in_process:
 	   cmp esi, ebx
-	   jz .not_in_process
-	   cmp dword [esi+APPOBJ.magic], 'HDLL'
-	   jnz .next_in_process
+	   jz .not_in_process
 	   mov eax, [esi+HDLL.parent]
 	   add eax, DLLDESCR.name
 	   stdcall strncmp, eax, edi, -1
 	   test eax, eax
 	   mov eax, [ecx+DLLDESCR.exports]
 	   sub eax, [ecx+DLLDESCR.defaultbase]
 	   add eax, [esi+HDLL.base]
 	   ret
 .next_in_process:
-	   mov esi, [esi+APPOBJ.fd]
+	   mov esi, [esi+HDLL.fd]
 	   jmp .scan_in_process
 .not_in_process:
 ; scan in full list, compare timestamp
 	   stdcall user_alloc, edi
 	   test eax, eax
 	   jz  .fail_and_dereference
 @@:
 	   mov [img_base], eax
+	   mov eax, HDLL.sizeof
+	   call malloc
+	   test eax, eax
+	   jz  .fail_and_free_user
 	   mov ebx, [CURRENT_TASK]
 	   shl ebx, 5
-	   mov ebx, [CURRENT_TASK+ebx+TASKDATA.pid]
+	   mov edx, [CURRENT_TASK+ebx+TASKDATA.pid]
-	   mov eax, HDLL.sizeof
+	   mov [eax+HDLL.pid], edx
+	   push eax
-	   call create_kernel_object
+	   call init_dlls_in_thread
+	   pop  ebx
 	   test eax, eax
-	   jz .fail_and_free_user
+	   jz  .fail_and_free_user
+	   mov edx, [eax+HDLL.fd]
+	   mov [ebx+HDLL.fd], edx
+	   mov [ebx+HDLL.bk], eax
-	   mov [eax+APPOBJ.magic], 'HDLL'
+	   mov [eax+HDLL.fd], ebx
-	   mov [eax+APPOBJ.destroy], destroy_hdll
+	   mov [edx+HDLL.bk], ebx
+	   mov eax, ebx
 	   mov ebx, [img_base]
 	   mov [eax+HDLL.base], ebx
 	   mov [eax+HDLL.size], edi
 	   mov [eax+HDLL.refcount], 1
 	   mov [eax+HDLL.parent], esi
 	   add edi, 0x1000
 	   cmp edi, [esi+DLLDESCR.size]
 	   jb .map_pages_loop
-; if real user-mode base is not equal to preferred base, relocate image
-	   mov ebx, [img_base]
+; if real user-mode base is not equal to preferred base, relocate image
 	   sub ebx, [esi+DLLDESCR.defaultbase]
 	   jz @f
 	   stdcall rebase_coff, [esi+DLLDESCR.coff_hdr], [esi+DLLDESCR.symbols_ptr], ebx
 	   call dereference_dll
 	   xor eax, eax
 	   ret
 endp
+; initialize [APPDATA.dlls_list_ptr] for given thread
+; DLL is per-process object, so APPDATA.dlls_list_ptr must be
+; kept in sync for all threads of one process.
+; out: eax = APPDATA.dlls_list_ptr if all is OK,
+; NULL if memory allocation failed
+init_dlls_in_thread:
+	mov	ebx, [current_slot]
+	mov	eax, [ebx+APPDATA.dlls_list_ptr]
+	test	eax, eax
+	jnz	.ret
+	push	[ebx+APPDATA.dir_table]
+	mov	eax, 8
+	call	malloc
+	pop	edx
+	test	eax, eax
+	jz	.ret
+	mov	[eax], eax
+	mov	[eax+4], eax
+	mov	ecx, [TASK_COUNT]
+	mov	ebx, SLOT_BASE+256
+.set:
+	cmp	[ebx+APPDATA.dir_table], edx
+	jnz	@f
+	mov	[ebx+APPDATA.dlls_list_ptr], eax
+@@:
+	add	ebx, 256
+	dec	ecx
+	jnz	.set
+.ret:
+	ret
 ; in: eax = number of references to delete, esi -> DLLDESCR struc
 dereference_dll:
 	sub	[esi+DLLDESCR.refcount], eax
 	jnz	.ret
 	call	free
 .ret:
 	ret
 destroy_hdll:
-	push	ebx esi edi
+	push	ebx ecx esi edi
 	push	eax
 	mov	ebx, [eax+HDLL.base]
 	mov	esi, [eax+HDLL.parent]
 	mov	edx, [esi+DLLDESCR.size]
 ; The following actions require the context of application where HDLL is mapped.
 ; However, destroy_hdll can be called in the context of OS thread when
 ; cleaning up objects created by the application which is destroyed.
-; So remember current cr3 and set it to page table of target.
-	mov	eax, [eax+HDLL.pid]
-	call	pid_to_slot
-	shl	eax, 8
-	add	eax, SLOT_BASE
+; So remember current cr3 and set it to page table of target.
-	mov	ecx, [eax+APPDATA.dir_table]
+	mov	eax, [ecx+APPDATA.dir_table]
 ; Because we cheat with cr3, disable interrupts: task switch would restore
 ; page table from APPDATA of current thread.
 ; Also set [current_slot] because it is used by user_free.
 	pushf
 	cli
 	push	[current_slot]
-	mov	[current_slot], eax
+	mov	[current_slot], ecx
-	mov	eax, cr3
+	mov	ecx, cr3
-	push	eax
+	push	ecx
-	mov	cr3, ecx
+	mov	cr3, eax
 	push	ebx	; argument for user_free
 	mov	eax, ebx
 	shr	ebx, 12
 	push	ebx
 	push	eax
 	mov	esi, [eax+HDLL.parent]
 	mov	eax, [eax+HDLL.refcount]
 	call	dereference_dll
 	pop	eax
+	mov	edx, [eax+HDLL.bk]
+	mov	ebx, [eax+HDLL.fd]
+	mov	[ebx+HDLL.bk], edx
-	call	destroy_kernel_object
+	mov	[edx+HDLL.fd], ebx
+	call	free
-	pop	edi esi ebx
+	pop	edi esi ecx ebx
+	ret
+; ecx -> APPDATA for slot, esi = dlls_list_ptr
+destroy_all_hdlls:
+	test	esi, esi
+	jz	.ret
+.loop:
+	mov	eax, [esi+HDLL.fd]
+	cmp	eax, esi
+	jz	free
+	call	destroy_hdll
+	jmp	.loop
+.ret:
 	ret
 align 4
 stop_all_services:

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/dll.inc – Rev 1296 → 1311