wok rev 20745
azpainter: update WGET_URL
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Feb 10 10:35:42 2019 +0100 (2019-02-10) |
parents | e972234146a1 |
children | ed2d66b3c838 |
files | azpainter/receipt linld/stuff/src/JUMP.ASM linld/stuff/src/LOAD.CPP |
line diff
1.1 --- a/azpainter/receipt Sun Feb 10 10:13:37 2019 +0100 1.2 +++ b/azpainter/receipt Sun Feb 10 10:35:42 2019 +0100 1.3 @@ -9,7 +9,7 @@ 1.4 WEB_SITE="https://osdn.net/projects/azpainter/" 1.5 1.6 TARBALL="$PACKAGE-$VERSION.tar.xz" 1.7 -WGET_URL="https://de.osdn.net/projects/$PACKAGE/downloads/70132/$TARBALL" 1.8 +WGET_URL="https://dotsrc.dl.osdn.net/osdn/$PACKAGE/70132/$TARBALL" 1.9 1.10 DEPENDS="xorg-libX11 xorg-libXext xorg-libXi freetype fontconfig \ 1.11 libpng libjpeg-turbo"
2.1 --- a/linld/stuff/src/JUMP.ASM Sun Feb 10 10:13:37 2019 +0100 2.2 +++ b/linld/stuff/src/JUMP.ASM Sun Feb 10 10:35:42 2019 +0100 2.3 @@ -125,10 +125,17 @@ 2.4 push es 2.5 pop ss 2.6 mov sp,0A000h 2.7 - extrn _csip:dword 2.8 - push [dword _csip] 2.9 extrn _rm_size:word 2.10 + ifdef NO386 2.11 + mov si,offset _rm_size-2 ; _rm_size, _pm_high, _rm_buf 2.12 + lodsw 2.13 + push ax ; _csip high 2.14 + push [word si-4] ; _csip low 2.15 + else 2.16 + extrn _csip:dword; 2.17 + push [dword _csip] ; _csip 2.18 mov si,offset _rm_size ; _rm_size, _pm_high, _rm_buf 2.19 + endif 2.20 lodsw 2.21 xchg ax,cx ; _rm_size 2.22 lodsb ; _pm_high
3.1 --- a/linld/stuff/src/LOAD.CPP Sun Feb 10 10:13:37 2019 +0100 3.2 +++ b/linld/stuff/src/LOAD.CPP Sun Feb 10 10:35:42 2019 +0100 3.3 @@ -111,11 +111,6 @@ 3.4 3.5 const u32 HdrS = 'H' + ('d'<<8) + (u32('r')<<16) + (u32('S')<<24); 3.6 3.7 -u16 rm_size; 3.8 -static u8 pm_high; // @ = @rm_size + 2, see JUMP.ASM 3.9 -static u8* rm_buf; // @ = @rm_size + 3, see JUMP.ASM 3.10 -struct image_himem imgs[2]; 3.11 - 3.12 // register value to launch the kernel real mode code 3.13 #ifdef NO386 3.14 u32 csip; 3.15 @@ -124,6 +119,11 @@ 3.16 u32 csip=0x90200000; 3.17 #define topseg() 0x9000 3.18 #endif 3.19 +u16 rm_size; 3.20 +static u8 pm_high; // @ = @rm_size + 2, see JUMP.ASM 3.21 +static u8* rm_buf; // @ = @rm_size + 3, see JUMP.ASM 3.22 +struct image_himem imgs[2]; 3.23 + 3.24 u32 base_himem = _1m+_64k; 3.25 3.26 static const char kernel_file_error[] = "Can't use kernel file"; 3.27 @@ -134,7 +134,7 @@ 3.28 #define _pm_high (((u8*)(m))[-3]) 3.29 #define _rm_size (*(u16*)((u8*)(m)-5)) 3.30 #ifdef NO386 3.31 -#define _csip (*(u32*)(m+2)) 3.32 +#define _csip (*(u32*)((u8*)(m)-9)) 3.33 *((u16 *)&csip+1)=topseg()+0x20; 3.34 #else 3.35 #define _csip csip