wok diff linld/stuff/src/HIMEM.CPP @ rev 24034

Openssh (8.5p1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Apr 08 09:21:26 2021 +0000 (2021-04-08)
parents 61df94a0fa43
children
line diff
     1.1 --- a/linld/stuff/src/HIMEM.CPP	Sun Feb 28 16:32:57 2021 +0000
     1.2 +++ b/linld/stuff/src/HIMEM.CPP	Thu Apr 08 09:21:26 2021 +0000
     1.3 @@ -59,6 +59,7 @@
     1.4  	pushf
     1.5  	;cli
     1.6  	push	ds
     1.7 +	push	es
     1.8  	push	cs
     1.9  	pop	ds
    1.10  # ifdef NO386
    1.11 @@ -88,11 +89,12 @@
    1.12          // Move initrd
    1.13          memcpy_image_initrd();
    1.14  #ifdef VCPI
    1.15 -    } else { //vcpi
    1.16 +    } else { //vcpi	FIXME: LARGE_ZIMAGE case
    1.17  #if defined(__BORLANDC__) && defined(NO386)
    1.18  #pragma option -3
    1.19  	asm{
    1.20  		.386p
    1.21 +		pushad
    1.22  	}
    1.23  #endif
    1.24          // Move kernel
    1.25 @@ -125,6 +127,9 @@
    1.26                  memcpy_image_initrd();
    1.27              } while(q != m[INITRD].bufv);
    1.28          }
    1.29 +	asm{
    1.30 +		popad
    1.31 +        }
    1.32      }
    1.33  #endif
    1.34      asm {
    1.35 @@ -136,6 +141,7 @@
    1.36  # else
    1.37  	popa
    1.38  # endif
    1.39 +	pop	es
    1.40  	pop	ds
    1.41  	popf
    1.42      }