# HG changeset patch # User Pascal Bellard # Date 1549791342 -3600 # Node ID 7f39f4ab751199a71492e3c7e9b439046f441d3d # Parent e972234146a1d6c5ac0cfff5b04aeae4bae64b68 azpainter: update WGET_URL diff -r e972234146a1 -r 7f39f4ab7511 azpainter/receipt --- a/azpainter/receipt Sun Feb 10 10:13:37 2019 +0100 +++ b/azpainter/receipt Sun Feb 10 10:35:42 2019 +0100 @@ -9,7 +9,7 @@ WEB_SITE="https://osdn.net/projects/azpainter/" TARBALL="$PACKAGE-$VERSION.tar.xz" -WGET_URL="https://de.osdn.net/projects/$PACKAGE/downloads/70132/$TARBALL" +WGET_URL="https://dotsrc.dl.osdn.net/osdn/$PACKAGE/70132/$TARBALL" DEPENDS="xorg-libX11 xorg-libXext xorg-libXi freetype fontconfig \ libpng libjpeg-turbo" diff -r e972234146a1 -r 7f39f4ab7511 linld/stuff/src/JUMP.ASM --- a/linld/stuff/src/JUMP.ASM Sun Feb 10 10:13:37 2019 +0100 +++ b/linld/stuff/src/JUMP.ASM Sun Feb 10 10:35:42 2019 +0100 @@ -125,10 +125,17 @@ push es pop ss mov sp,0A000h - extrn _csip:dword - push [dword _csip] extrn _rm_size:word + ifdef NO386 + mov si,offset _rm_size-2 ; _rm_size, _pm_high, _rm_buf + lodsw + push ax ; _csip high + push [word si-4] ; _csip low + else + extrn _csip:dword; + push [dword _csip] ; _csip mov si,offset _rm_size ; _rm_size, _pm_high, _rm_buf + endif lodsw xchg ax,cx ; _rm_size lodsb ; _pm_high diff -r e972234146a1 -r 7f39f4ab7511 linld/stuff/src/LOAD.CPP --- a/linld/stuff/src/LOAD.CPP Sun Feb 10 10:13:37 2019 +0100 +++ b/linld/stuff/src/LOAD.CPP Sun Feb 10 10:35:42 2019 +0100 @@ -111,11 +111,6 @@ const u32 HdrS = 'H' + ('d'<<8) + (u32('r')<<16) + (u32('S')<<24); -u16 rm_size; -static u8 pm_high; // @ = @rm_size + 2, see JUMP.ASM -static u8* rm_buf; // @ = @rm_size + 3, see JUMP.ASM -struct image_himem imgs[2]; - // register value to launch the kernel real mode code #ifdef NO386 u32 csip; @@ -124,6 +119,11 @@ u32 csip=0x90200000; #define topseg() 0x9000 #endif +u16 rm_size; +static u8 pm_high; // @ = @rm_size + 2, see JUMP.ASM +static u8* rm_buf; // @ = @rm_size + 3, see JUMP.ASM +struct image_himem imgs[2]; + u32 base_himem = _1m+_64k; static const char kernel_file_error[] = "Can't use kernel file"; @@ -134,7 +134,7 @@ #define _pm_high (((u8*)(m))[-3]) #define _rm_size (*(u16*)((u8*)(m)-5)) #ifdef NO386 -#define _csip (*(u32*)(m+2)) +#define _csip (*(u32*)((u8*)(m)-9)) *((u16 *)&csip+1)=topseg()+0x20; #else #define _csip csip