wok rev 23980
linld: fix isoboot/cpuhaslm
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Nov 20 11:26:49 2020 +0000 (2020-11-20) |
parents | 84337bb7d849 |
children | 643fcf173228 |
files | linld/stuff/src/ISOCRTL.ASM linld/stuff/src/_BEG.ASM |
line diff
1.1 --- a/linld/stuff/src/ISOCRTL.ASM Wed Nov 18 09:50:51 2020 +0000 1.2 +++ b/linld/stuff/src/ISOCRTL.ASM Fri Nov 20 11:26:49 2020 +0000 1.3 @@ -46,17 +46,17 @@ 1.4 mov di,128h ; TABLE 1.5 mov ax,offset iso_open_hack 1.6 stosw 1.7 - mov ax,offset iso_read_hack 1.8 + mov al,offset iso_read_hack-0F000h 1.9 stosw 1.10 - mov ax,offset iso_lseek_hack 1.11 + mov al,offset iso_lseek_hack-0F000h 1.12 stosw 1.13 - mov ax,offset iso_close_hack 1.14 + mov al,offset iso_close_hack-0F000h 1.15 stosw 1.16 -; mov ax,offset iso_cleanup_hack 1.17 +; mov al,offset iso_cleanup_hack-0F000h 1.18 ; stosw 1.19 global @_cpuhaslm$qv:near 1.20 @_cpuhaslm$qv: 1.21 - mov ax,[132h] 1.22 + mov ax,[132h+3] 1.23 and al,20h 1.24 ret 1.25
2.1 --- a/linld/stuff/src/_BEG.ASM Wed Nov 18 09:50:51 2020 +0000 2.2 +++ b/linld/stuff/src/_BEG.ASM Fri Nov 20 11:26:49 2020 +0000 2.3 @@ -32,6 +32,7 @@ 2.4 global _bss_start:byte 2.5 label _bss_start byte 2.6 global stktop:byte 2.7 + ifndef ISOHOOK 2.8 ifdef NO386 2.9 global _cpu386:byte 2.10 _cpu386 db ? 2.11 @@ -39,6 +40,7 @@ 2.12 endif 2.13 global _cpu_features:dword 2.14 _cpu_features dd ? 2.15 + endif 2.16 ends _BSS 2.17 2.18 segment _TEXT byte public use16 'CODE' 2.19 @@ -115,7 +117,13 @@ 2.20 iso_close_hack dw @ret 2.21 global iso_cleanup_hack 2.22 iso_cleanup_hack dw @ret 2.23 - dw _cpu_features+3 2.24 + global _cpu_features:dword 2.25 +_cpu_features dd ? ; default _cpu_features+3=1Fh/8Eh (bit5=0, not 64bits) 2.26 + org $-4 2.27 + ifdef NO386 2.28 + global _cpu386:byte 2.29 +_cpu386 db 0 2.30 + endif 2.31 endif 2.32 2.33 ;***************************************************************