wok diff BootProg/stuff/boot32.asm @ rev 25486
debootstrap: update wget_url
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Nov 04 08:52:47 2022 +0000 (19 months ago) |
parents | 2155b2665e26 |
children | f40d97a52c42 |
line diff
1.1 --- a/BootProg/stuff/boot32.asm Tue Nov 01 16:13:12 2022 +0000 1.2 +++ b/BootProg/stuff/boot32.asm Fri Nov 04 08:52:47 2022 +0000 1.3 @@ -195,11 +195,18 @@ 1.4 ;; Jump to the copy ;; 1.5 ;;;;;;;;;;;;;;;;;;;;;; 1.6 1.7 +%if ExtraBootSector != 0 1.8 + push word main 1.9 +%else 1.10 push byte main 1.11 +%endif 1.12 push es 1.13 pop ds 1.14 retf 1.15 1.16 +%if ExtraBootSector != 0 1.17 +%macro MovedCode 0 1.18 +%endif 1.19 main: 1.20 xor ebx, ebx 1.21 %if ExtraBootSector != 0 1.22 @@ -321,11 +328,10 @@ 1.23 mov ss, bp 1.24 xor sp, sp 1.25 push bp ; cs, ds and es 1.26 + jmp short Run 1.27 %if ExtraBootSector != 0 1.28 - jmp Run 1.29 +%endm 1.30 %macro BootFileName 0 1.31 -%else 1.32 - jmp short Run 1.33 %endif 1.34 1.35 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1.36 @@ -590,6 +596,10 @@ 1.37 popa 1.38 ret 1.39 1.40 +%if ExtraBootSector != 0 1.41 + MovedCode 1.42 +%endif 1.43 + 1.44 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1.45 ;; Fill free space with zeroes ;; 1.46 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;