wok diff linld/stuff/src/A20.ASM @ rev 22312
get-LibreOffice: look for available versions
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Nov 14 10:49:19 2019 +0100 (2019-11-14) |
parents | 664d83fb04f9 |
children | 08c52f1e528e |
line diff
1.1 --- a/linld/stuff/src/A20.ASM Wed Nov 13 15:08:02 2019 +0100 1.2 +++ b/linld/stuff/src/A20.ASM Thu Nov 14 10:49:19 2019 +0100 1.3 @@ -96,11 +96,11 @@ 1.4 include "himem.inc" 1.5 1.6 ;*************************************************************** 1.7 -;_fastcall void moverm(bx:struct himem *m); 1.8 +;_fastcall void moverm(bx:u16 *p); 1.9 ;*************************************************************** 1.10 1.11 - global @moverm$qp11image_himem:near 1.12 -@moverm$qp11image_himem: 1.13 + global @moverm$qpus:near 1.14 +@moverm$qpus: 1.15 push si di 1.16 xor di,di 1.17 extrn _heap_top:word 1.18 @@ -129,13 +129,13 @@ 1.19 inc ax 1.20 extrn N_LXLSH@4:near 1.21 call N_LXLSH@4 1.22 - mov [word ((image_himem bx).fallback)],ax 1.23 - mov [word ((image_himem bx).fallback)+2],dx 1.24 - add ax,[word ((image_himem bx).size)] 1.25 - adc dx,[word ((image_himem bx).size)+2] 1.26 + mov [word ((image_himem bx+4).fallback)],ax 1.27 + mov [word ((image_himem bx+4).fallback)+2],dx 1.28 + add ax,[word ((image_himem bx+4).size)] 1.29 + adc dx,[word ((image_himem bx+4).size)+2] 1.30 ifdef MOVE_SETUP 1.31 mov di,8000h 1.32 - sub di,[bx-4] ; rm size 1.33 + sub di,[bx] ; rm_size 1.34 extrn _rm_offset:word 1.35 mov [_rm_offset],di 1.36 sub ax,di ; -rm_offset 1.37 @@ -168,11 +168,11 @@ 1.38 @sys@ok: 1.39 inc ax 1.40 shl eax,4 1.41 - mov [(image_himem bx).fallback],eax 1.42 - add eax,[(image_himem bx).size] 1.43 + mov [(image_himem bx+4).fallback],eax 1.44 + add eax,[(image_himem bx+4).size] 1.45 ifdef MOVE_SETUP 1.46 mov di,8000h 1.47 - sub di,[bx-4] ; rm size 1.48 + sub di,[bx] ; rm_size 1.49 extrn _rm_offset:word 1.50 mov [_rm_offset],di 1.51 movzx ecx,di ; -rm_offset 1.52 @@ -188,8 +188,8 @@ 1.53 endif 1.54 add dh,ch ; room for malloc_bufv_or_die 1.55 cmp ax,dx 1.56 - les cx,[bx-4] ; rm size 1.57 - mov si,es ; rm data 1.58 + les cx,[bx] ; rm_size 1.59 + mov si,es ; rm_buf 1.60 @jbe_overflow: 1.61 ; Oops! We can stomp on our toes... better stop now 1.62 mov bx,offset overflow