# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1494186580 -7200
# Node ID 9ca81337dc6ee55afd298040f8748edce6047791
# Parent  d271048cbf11eacf2f2173785a0ecdccc305342b
memtest: add @cmdlinefile support

diff -r d271048cbf11 -r 9ca81337dc6e azpainter/receipt
--- a/azpainter/receipt	Sun May 07 20:44:37 2017 +0200
+++ b/azpainter/receipt	Sun May 07 21:49:40 2017 +0200
@@ -18,9 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+	./configure --prefix=/usr $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install-strip
 }
diff -r d271048cbf11 -r 9ca81337dc6e memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Sun May 07 20:44:37 2017 +0200
+++ b/memtest/stuff/bootloader.S	Sun May 07 21:49:40 2017 +0200
@@ -26,6 +26,7 @@
 //#define MOVE_MAX_SYSSIZE	always memcpy 512Kb		-2
 //#define NO_CURSOR_DEFINITION					-8
 //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6
+//#define NO_CMDLINE_FILE	remove @cmdline file support ?	-20
 //#define NO_DOTS		show progression dots ?		-8
 
 #ifdef EXE_SUPPORT
@@ -53,7 +54,7 @@
 	.word	(CODESZ+511)/512	// Pages in file			INSTALLER
 	.word	0			// Relocations
 	.word	(end_header-_start)/16	// Size of header in paragraphs
-	.word	(CODESZ+stacktop+15)/16	// Minimum extra paragraphs needed	INSTALLER
+	.word	4096			// Minimum extra paragraphs needed
 	.word	-1			// Maximum extra paragraphs needed
 	.word	(CODESZ+15)/16		// Initial (relative) SS value		INSTALLER
 	.word	stacktop		// Initial SP value
@@ -221,7 +222,24 @@
 	lodsb
 	cmpb	$0x20, %al
 	je	skipspace
+#  ifndef NO_CMDLINE_FILE
+	movw	%si,%dx
 	decw	%si
+	subb	$'@',%al
+	jne	notafile
+	movb	$0x3D,%ah
+	int	$0x21
+	jc	notafile
+	xchgw	%ax,%bx
+	//movw	%si,%dx		// ~320 bytes max
+	movw	$EXEADRS(notafile)-130,%cx
+	movb	$0x3F,%ah
+	int	$0x21
+	xchgw	%ax,%cx
+notafile:
+#  else
+	decw	%si
+#  endif
 # endif
 	rep
 	  movsb
@@ -475,8 +493,3 @@
 	.word	stacktop-4-16-4,INITSEG
 # endif
 #endif
-
-helpmsg:
-	.ascii	"SliTaz zImage boot"
-	.org 497
-helpend:
diff -r d271048cbf11 -r 9ca81337dc6e memtest/stuff/pack
--- a/memtest/stuff/pack	Sun May 07 20:44:37 2017 +0200
+++ b/memtest/stuff/pack	Sun May 07 21:49:40 2017 +0200
@@ -60,7 +60,6 @@
 	store $syssize $2 500
 	store 4 $2 497 1
 	store $((($size+511)/512)) $2 4
-	store $((($size+15)/16+0x9E0)) $2 10
 	store $((($size+15)/16)) $2 14
 	echo -e "$3" | dd conv=notrunc bs=1 seek=YYY of=$2 count=ZZZ
 }