# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1650728519 0
# Node ID 50e835d951d82c0402832cdb3bcc6364412ed4d8
# Parent  7d28303d3371342410c9799d7855c552dcaacd0c
*/stuff/bootloader.S: add CHK_DOS_INT19 (again)

diff -r 7d28303d3371 -r 50e835d951d8 ipxe/stuff/bootloader.S
--- a/ipxe/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
+++ b/ipxe/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
@@ -78,9 +78,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	movw	$movesys, %si
+	movw	$skip_step19, %si
 	pushw	%si
 	retf
 stepit:
@@ -96,9 +95,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3-4(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	pushw	$movesys
+	pushw	$skip_step19
 	retf
 stepit:
 # endif
@@ -301,6 +299,7 @@
 #ifdef ONLY8086
 	popw	4(%si)
 	popw	4+2(%si)
+skip_step19:
 	popw	%bp
 	popw	%di
 	popw	%si
@@ -310,6 +309,7 @@
 	popw	%ax
 #else
 	popl	4(%si)
+skip_step19:
 	popaw
 #endif
 #ifdef BZIMAGE
diff -r 7d28303d3371 -r 50e835d951d8 memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
+++ b/memtest/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
@@ -78,9 +78,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	movw	$movesys, %si
+	movw	$skip_step19, %si
 	pushw	%si
 	retf
 stepit:
@@ -96,9 +95,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3-4(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	pushw	$movesys
+	pushw	$skip_step19
 	retf
 stepit:
 # endif
@@ -301,6 +299,7 @@
 #ifdef ONLY8086
 	popw	4(%si)
 	popw	4+2(%si)
+skip_step19:
 	popw	%bp
 	popw	%di
 	popw	%si
@@ -310,6 +309,7 @@
 	popw	%ax
 #else
 	popl	4(%si)
+skip_step19:
 	popaw
 #endif
 #ifdef BZIMAGE
diff -r 7d28303d3371 -r 50e835d951d8 plop/stuff/bootloader.S
--- a/plop/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
+++ b/plop/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
@@ -78,9 +78,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	movw	$movesys, %si
+	movw	$skip_step19, %si
 	pushw	%si
 	retf
 stepit:
@@ -96,9 +95,8 @@
 # ifdef CHK_DOS_INT19
 	cmpb	$0xF0, 4*0x19+3-4(%si)
 	jne	stepit
-	popaw
 	pushw	%es
-	pushw	$movesys
+	pushw	$skip_step19
 	retf
 stepit:
 # endif
@@ -301,6 +299,7 @@
 #ifdef ONLY8086
 	popw	4(%si)
 	popw	4+2(%si)
+skip_step19:
 	popw	%bp
 	popw	%di
 	popw	%si
@@ -310,6 +309,7 @@
 	popw	%ax
 #else
 	popl	4(%si)
+skip_step19:
 	popaw
 #endif
 #ifdef BZIMAGE