wok-current rev 19949

memtest: add @cmdlinefile support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 07 21:49:40 2017 +0200 (2017-05-07)
parents d271048cbf11
children 9fcfa861ae3f
files azpainter/receipt memtest/stuff/bootloader.S memtest/stuff/pack
line diff
     1.1 --- a/azpainter/receipt	Sun May 07 20:44:37 2017 +0200
     1.2 +++ b/azpainter/receipt	Sun May 07 21:49:40 2017 +0200
     1.3 @@ -18,9 +18,7 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	./configure --prefix=/usr --infodir=/usr/share/info \
     1.8 -	--mandir=/usr/share/man \
     1.9 -	$CONFIGURE_ARGS &&
    1.10 +	./configure --prefix=/usr $CONFIGURE_ARGS &&
    1.11  	make &&
    1.12  	make DESTDIR=$DESTDIR install-strip
    1.13  }
     2.1 --- a/memtest/stuff/bootloader.S	Sun May 07 20:44:37 2017 +0200
     2.2 +++ b/memtest/stuff/bootloader.S	Sun May 07 21:49:40 2017 +0200
     2.3 @@ -26,6 +26,7 @@
     2.4  //#define MOVE_MAX_SYSSIZE	always memcpy 512Kb		-2
     2.5  //#define NO_CURSOR_DEFINITION					-8
     2.6  //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6
     2.7 +//#define NO_CMDLINE_FILE	remove @cmdline file support ?	-20
     2.8  //#define NO_DOTS		show progression dots ?		-8
     2.9  
    2.10  #ifdef EXE_SUPPORT
    2.11 @@ -53,7 +54,7 @@
    2.12  	.word	(CODESZ+511)/512	// Pages in file			INSTALLER
    2.13  	.word	0			// Relocations
    2.14  	.word	(end_header-_start)/16	// Size of header in paragraphs
    2.15 -	.word	(CODESZ+stacktop+15)/16	// Minimum extra paragraphs needed	INSTALLER
    2.16 +	.word	4096			// Minimum extra paragraphs needed
    2.17  	.word	-1			// Maximum extra paragraphs needed
    2.18  	.word	(CODESZ+15)/16		// Initial (relative) SS value		INSTALLER
    2.19  	.word	stacktop		// Initial SP value
    2.20 @@ -221,7 +222,24 @@
    2.21  	lodsb
    2.22  	cmpb	$0x20, %al
    2.23  	je	skipspace
    2.24 +#  ifndef NO_CMDLINE_FILE
    2.25 +	movw	%si,%dx
    2.26  	decw	%si
    2.27 +	subb	$'@',%al
    2.28 +	jne	notafile
    2.29 +	movb	$0x3D,%ah
    2.30 +	int	$0x21
    2.31 +	jc	notafile
    2.32 +	xchgw	%ax,%bx
    2.33 +	//movw	%si,%dx		// ~320 bytes max
    2.34 +	movw	$EXEADRS(notafile)-130,%cx
    2.35 +	movb	$0x3F,%ah
    2.36 +	int	$0x21
    2.37 +	xchgw	%ax,%cx
    2.38 +notafile:
    2.39 +#  else
    2.40 +	decw	%si
    2.41 +#  endif
    2.42  # endif
    2.43  	rep
    2.44  	  movsb
    2.45 @@ -475,8 +493,3 @@
    2.46  	.word	stacktop-4-16-4,INITSEG
    2.47  # endif
    2.48  #endif
    2.49 -
    2.50 -helpmsg:
    2.51 -	.ascii	"SliTaz zImage boot"
    2.52 -	.org 497
    2.53 -helpend:
     3.1 --- a/memtest/stuff/pack	Sun May 07 20:44:37 2017 +0200
     3.2 +++ b/memtest/stuff/pack	Sun May 07 21:49:40 2017 +0200
     3.3 @@ -60,7 +60,6 @@
     3.4  	store $syssize $2 500
     3.5  	store 4 $2 497 1
     3.6  	store $((($size+511)/512)) $2 4
     3.7 -	store $((($size+15)/16+0x9E0)) $2 10
     3.8  	store $((($size+15)/16)) $2 14
     3.9  	echo -e "$3" | dd conv=notrunc bs=1 seek=YYY of=$2 count=ZZZ
    3.10  }