wok rev 20510

Up acl-dev (2.2.53)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Oct 31 15:13:42 2018 +0100 (19 months ago)
parents 8f88211c5cb8
children ed16b1f1124a
files acl-dev/receipt linld/stuff/src/COMMON.H linld/stuff/src/CRTL.ASM linld/stuff/src/CRTL.H linld/stuff/src/LOAD.CPP linld/stuff/src/MEMTOP.ASM
line diff
     1.1 --- a/acl-dev/receipt	Wed Oct 31 10:54:33 2018 +0100
     1.2 +++ b/acl-dev/receipt	Wed Oct 31 15:13:42 2018 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="acl-dev"
     1.7 -VERSION="2.2.51"
     1.8 +VERSION="2.2.53"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Development files for acl."
    1.11  MAINTAINER="rcx@zoominternet.net"
     2.1 --- a/linld/stuff/src/COMMON.H	Wed Oct 31 10:54:33 2018 +0100
     2.2 +++ b/linld/stuff/src/COMMON.H	Wed Oct 31 15:13:42 2018 +0100
     2.3 @@ -76,17 +76,10 @@
     2.4  extern u16 root_dev;
     2.5  extern u16 vid_mode;
     2.6  // External asm helpers
     2.7 -extern "C" void memcpy32(u32, u16,u32, u32);
     2.8 -extern "C" void rmcpy();
     2.9  extern "C" void xmm_alloc(struct image_himem *m);
    2.10  extern u32 topmem;
    2.11 -extern "C" u32 memtopz();
    2.12  extern "C" u32 memtop();
    2.13  extern "C" void enable_a20_or_die();
    2.14 -extern "C" int get_vcpi_interface();
    2.15 -extern "C" char* prepare_vcpi(void *pagebuf);
    2.16 -//extern "C" int call_pm_routine(void* f);
    2.17 -extern "C" void memcpy_vcpi(u32 dstofs,u16 srcseg,u32 srcofs);
    2.18  extern "C" void vm2rm();
    2.19  extern "C" void hook_int15_88();
    2.20  
     3.1 --- a/linld/stuff/src/CRTL.ASM	Wed Oct 31 10:54:33 2018 +0100
     3.2 +++ b/linld/stuff/src/CRTL.ASM	Wed Oct 31 15:13:42 2018 +0100
     3.3 @@ -159,7 +159,7 @@
     3.4  		lodsb
     3.5  		sub	al,[bx]
     3.6  		jnz	@@out
     3.7 -		sub	al,al
     3.8 +		or	al,al
     3.9  		jnz	@@lp
    3.10  @@out:
    3.11  		cbw
    3.12 @@ -182,17 +182,17 @@
    3.13                  push	ax
    3.14  ;        global  puts:near			; puts(bx)
    3.15  puts:
    3.16 -		call	putsz
    3.17 +		call	@@putsz
    3.18                  mov	bx,offset msg_crlf
    3.19 -		jmp	putsz
    3.20 -putcz:
    3.21 +		jmp	@@putsz
    3.22 +@@putcz:
    3.23  		mov	ah,2
    3.24  		int	21h
    3.25 -putsz:
    3.26 +@@putsz:
    3.27  		mov	dl,[bx]
    3.28  		inc	bx
    3.29  		or	dl,dl
    3.30 -		jne	putcz			; ZF=1  (for malloc failure)
    3.31 +		jne	@@putcz			; ZF=1  (for malloc failure)
    3.32  		ret
    3.33  
    3.34          endp    _puts
    3.35 @@ -407,14 +407,14 @@
    3.36                  push	ax
    3.37          global  malloc_or_die:near		; malloc_or_die(cx)
    3.38  malloc_or_die:
    3.39 -		mov	ax,[_heap_top]		; return value
    3.40 -		mov	bx,sp
    3.41 -		add	bh,-14h			; MIN_STACK=_1k+PAGE_SIZE
    3.42 -		sub	bx,ax			; can't overflow
    3.43 -		cmp	bx,cx
    3.44 +		mov	ax,[_heap_top]		; return value
    3.45 +		mov	bx,sp
    3.46 +		add	bh,-14h			; MIN_STACK=_1k+PAGE_SIZE
    3.47 +		sub	bx,ax			; can't overflow
    3.48 +		cmp	bx,cx
    3.49  		mov	bx,offset msg_malloc
    3.50 -		jb	die
    3.51 -		add	[_heap_top],cx		; _BEG has zero'd heap
    3.52 +		jb	die
    3.53 +		add	[_heap_top],cx		; _BEG has zero'd heap
    3.54  		ret
    3.55  
    3.56          endp    _malloc_or_die
    3.57 @@ -781,11 +781,11 @@
    3.58          global  _reset_bufv:near
    3.59          proc    _reset_bufv near
    3.60  
    3.61 -		pop	ax			;caller return address
    3.62 -		pop	bx
    3.63 +		pop	bx			;caller return address
    3.64 +		pop	ax
    3.65 +		push	ax
    3.66  		push	bx
    3.67 -		push	ax
    3.68 -		mov	[curdata],bx
    3.69 +		mov	[curdata],ax
    3.70  		and	[dword (data_himem bx).cacheidx],0
    3.71  		ret
    3.72  
    3.73 @@ -1305,9 +1305,9 @@
    3.74  		mov	ax,713Bh		; chdir long filename (ds:dx)
    3.75  		int	21h
    3.76  		mov	ah,3Bh			; chdir(ds:dx)
    3.77 -		jnc	chdirdone
    3.78 +		jnc	@@chdirdone
    3.79  		int	21h
    3.80 -chdirdone:
    3.81 +@@chdirdone:
    3.82  		pop	[word bx]
    3.83  @@end:
    3.84  		ret
     4.1 --- a/linld/stuff/src/CRTL.H	Wed Oct 31 10:54:33 2018 +0100
     4.2 +++ b/linld/stuff/src/CRTL.H	Wed Oct 31 15:13:42 2018 +0100
     4.3 @@ -32,10 +32,7 @@
     4.4  //extern "C" int open(const char* name, int flags);
     4.5  extern "C" int open(const char* name);
     4.6  extern "C" int close(int fd);
     4.7 -extern "C" void exit(int n);
     4.8 -extern "C" void abort();
     4.9  extern "C" int read(int fd, void* data, int sz);
    4.10 -extern "C" int write(int fd, const void* data, int sz);
    4.11  extern "C" long lseekset(int fd, unsigned long sz);
    4.12  extern "C" int puts(const char* s);
    4.13  extern "C" unsigned long strtol(const char *s);
     5.1 --- a/linld/stuff/src/LOAD.CPP	Wed Oct 31 10:54:33 2018 +0100
     5.2 +++ b/linld/stuff/src/LOAD.CPP	Wed Oct 31 15:13:42 2018 +0100
     5.3 @@ -145,11 +145,9 @@
     5.4     {
     5.5      u16 rm_seek;
     5.6  
     5.7 +do {
     5.8      // Do not use malloc below until heap_top adjustment (see <*>)
     5.9 -    if (read(m->fd, rm_buf, rm_seek=0x400) != 0x400) {
    5.10 -  readfail:
    5.11 -        die(kernel_file_error);
    5.12 -    }
    5.13 + if (read(m->fd, rm_buf, rm_seek=0x400) == 0x400) {
    5.14  
    5.15      if(kernelparams->setup_sects == 0) {
    5.16  #if 1
    5.17 @@ -170,8 +168,11 @@
    5.18  
    5.19      {
    5.20      u16 cnt = rm_size-rm_seek;
    5.21 -    if (read(m->fd, rm_buf+rm_seek, cnt) != cnt) goto readfail;
    5.22 +    if (read(m->fd, rm_buf+rm_seek, cnt) == cnt) break;
    5.23      }
    5.24 + }
    5.25 +        die(kernel_file_error);
    5.26 +} while (0);
    5.27     }
    5.28  
    5.29      // Tell rm loader some info
     6.1 --- a/linld/stuff/src/MEMTOP.ASM	Wed Oct 31 10:54:33 2018 +0100
     6.2 +++ b/linld/stuff/src/MEMTOP.ASM	Wed Oct 31 15:13:42 2018 +0100
     6.3 @@ -48,7 +48,7 @@
     6.4                  xchg	ax,cx		;  are more reasonable anyway...
     6.5  @@use_cxdx:				;now: dx=64k units above 16m
     6.6  					;     ax=1k units above 1m below 16m (max 3c00h)
     6.7 -                test    dx,dx
     6.8 +                or	dx,dx
     6.9                  jz      tokb            ;dx=0 here, ax=kbs above 1m
    6.10                  xor     ax,ax           ;ignore info on low 16M (assume full)
    6.11                 ;add     dx,100h         ;account for low 16M
    6.12 @@ -210,7 +210,7 @@
    6.13  @@do88:
    6.14                  pushf
    6.15                  call    @@jmp_saved15
    6.16 -                test    ax,ax
    6.17 +                or	ax,ax
    6.18                  jnz     @@iret
    6.19  
    6.20  ;****** Read extended mem size (CMOS bytes 17h,18h (lo,hi))