wok-current rev 20630
Up firefox-official (64.0), again
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Jan 03 12:04:23 2019 +0100 (2019-01-03) |
| parents | a60e1abe3496 |
| children | 15167372e6fe |
| files | firefox-official-de/receipt firefox-official-es/receipt firefox-official-fr/receipt firefox-official-it/receipt firefox-official-pt-BR/receipt firefox-official-ru/receipt firefox-official-uk/receipt linld/stuff/src/!COMPILE.BAT linld/stuff/src/!COMPILEX.BAT linld/stuff/src/CRTL.ASM linld/stuff/src/pipehole.awk |
line diff
1.1 --- a/firefox-official-de/receipt Wed Jan 02 19:57:20 2019 -0500 1.2 +++ b/firefox-official-de/receipt Thu Jan 03 12:04:23 2019 +0100 1.3 @@ -2,7 +2,7 @@ 1.4 1.5 PACKAGE="firefox-official-de" 1.6 lang="de" 1.7 -VERSION="62.0.3" 1.8 +VERSION="64.0" 1.9 CATEGORY="network" 1.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (German language)" 1.11 MAINTAINER="al.bobylev@gmail.com"
2.1 --- a/firefox-official-es/receipt Wed Jan 02 19:57:20 2019 -0500 2.2 +++ b/firefox-official-es/receipt Thu Jan 03 12:04:23 2019 +0100 2.3 @@ -2,7 +2,7 @@ 2.4 2.5 PACKAGE="firefox-official-es" 2.6 lang="es-ES" 2.7 -VERSION="62.0.3" 2.8 +VERSION="64.0" 2.9 CATEGORY="network" 2.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (Spanish language)" 2.11 MAINTAINER="al.bobylev@gmail.com"
3.1 --- a/firefox-official-fr/receipt Wed Jan 02 19:57:20 2019 -0500 3.2 +++ b/firefox-official-fr/receipt Thu Jan 03 12:04:23 2019 +0100 3.3 @@ -2,7 +2,7 @@ 3.4 3.5 PACKAGE="firefox-official-fr" 3.6 lang="fr" 3.7 -VERSION="62.0.3" 3.8 +VERSION="64.0" 3.9 CATEGORY="network" 3.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (French language)" 3.11 MAINTAINER="al.bobylev@gmail.com"
4.1 --- a/firefox-official-it/receipt Wed Jan 02 19:57:20 2019 -0500 4.2 +++ b/firefox-official-it/receipt Thu Jan 03 12:04:23 2019 +0100 4.3 @@ -2,7 +2,7 @@ 4.4 4.5 PACKAGE="firefox-official-it" 4.6 lang="it" 4.7 -VERSION="62.0.3" 4.8 +VERSION="64.0" 4.9 CATEGORY="network" 4.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (Italian language)" 4.11 MAINTAINER="al.bobylev@gmail.com"
5.1 --- a/firefox-official-pt-BR/receipt Wed Jan 02 19:57:20 2019 -0500 5.2 +++ b/firefox-official-pt-BR/receipt Thu Jan 03 12:04:23 2019 +0100 5.3 @@ -2,7 +2,7 @@ 5.4 5.5 PACKAGE="firefox-official-pt-BR" 5.6 lang="pt-BR" 5.7 -VERSION="62.0.3" 5.8 +VERSION="64.0" 5.9 CATEGORY="network" 5.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (Portuguese (Brazil) language)" 5.11 MAINTAINER="al.bobylev@gmail.com"
6.1 --- a/firefox-official-ru/receipt Wed Jan 02 19:57:20 2019 -0500 6.2 +++ b/firefox-official-ru/receipt Thu Jan 03 12:04:23 2019 +0100 6.3 @@ -2,7 +2,7 @@ 6.4 6.5 PACKAGE="firefox-official-ru" 6.6 lang="ru" 6.7 -VERSION="62.0.3" 6.8 +VERSION="64.0" 6.9 CATEGORY="network" 6.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (Russian language)" 6.11 MAINTAINER="al.bobylev@gmail.com"
7.1 --- a/firefox-official-uk/receipt Wed Jan 02 19:57:20 2019 -0500 7.2 +++ b/firefox-official-uk/receipt Thu Jan 03 12:04:23 2019 +0100 7.3 @@ -2,7 +2,7 @@ 7.4 7.5 PACKAGE="firefox-official-uk" 7.6 lang="uk" 7.7 -VERSION="62.0.3" 7.8 +VERSION="64.0" 7.9 CATEGORY="network" 7.10 SHORT_DESC="Official Firefox build by the Mozilla foundation (Ukrainian language)" 7.11 MAINTAINER="al.bobylev@gmail.com"
8.1 --- a/linld/stuff/src/!COMPILE.BAT Wed Jan 02 19:57:20 2019 -0500 8.2 +++ b/linld/stuff/src/!COMPILE.BAT Thu Jan 03 12:04:23 2019 +0100 8.3 @@ -10,5 +10,5 @@ 8.4 mawk -f pipehole.awk LINLD.ASO > LINLD.ASM 8.5 mawk -f pipehole.awk LOAD.ASO > LOAD.ASM 8.6 mawk -f pipehole.awk HIMEM.ASO > HIMEM.ASM 8.7 -tasm /la /m /dLARGE_IMAGES *.asm > asm.log 8.8 +tasm /la /m /dLARGE_IMAGES /dLONG_FILENAME *.asm > asm.log 8.9 tlink /m /s /t @link.cmd > lnk.log
9.1 --- a/linld/stuff/src/!COMPILEX.BAT Wed Jan 02 19:57:20 2019 -0500 9.2 +++ b/linld/stuff/src/!COMPILEX.BAT Thu Jan 03 12:04:23 2019 +0100 9.3 @@ -9,5 +9,5 @@ 9.4 mawk -f pipehole.awk LOAD.ASO > LOAD.ASM 9.5 mawk -f pipehole.awk HIMEM.ASO > HIMEM.ASM 9.6 mawk -f pipehole.awk ISO9660.ASO > ISO9660.ASM 9.7 -tasm /la /m /dEXTRA /dNO386 /dLARGE_IMAGES *.asm > asm.log 9.8 +tasm /la /m /dEXTRA /dNO386 /dLARGE_IMAGES /dLONG_FILENAME *.asm > asm.log 9.9 tlink /m /s /t @linkx.cmd > lnk.log
10.1 --- a/linld/stuff/src/CRTL.ASM Wed Jan 02 19:57:20 2019 -0500 10.2 +++ b/linld/stuff/src/CRTL.ASM Thu Jan 03 12:04:23 2019 +0100 10.3 @@ -48,9 +48,9 @@ 10.4 segment _TEXT byte public use16 'CODE' 10.5 10.6 ;*************************************************************** 10.7 -;_fastcall void strcpy(const char* a, const char* b); 10.8 -;_fastcall void strcat(const char* a, const char* b); 10.9 -;_fastcall void strcatb(const char* a, const char* b); 10.10 +;_fastcall void strcpy(bx:const char* a, ax:const char* b); 10.11 +;_fastcall void strcat(bx:const char* a, ax:const char* b); 10.12 +;_fastcall void strcatb(bx:const char* a, ax:const char* b); 10.13 ;*************************************************************** 10.14 global @strcatb$qpxzct1:near 10.15 proc @strcatb$qpxzct1 near 10.16 @@ -67,19 +67,19 @@ 10.17 xor cx,cx 10.18 endif 10.19 push si 10.20 - mov si,bx ; a 10.21 - xchg ax,dx ; b 10.22 + xchg ax,bx ; b 10.23 + xchg ax,si ; a 10.24 ifdef EXTRA 10.25 jcxz @@nocat 10.26 endif 10.27 @@catlp: 10.28 - lodsb 10.29 + lodsb ; a=si 10.30 or al,al 10.31 jne @@catlp 10.32 dec si 10.33 ifdef EXTRA 10.34 - cmp dx,si 10.35 - adc al,cl ; set S when dx != si or cl = 80 10.36 + cmp bx,si 10.37 + adc al,cl ; set S when bx != si or cl = 80 10.38 mov al,20h 10.39 jns @@cpyhead 10.40 endif 10.41 @@ -104,7 +104,7 @@ 10.42 ifdef EXTRA 10.43 p8086 10.44 ;*************************************************************** 10.45 -;_fastcall char strstr(const char* a,const char* b); 10.46 +;_fastcall char strstr(bx:const char* a, ax:const char* b); 10.47 ;*************************************************************** 10.48 global @strstr$qpxzct1:near 10.49 proc @strstr$qpxzct1 near 10.50 @@ -132,7 +132,7 @@ 10.51 10.52 10.53 ;*************************************************************** 10.54 -;_fastcall int strcmp(const char* a,const char* b); 10.55 +;_fastcall int strcmp(bx:const char* a, ax:const char* b); 10.56 ;*************************************************************** 10.57 global @strcmp$qpxzct1:near 10.58 proc @strcmp$qpxzct1 near 10.59 @@ -145,7 +145,7 @@ 10.60 lodsb 10.61 sub al,[bx] 10.62 jnz @@out 10.63 - or al,al 10.64 + or al,[bx] 10.65 jnz @@lp 10.66 @@out: 10.67 cbw 10.68 @@ -157,7 +157,7 @@ 10.69 10.70 10.71 ;*************************************************************** 10.72 -;_fastcall void puts(const char* s): 10.73 +;_fastcall void puts(bx:const char* s): 10.74 ;*************************************************************** 10.75 global @puts$qpxzc:near 10.76 proc @puts$qpxzc near 10.77 @@ -181,7 +181,7 @@ 10.78 10.79 10.80 ;*************************************************************** 10.81 -;_fastcall int fileattr(const char* name); 10.82 +;_fastcall int fileattr(bx:const char* name); 10.83 ;*************************************************************** 10.84 global @fileattr$qpxzc:near 10.85 proc @fileattr$qpxzc near 10.86 @@ -195,7 +195,7 @@ 10.87 10.88 10.89 ;*************************************************************** 10.90 -;_fastcall int open(const char* name, int flags=O_RDONLY); 10.91 +;_fastcall int open(bx:const char* name, int flags=O_RDONLY); 10.92 ;*************************************************************** 10.93 global openargs:near ; openargs(bx) 10.94 openargs: 10.95 @@ -209,6 +209,18 @@ 10.96 10.97 global open:near ; open(bx) 10.98 open: 10.99 + ifdef LONG_FILENAME 10.100 + mov ax,716Ch 10.101 + push bx si di 10.102 + mov di,di ; alias hint 10.103 + mov si,bx 10.104 + xor bx,bx ; R/O 10.105 + xor cx,cx ; attributes 10.106 + cwd ; action = open 10.107 + int 21h 10.108 + pop di si bx 10.109 + jnc doret 10.110 + endif 10.111 mov ax,3d00h ; read-only+compatibility 10.112 ;mov cl,0 ; attribute mask 10.113 dos_filename: 10.114 @@ -232,7 +244,7 @@ 10.115 10.116 10.117 ;*************************************************************** 10.118 -;_fastcall int close(int fd); 10.119 +;_fastcall int close(ax:int fd); 10.120 ;*************************************************************** 10.121 global @close$qi:near 10.122 proc @close$qi near 10.123 @@ -249,8 +261,8 @@ 10.124 10.125 10.126 ;*************************************************************** 10.127 -;_fastcall int read(int fd, void* data, int sz); 10.128 -;_fastcall int write(int fd, const void* data, int sz); 10.129 +;_fastcall int read(ax:int fd, bx:void* data, dx:int sz); 10.130 +;_fastcall int write(ax:int fd, bx:const void* data, dx:int sz); 10.131 ;*************************************************************** 10.132 global @read$qipvi:near 10.133 proc @read$qipvi near 10.134 @@ -279,8 +291,8 @@ 10.135 endp @read$qipvi 10.136 10.137 ;*************************************************************** 10.138 -;_fastcall long lseekset(int fd, unsigned whence); 10.139 -;_fastcall long lseekcur(int fd, int whence); 10.140 +;_fastcall long lseekset(ax:int fd, dx:unsigned whence); 10.141 +;_fastcall long lseekcur(ax:int fd, dx:int whence); 10.142 ;*************************************************************** 10.143 10.144 global @lseekcur$qii:near ; fd=ax whence=dx 10.145 @@ -333,7 +345,7 @@ 10.146 buffer db 2560 dup(?) ;28 char buffer[2048+512]; 10.147 ends ; } isostate; 10.148 ;*************************************************************** 10.149 -;_fastcall long isolseek(const unsigned long *offset); 10.150 +;_fastcall long isolseek(bx:const unsigned long *offset); 10.151 ;*************************************************************** 10.152 global @isolseek$qpxul:near 10.153 proc @isolseek$qpxul near 10.154 @@ -348,7 +360,7 @@ 10.155 endp @isolseek$qpxul 10.156 10.157 ;*************************************************************** 10.158 -;_fastcall int isoreadsector(const unsigned long *offset); 10.159 +;_fastcall int isoreadsector(bx:const unsigned long *offset); 10.160 ;*************************************************************** 10.161 global @isoreadsector$qpxul:near 10.162 proc @isoreadsector$qpxul near 10.163 @@ -372,7 +384,7 @@ 10.164 10.165 10.166 ;*************************************************************** 10.167 -;_fastcall int strhead(const char* a,const char* b); 10.168 +;_fastcall int strhead(bx:const char* a, ax:const char* b); 10.169 ;*************************************************************** 10.170 global @strhead$qpxzct1:near 10.171 proc @strhead$qpxzct1 near 10.172 @@ -394,7 +406,7 @@ 10.173 10.174 10.175 ;*************************************************************** 10.176 -;_fastcall char* malloc_or_die(unsigned size); 10.177 +;_fastcall char* malloc_or_die(ax:unsigned size); 10.178 ;*************************************************************** 10.179 global @malloc_or_die$qui:near 10.180 proc @malloc_or_die$qui near 10.181 @@ -416,7 +428,7 @@ 10.182 10.183 10.184 ;*************************************************************** 10.185 -;_fastcall int die(const char* msg); 10.186 +;_fastcall int die(bx:const char* msg); 10.187 ;int exit(); 10.188 ;int abort(); 10.189 ;*************************************************************** 10.190 @@ -461,7 +473,7 @@ 10.191 ends ;}; 10.192 10.193 ;*************************************************************** 10.194 -;long next_chunk(struct image_himem *di); 10.195 +;static long next_chunk(struct image_himem *di); 10.196 ;*************************************************************** 10.197 proc next_chunk near 10.198 10.199 @@ -537,7 +549,7 @@ 10.200 endif 10.201 10.202 ;*************************************************************** 10.203 -;_fastcall u32* malloc_bufv_or_die(struct image_himem *m); 10.204 +;_fastcall u32* malloc_bufv_or_die(bx:struct image_himem *m); 10.205 ;*************************************************************** 10.206 global @malloc_bufv_or_die$qp11image_himem:near 10.207 proc @malloc_bufv_or_die$qp11image_himem near 10.208 @@ -657,7 +669,7 @@ 10.209 10.210 10.211 ;*************************************************************** 10.212 -;_fastcall void memcpy_image(struct image_himem *m); 10.213 +;_fastcall void memcpy_image(bx:struct image_himem *m); 10.214 ;*************************************************************** 10.215 global @memcpy_image$qp11image_himem:near 10.216 proc @memcpy_image$qp11image_himem near 10.217 @@ -718,7 +730,7 @@ 10.218 endp @memcpy_image$qp11image_himem 10.219 10.220 ;*************************************************************** 10.221 -;_fastcall void storepage(u32 *dst); 10.222 +;_fastcall void storepage(bx:u32 *dst); 10.223 ;*************************************************************** 10.224 global @storepage$qpul:near 10.225 proc @storepage$qpul near 10.226 @@ -753,7 +765,7 @@ 10.227 ifdef LARGE_IMAGES 10.228 p386 10.229 ;*************************************************************** 10.230 -;_fastcall void reset_bufv(u32 *p); 10.231 +;_fastcall void reset_bufv(bx:u32 *p); 10.232 ;*************************************************************** 10.233 global @reset_bufv$qpul:near 10.234 proc @reset_bufv$qpul near 10.235 @@ -827,7 +839,7 @@ 10.236 endif 10.237 10.238 ;*************************************************************** 10.239 -;_fastcall void open_image(const char *name, struct image_himem *m); 10.240 +;_fastcall void open_image(bx:const char *name, ax:struct image_himem *m); 10.241 ;*************************************************************** 10.242 global @open_image$qpxzcp11image_himem:near 10.243 proc @open_image$qpxzcp11image_himem near 10.244 @@ -871,7 +883,7 @@ 10.245 10.246 10.247 ;*************************************************************** 10.248 -;_fastcall int read_image(struct image_himem *m); 10.249 +;_fastcall int read_image(bx:struct image_himem *m); 10.250 ;*************************************************************** 10.251 global @read_image$qp11image_himem:near 10.252 proc @read_image$qp11image_himem near 10.253 @@ -1220,7 +1232,7 @@ 10.254 10.255 10.256 ;*************************************************************** 10.257 -;_fastcall void chdirname(char *path) 10.258 +;_fastcall void chdirname(bx:char *path) 10.259 ;*************************************************************** 10.260 global @chdirname$qpzc:near 10.261 proc @chdirname$qpzc near 10.262 @@ -1250,11 +1262,13 @@ 10.263 mov bx,dx 10.264 push [word bx] 10.265 mov [bx],al 10.266 + ifdef LONG_FILENAME 10.267 stc 10.268 mov ax,713Bh ; chdir long filename (ds:dx) 10.269 int 21h 10.270 + jnc @@chdirdone 10.271 + endif 10.272 mov ah,3Bh ; chdir(ds:dx) 10.273 - jnc @@chdirdone 10.274 int 21h 10.275 @@chdirdone: 10.276 pop [word bx] 10.277 @@ -1265,7 +1279,7 @@ 10.278 10.279 10.280 ;*************************************************************** 10.281 -;_fastcall char *ultoa(unsigned long n); 10.282 +;_fastcall char *ultoa(axdx:unsigned long n); 10.283 ;*************************************************************** 10.284 global @ultoa$qul:near 10.285 proc @ultoa$qul near 10.286 @@ -1296,7 +1310,7 @@ 10.287 10.288 10.289 ;*************************************************************** 10.290 -;_fastcall unsigned long kver2ul(char *kernel_version); 10.291 +;_fastcall unsigned long kver2ul(bx:char *kernel_version); 10.292 ;*************************************************************** 10.293 global @kver2ul$qpzc:near 10.294 proc @kver2ul$qpzc near 10.295 @@ -1331,7 +1345,6 @@ 10.296 10.297 ;*************************************************************** 10.298 ;void try_default_args(); 10.299 -;_fastcall void set_cmdline(const char *filename); 10.300 ;*************************************************************** 10.301 ifdef EXTRA 10.302
11.1 --- a/linld/stuff/src/pipehole.awk Wed Jan 02 19:57:20 2019 -0500 11.2 +++ b/linld/stuff/src/pipehole.awk Thu Jan 03 12:04:23 2019 +0100 11.3 @@ -21,7 +21,11 @@ 11.4 hold=5; next 11.5 } 11.6 } 11.7 - if (/^ mov cl,4$/) { hold=8; next } 11.8 + if (/^ mov ax,cs$/) { hold=6; kept=0; next } 11.9 + if (/^ mov cl,4$/) { hold=7; next } 11.10 + if (/^ cmp word ptr DGROUP:.*,0$/) { 11.11 + hold=8; split($2,regs,","); next 11.12 + } 11.13 } 11.14 else if (hold == 1) { 11.15 if (/^ ;/) { line[kept++]=$0; next } 11.16 @@ -30,9 +34,9 @@ 11.17 if ($1 == "sub") op="-" 11.18 if (op != "" && regs[1] == args[1]) { 11.19 if (isnum(args[2])) { 11.20 - print "\tlea\t" regs[1] ",[" regs[2] op args[2] "]" 11.21 - for (i = 0; i < kept; i++) print line[i]; kept=0 11.22 - next 11.23 + for (i = kept++; i > 0; i--) line[i] = line[i-1] 11.24 + line[0] = "\tlea\t" regs[1] ",[" regs[2] op args[2] "]" 11.25 + hold=10; next 11.26 } 11.27 line[kept++]=$0 11.28 hold=1 11.29 @@ -74,7 +78,21 @@ 11.30 } 11.31 print s 11.32 } 11.33 - else if (hold == 8) { 11.34 + else if (hold == 6) { 11.35 + if (($1 == "and" || $1 == "add") && $2 ~ /^ax,/) { 11.36 + line[kept++]=$0 11.37 + next 11.38 + } 11.39 + p=$0 11.40 + if (/^ movzx eax,ax$/) { 11.41 + s=" mov eax,cs"; p="" 11.42 + } 11.43 + print s 11.44 + for (i = 0; i < kept; i++) print line[i]; kept=0 11.45 + if (p != "") print p 11.46 + hold=0; next 11.47 + } 11.48 + else if (hold == 7) { 11.49 hold=0 11.50 if (/^ call near ptr N_LXURSH@$/) { 11.51 print " extrn N_LXURSH@4:near" 11.52 @@ -88,6 +106,29 @@ 11.53 } 11.54 print s 11.55 } 11.56 + else if (hold == 8) { 11.57 + if ($1 == "je" || $1 == "jne") { p=$0; hold=9; next } 11.58 + hold=0 11.59 + print s 11.60 + } 11.61 + else if (hold == 9) { 11.62 + hold=0; split($2,args,",") 11.63 + if (/^ mov ax,/ && args[2] == regs[1]) { 11.64 + print; print " or ax,ax"; print p; next 11.65 + } 11.66 + print s; print p; 11.67 + } 11.68 + else if (hold == 10) { 11.69 + hold=0 11.70 + if (/^ mov [sd]i,ax$/) { 11.71 + split($2,args,",") 11.72 + for (i = 0; i < kept; i++) { 11.73 + sub(/ax/,args[1],line[i]); print line[i] 11.74 + } 11.75 + next 11.76 + } 11.77 + for (i = 0; i < kept; i++) print line[i] 11.78 + } 11.79 s=$0 11.80 # These optimisation may break ZF or CF 11.81 if (/^ sub sp,2$/) { print " push ax"; next }