wok diff syslinux/stuff/iso2exe/bootiso.S @ rev 18789

Add opencv (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 05 11:03:10 2016 +0100 (2016-01-05)
parents 6a2e6eb35735
children 73cdd2cf47c4
line diff
     1.1 --- a/syslinux/stuff/iso2exe/bootiso.S	Sat Mar 21 11:15:53 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/bootiso.S	Tue Jan 05 11:03:10 2016 +0100
     1.3 @@ -75,7 +75,7 @@
     1.4  	cmpw	(%bx), %cx
     1.5  	jnc	puts			// read fail or no isohydrid boot sector
     1.6  	popw	%es
     1.7 -	popa
     1.8 +	popa				// isolinux boot needs %es:%di and %dx
     1.9  putsret:
    1.10  	ret
    1.11  
    1.12 @@ -140,25 +140,25 @@
    1.13  	jmp	puts
    1.14  
    1.15  tst386:
    1.16 -	pushfw			// save flags
    1.17 +	pushfw				// save flags
    1.18  		// bits  15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
    1.19  		// flags  0 NT  IOPL OF DF IF TF SF ZF  0 AF  0 PF  1 CF
    1.20  	// movb	$0x10, %ah
    1.21  	pushw	%ax
    1.22 -	popfw			// < 286 : flags[12..15] are forced 1
    1.23 -	pushfw			// = 286 : flags[12..15] are forced 0
    1.24 -	popw	%bx		// > 286 : only flags[15] is forced 0
    1.25 -	popfw			// restore flags (IOPL)
    1.26 -	addb	%ah, %bh	// test F0 and 00 cases
    1.27 +	popfw				// < 286 : flags[12..15] are forced 1
    1.28 +	pushfw				// = 286 : flags[12..15] are forced 0
    1.29 +	popw	%bx			// > 286 : only flags[15] is forced 0
    1.30 +	popfw				// restore flags (IOPL)
    1.31 +	addb	%ah, %bh		// test F0 and 00 cases
    1.32  	cmpb	%ah, %bh
    1.33  	movw	$0x100, %di
    1.34 -	jbe	is86		// C=8086/80186, Z=80286
    1.35 +	jbe	is86			// C=8086/80186, Z=80286
    1.36  is386:
    1.37 -	smsww	%ax		// not privileged
    1.38 +	smsww	%ax			// not privileged
    1.39  	andb	$1, %al
    1.40  	movw	$10, %si
    1.41  	jne	tstvcpi
    1.42 -	movl	%cr0, %eax	// privileged
    1.43 +	movl	%cr0, %eax		// privileged
    1.44  	incl	%eax
    1.45  	movb	$EXESTR(rmPaging), %al
    1.46  	js	abort
    1.47 @@ -169,7 +169,7 @@
    1.48  is86:
    1.49  	movw	comstart-end_header(%di), %si		// .com address
    1.50  	pushw	%di
    1.51 -	movb	$0x7C/2, %ch	// 31K-31.5K, > com length
    1.52 +	movb	$0x7C/2, %ch		// 31K-31.5K, > com length
    1.53  	rep
    1.54  	movsw
    1.55  	ret