# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1472888919 -7200
# Node ID ebf8313df61ffbcc50f08985bcef42e33cc62f52
# Parent  80800de950ff4cb75bb60a217597f83af8221de4
memtest: DOS shutdown

diff -r 80800de950ff -r ebf8313df61f memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Fri Sep 02 16:17:00 2016 +0200
+++ b/memtest/stuff/bootloader.S	Sat Sep 03 09:48:39 2016 +0200
@@ -8,20 +8,21 @@
 	.globl	_start
 _start:
 
-#define CODESZ 512
+#define CODESZ 512		/* patched by installer */
 
 /* some extra features */
 #define EXE_SUPPORT		real mode dos .exe file support
 #define CMDLINE	0x9E00
 #define HELP			store help message for /? argument
 #define CHECK_REALMODE		does not support vm86
+#define SHUTDOWNDOS		shutdown DOS services
 
 /* some contraints to reduce the size */
 //#define FLOPPY_1440K_ONLY	1.44M floppies support only
 #define NO_CURSOR_DEFINITION
 
 #ifdef EXE_SUPPORT
-#define EXEADRS(x)	x+0xE0
+#define EXEADRS(x)	(x+0xE0)
 stacktop	= 0x9E00		# in 0x8000 .. 0xA000
 	decw	%bp			// Magic number: MZ
 	popw	%dx
@@ -105,7 +106,24 @@
 	movw	$end_header, %di
 	rep
 	  movsw
+#ifndef SHUTDOWNDOS
 	ljmp	$INITSEG, $movesys
+#else
+	pushaw
+	pushw	%es
+	xorw	%si, %si
+	movw	%si, %ds		# %ds = 0
+	pushl	4(%si)
+	movw	%sp, %es:loadsp19+1(%si)
+	movw	$step19, 4(%si)
+	movw	%es, 6(%si)
+	pushfw
+	popw	%ax
+	incb	%ah			# set TF
+	pushw	%ax
+	popfw
+	ljmp	*4*0x19(%si)
+#endif
 start:
 	pushw	%dx
 #else
@@ -207,6 +225,27 @@
 	int	$0x20			// dos exit
 #endif
 #ifdef EXE_SUPPORT
+#ifdef SHUTDOWNDOS
+doiret:
+	iret
+step19:
+	pushw	%si
+	pushw	%ds
+	movw	%sp, %si
+	ldsw	%ss:4(%si), %si
+	cmpw	$0x19CD, (%si)
+	popw    %ds
+	popw    %si
+	jne	doiret
+	xorw	%si, %si
+	mov	%si, %ds
+	popl	4*0x19(%si)
+loadsp19:
+	movw	$0, %sp
+	popl	4(%si)
+	popw	%es
+	popaw
+#endif
 movesys:				// %ax = SYSSEG
 	pushw	%es
 	popw	%ss
diff -r 80800de950ff -r ebf8313df61f memtest/stuff/pack
--- a/memtest/stuff/pack	Fri Sep 02 16:17:00 2016 +0200
+++ b/memtest/stuff/pack	Sat Sep 03 09:48:39 2016 +0200
@@ -55,8 +55,7 @@
 }
 
 HELP="$(unix2dos <<EOT
-Memtest86+ VERSION is an endless advanced memory diagnostic tool released under
-the terms of the free Gnu Public License (GPL).
+Memtest86+ VERSION is an endless advanced memory diagnostic tool (GPL).
 
 EOT
 )"
diff -r 80800de950ff -r ebf8313df61f memtest/stuff/unpack.S
--- a/memtest/stuff/unpack.S	Fri Sep 02 16:17:00 2016 +0200
+++ b/memtest/stuff/unpack.S	Sat Sep 03 09:48:39 2016 +0200
@@ -10,7 +10,6 @@
 #define HARDCODED_SYSSIZE	1
 #define HARDCODED_SETUPSIZE	1
 #define HARDCODED_IP		1
-#define SHUTDOWNDOS		0
 #define FLAT16			1
 //#define FLAT16OUT		0
 
@@ -45,40 +44,6 @@
 getip:
 #endif
 	pushal
-#if SHUTDOWNDOS
-	xorw	%si, %si
-        movw	%si, %ds		# %ds = 0
-	pushl	4(%si)
-	movw	%sp, %cs:loadsp19+1(%si)
-	cmpb	$0xF0, 7(%si)
-	jnb	notdos
-        movw	$step19, 4(%si)
-        movw	%cs, 6(%si)
-        pushfw
-        popw	%ax
-        incb	%ah			# set TF
-        pushw	%ax
-        popfw
-        ljmp	*4*0x19(%si)
-step19:
-        pushw	%si
-        pushw	%ds
-        movw	%sp, %si
-        ldsw	%ss:4(%si), %si
-        cmpw	$0x19CD, (%si)
-        popw    %ds
-        popw    %si
-	jne	doiret
-	xorw	%si, %si
-	mov	%si, %ds
-	popl	4*0x19(%si)
-notdos:
-loadsp19:
-	movw	$0, %sp
-	popl	4(%si)
-	pushw	%ss
-	popw	%ds
-#endif
 #if !FLAT16
 #undef FLAT16
 #if HARDCODED_SYSSIZE