wok diff linld/stuff/src/JUMP.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 | bc4b94310a29 |
children | 217c02cbbe8d |
line diff
1.1 --- a/linld/stuff/src/JUMP.ASM Thu Feb 18 08:56:43 2021 +0000 1.2 +++ b/linld/stuff/src/JUMP.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 @@ -107,11 +110,16 @@ 1.14 pop ss 1.15 mov sp,di 1.16 1.17 + ifdef LINUX001 1.18 mov dx,2000h 1.19 global _csip_hilo:word 1.20 org $-2 1.21 _csip_hilo dw ? 1.22 xchg al,dh ; 9020 / 9000 1.23 + else 1.24 + mov al,20h ; 9020:0 1.25 + xor dx,dx 1.26 + endif 1.27 push ax 1.28 push dx ; 0000 / 0042 1.29 1.30 @@ -120,18 +128,27 @@ 1.31 global _pm_low:byte 1.32 _pm_low db ? 1.33 push cx 1.34 + ifdef IPXE 1.35 mov ax,[word ss:024Ch] 1.36 xor ax,2b30h ; ipxe ? 1.37 loopne @@notipxe 1.38 + else 1.39 + loop @@truebzimage 1.40 + endif 1.41 1.42 ; finish loading 1.43 extrn @last_ditch$qv:near 1.44 push cs 1.45 call @last_ditch$qv 1.46 + ifdef SHUTDOWN 1.47 dos_shutdown ; clear si; ds=0; kill VCPI 1.48 push cs 1.49 pop ds 1.50 + else 1.51 + xor si,si 1.52 + endif 1.53 1.54 +@@truebzimage: 1.55 @@notipxe: 1.56 pop cx 1.57 loop @@isbzimage 1.58 @@ -174,7 +191,16 @@ 1.59 pop es 1.60 push es 1.61 1.62 + ifdef ELKS 1.63 call near @@movsb@jmp ; movsb; pop cs ; ds=es=ss 1.64 + elseifdef MOVE_SETUP 1.65 + call near @@movsb@jmp ; movsb; pop cs ; ds=es=ss 1.66 + else 1.67 + xor di,di 1.68 + rep 1.69 + movsb 1.70 + call near @@isbzimage ; movsb; pop cs ; ds=es=ss 1.71 + endif 1.72 1.73 extrn memcpy32:near 1.74 call memcpy32 1.75 @@ -191,7 +217,7 @@ 1.76 ; movsb 1.77 endif 1.78 1.79 - ifndef noelks 1.80 + ifdef ELKS 1.81 ifdef MOVE_SETUP 1.82 ifndef NO386 1.83 mov eax,[dword si+1E6h] 1.84 @@ -232,7 +258,7 @@ 1.85 rep 1.86 movsb 1.87 else 1.88 - ifndef noelks 1.89 + ifdef ELKS 1.90 xchg ax,si 1.91 mov ch,7Eh ; 0Ah min, 7Eh max 1.92 @@movsb@jmp: 1.93 @@ -257,7 +283,9 @@ 1.94 assume cs:DGROUP 1.95 retf 1.96 1.97 + ifdef SHUTDOWN 1.98 step19code 1.99 + endif 1.100 1.101 endp _boot_kernel 1.102