wok-current rev 19863

syslinux/bootiso.S: remove VCPI code (duplicate/tazboot)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Mar 26 15:53:23 2017 +0200 (2017-03-26)
parents 28e3408ee722
children 4888cf6f4513
files syslinux/stuff/iso2exe/bootiso.S
line diff
     1.1 --- a/syslinux/stuff/iso2exe/bootiso.S	Sun Mar 26 00:07:11 2017 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/bootiso.S	Sun Mar 26 15:53:23 2017 +0200
     1.3 @@ -177,7 +177,7 @@
     1.4  	ret
     1.5  	.org	0x7E00
     1.6  
     1.7 -	.org	0x7F4E
     1.8 +	.org	0x7F85
     1.9  ////////////////////////////// DOS EXE code ///////////////////////////////////
    1.10  
    1.11  exestart:
    1.12 @@ -209,17 +209,17 @@
    1.13  is386:
    1.14  	smsww	%ax			// not privileged
    1.15  	andb	$1, %al
    1.16 -	movw	$10, %si
    1.17 -	jne	tstvcpi
    1.18 +	movb	$EXESTR(vm86modemsg), %al
    1.19 +	jne	isvm86
    1.20  	movl	%cr0, %eax		// privileged
    1.21  	incl	%eax
    1.22 +	.arch	i8086
    1.23  	movb	$EXESTR(rmPaging), %al
    1.24  	js	abort
    1.25  	inc	%ax
    1.26  	//movb	$EXESTR(realmodemsg), %al
    1.27 -realmode:
    1.28 +isvm86:
    1.29  	call	goputs
    1.30 -	.arch	i8086
    1.31  is86:
    1.32  	movw	comstart-end_header(%di), %si		// .com address
    1.33  	pushw	%di
    1.34 @@ -228,50 +228,10 @@
    1.35  	movsw
    1.36  	ret
    1.37  
    1.38 -	.arch	i486
    1.39 -CallVCPI:
    1.40 -	int	$0x67
    1.41 -	testb	%ah, %ah
    1.42 -	xchgw	%ax, %cx
    1.43 -	pushw	%si
    1.44 -ScanVCPI:
    1.45 -	popw	%si
    1.46 -ChkVCPI:
    1.47 -NoVCPI:
    1.48 -	movb	$EXESTR(ERRvcpi), %al
    1.49 -	jne	abort
    1.50 -	lodsb
    1.51 -	shlw	$8, %ax
    1.52 -	jne	CallVCPI
    1.53 -VersionVCPI:
    1.54 -	xchgw	%ax, %si		// movb	$EXESTR(vm86modemsg), %al
    1.55 -	cmpb	$0x40, %cl		// EMM386 / VCPI 4.0 mini
    1.56 -	jnc	realmode		// %si = 0
    1.57 -tstvcpi:
    1.58 -	pushw	%ds
    1.59 -	movw	%si, %ds		// %si = 10
    1.60 -	movw	(0x67*4)+2-(16*10)-0x100(%di), %ds
    1.61 -	lodsw
    1.62 -	xorw	$0x4D45, %ax		// EM(MX) or EM(MQ)
    1.63 -	lodsw
    1.64 -	lodsw
    1.65 -	popw	%ds
    1.66 -	jne	NoVCPI
    1.67 -	xorw	$0x5858, %ax		// XX(X0)
    1.68 -	call	ScanVCPI
    1.69 -CmdVCPI:
    1.70 -	.byte	0x40			// status
    1.71 -	.byte	0xDE			// vcpi present ?
    1.72 -	.byte	0x46			// version
    1.73 -	.byte	0
    1.74 -
    1.75  vm86modemsg:
    1.76  // --------------- Must be in 7F40 7FFF range ------------------------
    1.77  	.ascii	"86"			// 86 mode
    1.78  	.byte	EXESTR(mode)
    1.79 -ERRvcpi:
    1.80 -	.ascii	"VCPI4"			// VCPI4?
    1.81 -	.byte	EXESTR(need)
    1.82  rmPaging:
    1.83  	.ascii	"X"			// Xreal mode
    1.84  realmodemsg: