wok-current rev 24957

*/stuff/bootloader.S: add CHK_DOS_INT19 (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Apr 23 15:41:59 2022 +0000 (2022-04-23)
parents 7d28303d3371
children 293d53cefa7b
files ipxe/stuff/bootloader.S memtest/stuff/bootloader.S plop/stuff/bootloader.S
line diff
     1.1 --- a/ipxe/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
     1.2 +++ b/ipxe/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
     1.3 @@ -78,9 +78,8 @@
     1.4  # ifdef CHK_DOS_INT19
     1.5  	cmpb	$0xF0, 4*0x19+3(%si)
     1.6  	jne	stepit
     1.7 -	popaw
     1.8  	pushw	%es
     1.9 -	movw	$movesys, %si
    1.10 +	movw	$skip_step19, %si
    1.11  	pushw	%si
    1.12  	retf
    1.13  stepit:
    1.14 @@ -96,9 +95,8 @@
    1.15  # ifdef CHK_DOS_INT19
    1.16  	cmpb	$0xF0, 4*0x19+3-4(%si)
    1.17  	jne	stepit
    1.18 -	popaw
    1.19  	pushw	%es
    1.20 -	pushw	$movesys
    1.21 +	pushw	$skip_step19
    1.22  	retf
    1.23  stepit:
    1.24  # endif
    1.25 @@ -301,6 +299,7 @@
    1.26  #ifdef ONLY8086
    1.27  	popw	4(%si)
    1.28  	popw	4+2(%si)
    1.29 +skip_step19:
    1.30  	popw	%bp
    1.31  	popw	%di
    1.32  	popw	%si
    1.33 @@ -310,6 +309,7 @@
    1.34  	popw	%ax
    1.35  #else
    1.36  	popl	4(%si)
    1.37 +skip_step19:
    1.38  	popaw
    1.39  #endif
    1.40  #ifdef BZIMAGE
     2.1 --- a/memtest/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
     2.2 +++ b/memtest/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
     2.3 @@ -78,9 +78,8 @@
     2.4  # ifdef CHK_DOS_INT19
     2.5  	cmpb	$0xF0, 4*0x19+3(%si)
     2.6  	jne	stepit
     2.7 -	popaw
     2.8  	pushw	%es
     2.9 -	movw	$movesys, %si
    2.10 +	movw	$skip_step19, %si
    2.11  	pushw	%si
    2.12  	retf
    2.13  stepit:
    2.14 @@ -96,9 +95,8 @@
    2.15  # ifdef CHK_DOS_INT19
    2.16  	cmpb	$0xF0, 4*0x19+3-4(%si)
    2.17  	jne	stepit
    2.18 -	popaw
    2.19  	pushw	%es
    2.20 -	pushw	$movesys
    2.21 +	pushw	$skip_step19
    2.22  	retf
    2.23  stepit:
    2.24  # endif
    2.25 @@ -301,6 +299,7 @@
    2.26  #ifdef ONLY8086
    2.27  	popw	4(%si)
    2.28  	popw	4+2(%si)
    2.29 +skip_step19:
    2.30  	popw	%bp
    2.31  	popw	%di
    2.32  	popw	%si
    2.33 @@ -310,6 +309,7 @@
    2.34  	popw	%ax
    2.35  #else
    2.36  	popl	4(%si)
    2.37 +skip_step19:
    2.38  	popaw
    2.39  #endif
    2.40  #ifdef BZIMAGE
     3.1 --- a/plop/stuff/bootloader.S	Sat Apr 23 16:35:24 2022 +0100
     3.2 +++ b/plop/stuff/bootloader.S	Sat Apr 23 15:41:59 2022 +0000
     3.3 @@ -78,9 +78,8 @@
     3.4  # ifdef CHK_DOS_INT19
     3.5  	cmpb	$0xF0, 4*0x19+3(%si)
     3.6  	jne	stepit
     3.7 -	popaw
     3.8  	pushw	%es
     3.9 -	movw	$movesys, %si
    3.10 +	movw	$skip_step19, %si
    3.11  	pushw	%si
    3.12  	retf
    3.13  stepit:
    3.14 @@ -96,9 +95,8 @@
    3.15  # ifdef CHK_DOS_INT19
    3.16  	cmpb	$0xF0, 4*0x19+3-4(%si)
    3.17  	jne	stepit
    3.18 -	popaw
    3.19  	pushw	%es
    3.20 -	pushw	$movesys
    3.21 +	pushw	$skip_step19
    3.22  	retf
    3.23  stepit:
    3.24  # endif
    3.25 @@ -301,6 +299,7 @@
    3.26  #ifdef ONLY8086
    3.27  	popw	4(%si)
    3.28  	popw	4+2(%si)
    3.29 +skip_step19:
    3.30  	popw	%bp
    3.31  	popw	%di
    3.32  	popw	%si
    3.33 @@ -310,6 +309,7 @@
    3.34  	popw	%ax
    3.35  #else
    3.36  	popl	4(%si)
    3.37 +skip_step19:
    3.38  	popaw
    3.39  #endif
    3.40  #ifdef BZIMAGE