merge mem.inc to dll.inc

place dll.inc in /programs delete all the other dll.inc and mem.inc files correct some programs to use common dll.inc git-svn-id: svn://kolibrios.org@3014 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-11-09 10:42:30 +00:00
parent 55f254a7ee
commit 0cc349060f
50 changed files with 170 additions and 2681 deletions
--- a/programs/develop/libraries/libs-dev/.test/001/test001.asm
+++ b/programs/develop/libraries/libs-dev/.test/001/test001.asm
@@ -17,7 +17,7 @@ TRUE  = 1
 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
 include '../../libio/libio.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'

 yy dd 20

@@ -275,70 +275,6 @@ draw_window:
 _f_path db '/rd/1/lib',0
 _f_mask db '*ini*',0

-;-----------------------------------------------------------------------------
-proc mem.Alloc size ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx
-	mov	eax,[size]
-	lea	ecx,[eax+4+4095]
-	and	ecx,not 4095
-	mcall	68,12
-	add	ecx,-4
-	mov	[eax],ecx
-	add	eax,4
-	pop	ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc mptr,size;///////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx esi edi eax
-	mov	eax,[mptr]
-	mov	ebx,[size]
-	or	eax,eax
-	jz	@f
-	lea	ecx,[ebx+4+4095]
-	and	ecx,not 4095
-	add	ecx,-4
-	cmp	ecx,[eax-4]
-	je	.exit
-    @@: mov	eax,ebx
-	call	mem.Alloc
-	xchg	eax,[esp]
-	or	eax,eax
-	jz	.exit
-	mov	esi,eax
-	xchg	eax,[esp]
-	mov	edi,eax
-	mov	ecx,[esi-4]
-	cmp	ecx,[edi-4]
-	jbe	@f
-	mov	ecx,[edi-4]
-    @@: add	ecx,3
-	shr	ecx,2
-	cld
-	rep	movsd
-	xchg	eax,[esp]
-	call	mem.Free
-  .exit:
-	pop	eax edi esi ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.Free mptr ;//////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	mov	eax,[mptr]
-	or	eax,eax
-	jz	@f
-	push	ebx ecx
-	lea	ecx,[eax-4]
-	mcall	68,13
-	pop	ecx ebx
-    @@: ret
-endp
-
 ;---------------------------------------------------------------------
 ;---  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  ----------------------------------------------
 ;---------------------------------------------------------------------
--- a/programs/develop/libraries/libs-dev/.test/002/test002.asm
+++ b/programs/develop/libraries/libs-dev/.test/002/test002.asm
@@ -11,7 +11,7 @@ TRUE  = 1

 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'

 include '../../libio/libio.inc'
 include '../../libimg/libimg.inc'
@@ -137,55 +137,6 @@ draw_window:
 	invoke	gfx.close, [ctx]
 	ret

-;-----------------------------------------------------------------------------
-proc mem.Alloc, size ;////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx
-	mov	ecx, [size]
-	add	ecx, 4
-	mcall	68, 12
-	add	ecx, -4
-	mov	[eax], ecx
-	add	eax, 4
-	pop	ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc, mptr, size ;////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx edx
-	mov	ecx, [size]
-	or	ecx, ecx
-	jz	@f
-	add	ecx, 4
-    @@: mov	edx, [mptr]
-	or	edx, edx
-	jz	@f
-	add	edx, -4
-    @@: mcall	68, 20
-	or	eax, eax
-	jz	@f
-	add	ecx, -4
-	mov	[eax], ecx
-	add	eax, 4
-    @@: pop	edx ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.Free, mptr ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx
-	mov	ecx, [mptr]
-	or	ecx, ecx
-	jz	@f
-	add	ecx, -4
-    @@: mcall	68, 13
-	pop	ecx ebx
-	ret
-endp
-
 ;-----------------------------------------------------------------------------

 s_header db 'Image Viewer (test app)', 0
--- a/programs/develop/libraries/libs-dev/.test/003/test003.asm
+++ b/programs/develop/libraries/libs-dev/.test/003/test003.asm
@@ -8,7 +8,7 @@ dd 0x01, START, I_END, 0x1000, 0x1000, 0, 0

 include '../../../../../proc32.inc'
 include '../../../../../macros.inc'
-include '../dll.inc'
+include '../../../../../dll.inc'

 include '../../libio/libio.inc'
 include '../../libimg/libimg.inc'
@@ -147,55 +147,6 @@ draw_window:
 	mcall	12, 2
 	ret

-;-----------------------------------------------------------------------------
-proc mem.Alloc, size ;////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx
-	mov	ecx, [size]
-	add	ecx, 4
-	mcall	68, 12
-	add	ecx, -4
-	mov	[eax], ecx
-	add	eax, 4
-	pop	ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.ReAlloc, mptr, size ;////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx edx
-	mov	ecx, [size]
-	or	ecx, ecx
-	jz	@f
-	add	ecx, 4
-    @@: mov	edx, [mptr]
-	or	edx, edx
-	jz	@f
-	add	edx, -4
-    @@: mcall	68, 20
-	or	eax, eax
-	jz	@f
-	add	ecx, -4
-	mov	[eax], ecx
-	add	eax, 4
-    @@: pop	edx ecx ebx
-	ret
-endp
-
-;-----------------------------------------------------------------------------
-proc mem.Free, mptr ;/////////////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-	push	ebx ecx
-	mov	ecx, [mptr]
-	or	ecx, ecx
-	jz	@f
-	add	ecx, -4
-    @@: mcall	68, 13
-	pop	ecx ebx
-	ret
-endp
-
 ;-----------------------------------------------------------------------------

 window_title	db 'libimg to_rgb2 & encode demo',0
--- a/programs/develop/libraries/libs-dev/.test/dll.inc
+++ b/programs/develop/libraries/libs-dev/.test/dll.inc
@@ -1,99 +0,0 @@
-
-proc dll.Load, import_table:dword
-		mov	esi,[import_table]
-  .next_lib:	mov	edx,[esi]
-		or	edx,edx
-		jz	.exit
-		push	esi
-		mov	esi,[esi+4]
-		mov	edi,s_libdir.fname
-	    @@: lodsb
-		stosb
-		or	al,al
-		jnz	@b
-		mcall	68,19,s_libdir
-		or	eax,eax
-		jz	.fail
-		stdcall dll.Link,eax,edx
-		push	eax
-		mov	eax, [eax]
-		cmp	dword [eax], 'lib_'
-		pop	eax
-		jnz	@f
-		stdcall dll.Init,[eax+4]
-	    @@:
-		pop	esi
-		add	esi,8
-		jmp	.next_lib
-  .exit:	xor	eax,eax
-		ret
-  .fail:	add	esp,4
-		xor	eax,eax
-		inc	eax
-		ret
-endp
-
-proc dll.Link, exp:dword,imp:dword
-		push	eax
-		mov	esi,[imp]
-		test	esi,esi
-		jz	.done
-  .next:	lodsd
-		test	eax,eax
-		jz	.done
-		stdcall dll.GetProcAddress,[exp],eax
-		or	eax,eax
-		jz	@f
-		mov	[esi-4],eax
-		jmp	.next
-	    @@: mov	dword[esp],0
-  .done:	pop	eax
-		ret
-endp
-
-proc dll.Init, dllentry:dword
-		pushad
-		mov	eax,mem.Alloc
-		mov	ebx,mem.Free
-		mov	ecx,mem.ReAlloc
-		mov	edx,dll.Load
-		stdcall [dllentry]
-		popad
-		ret
-endp
-
-proc dll.GetProcAddress, exp:dword,sz_name:dword
-		mov	edx,[exp]
-		xor	eax,eax
-  .next:	or	edx,edx
-		jz	.end
-		cmp	dword[edx],0
-		jz	.end
-		stdcall strcmp,[edx],[sz_name]
-		test	eax,eax
-		jz	.ok
-		add	edx,8
-		jmp	.next
-  .ok:		mov	eax,[edx+4]
-  .end: 	ret
-endp
-
-proc strcmp, str1:dword,str2:dword
-		push	esi edi
-		mov	esi,[str1]
-		mov	edi,[str2]
-		xor	eax,eax
-	    @@: lodsb
-		scasb
-		jne	.fail
-		or	al,al
-		jnz	@b
-		jmp	.ok
-  .fail:	or	eax,-1
-  .ok:		pop	edi esi
-		ret
-endp
-
-s_libdir:
-  db '/sys/lib/'
-  .fname rb 32