wok diff linld/stuff/src/_BEG.ASM @ rev 24023

syslinux/taziso: 5in1 support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 15 20:49:46 2021 +0000 (2021-03-15)
parents 217c02cbbe8d
children 6b6d14c9f7e9
line diff
     1.1 --- a/linld/stuff/src/_BEG.ASM	Sun Mar 14 19:55:20 2021 +0000
     1.2 +++ b/linld/stuff/src/_BEG.ASM	Mon Mar 15 20:49:46 2021 +0000
     1.3 @@ -32,13 +32,10 @@
     1.4  img_initrd	image_himem	?
     1.5  	endm
     1.6  
     1.7 -	macro	alloc_misc
     1.8 +	macro	alloc_cmdnum
     1.9  		global	_cmdnum:word
    1.10  label   _cmdnum	word
    1.11  		dd	CMDNUMCNT	dup(?)
    1.12 -
    1.13 -		global	_himem_buf:dword
    1.14 -_himem_buf	dd	?
    1.15  	endm
    1.16  
    1.17                  p8086
    1.18 @@ -102,7 +99,7 @@
    1.19  		alloc_image
    1.20  		endif
    1.21  
    1.22 -		alloc_misc
    1.23 +		alloc_cmdnum
    1.24  
    1.25  		endif
    1.26  
    1.27 @@ -263,15 +260,17 @@
    1.28  
    1.29  ;***************************************************************
    1.30  
    1.31 +		org	$-4				; _himem_buf
    1.32 +
    1.33  		ifdef	BSS_OVERLAP_BOOT
    1.34  		mov	al,0
    1.35  		mov	di,100h
    1.36  		mov	cx,offset clean-100h
    1.37  
    1.38 -		org	$-(CMDNUMCNT*4)-4
    1.39 +		org	$-(CMDNUMCNT*4)			; alloc_cmdnum
    1.40  
    1.41  		ifdef	room_for_image
    1.42 -		org	$-2-2-(2*size image_himem)
    1.43 +		org	$-2-2-(2*size image_himem)	; alloc_image
    1.44  		endif
    1.45  
    1.46  		ifdef	room_for_isostate
    1.47 @@ -283,7 +282,13 @@
    1.48  		alloc_image
    1.49  		endif
    1.50  
    1.51 -		alloc_misc
    1.52 +		alloc_cmdnum
    1.53 +		endif
    1.54 +
    1.55 +		global	_himem_buf:dword
    1.56 +_himem_buf	dd	?
    1.57 +
    1.58 +		ifdef	BSS_OVERLAP_BOOT
    1.59  clean:
    1.60  		rep
    1.61  		  stosb