wok diff linld/stuff/src/MEMCPY32.ASM @ rev 24019

syslinux: fix build
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 28 16:32:57 2021 +0000 (2021-02-28)
parents c1844f1c4954
children 217c02cbbe8d
line diff
     1.1 --- a/linld/stuff/src/MEMCPY32.ASM	Fri Feb 19 18:33:17 2021 +0000
     1.2 +++ b/linld/stuff/src/MEMCPY32.ASM	Sun Feb 28 16:32:57 2021 +0000
     1.3 @@ -6,6 +6,9 @@
     1.4                  %crefref
     1.5                  %noincl
     1.6                  %nomacs
     1.7 +
     1.8 +	include	"common.inc"
     1.9 +
    1.10  		ifdef	NO386
    1.11                  p8086
    1.12  		else
    1.13 @@ -144,6 +147,7 @@
    1.14                  mov     ecx,[sz]
    1.15                  jecxz   @@done
    1.16  
    1.17 +		ifdef	VCPI
    1.18  		smsw	ax
    1.19                  and     al,1	;MSW_PE
    1.20  		jz	@@real_mode
    1.21 @@ -152,6 +156,7 @@
    1.22  		extrn	vcpi_pm_copy_routine:near
    1.23                  call    near vcpi_pm_copy_routine ; Call pm copy routine via vcpi pm
    1.24  		jmp	@@done
    1.25 +		endif
    1.26  @@real_mode:
    1.27                  cli
    1.28  oldGDTR		=	(pword srcseg)	; don't need src seg/ofs anymore
    1.29 @@ -206,7 +211,19 @@
    1.30  
    1.31  ;****** Const data *********************************************
    1.32  
    1.33 +		ifdef	VCPI
    1.34  		extrn	gdt_memcpy
    1.35 +		else
    1.36 +		org	$-8	;save 8 bytes
    1.37 +;0000: unused
    1.38 +gdt_memcpy	dd	?,?
    1.39 +;0008: Data seg [0,FFFFFFFF]
    1.40 +		;	lim_lo              base_lo
    1.41 +		dw	1111111111111111b,  0000000000000000b
    1.42 +		db	00000000b,10010010b,10001111b,00000000b
    1.43 +		;	base_med  P  S D A  G ??l_hi  base_hi
    1.44 +		;	           Pl E W    D
    1.45 +		endif
    1.46  label	GDTR	pword
    1.47  gdt_limit	dw	0ffffh
    1.48  		global	gdt_base_memcpy:word