wok rev 25731
Up lz4 (1.10.0), xz (5.6.2)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Aug 21 14:07:08 2024 +0000 (3 weeks ago) |
| parents | 9456bfc6f1f6 |
| children | 274c0ec61c53 |
| files | lz4/receipt memtest/stuff/unlz4.S memtest/stuff/unlzsa1.S memtest/stuff/unlzsa2.S memtest/stuff/unzx0.S ncurses-common/receipt ncurses-dev/receipt ncurses-extra/receipt ncurses-man/receipt ncurses/receipt ncursesw-dev/receipt ncursesw-extra/receipt ncursesw/receipt ofono-dev/receipt ofono/receipt plop/stuff/unlz4.S plop/stuff/unlzsa1.S plop/stuff/unlzsa2.S plop/stuff/unshr.S plop/stuff/unzx0.S thermald/receipt xz/receipt |
line diff
1.1 --- a/lz4/receipt Sun Aug 18 10:31:24 2024 +0100 1.2 +++ b/lz4/receipt Wed Aug 21 14:07:08 2024 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="lz4" 1.7 -VERSION="1.9.4" 1.8 +VERSION="1.10.0" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="High speed lossless compressor." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -24,7 +24,7 @@ 1.13 compile_rules() 1.14 { 1.15 find -type f | xargs sed -i 's|usr/local|usr|' 1.16 - make LDFLAGS="$LDFLAGS -lrt" && make DESTDIR=$DESTDIR install 1.17 + make LDFLAGS="$LDFLAGS -lrt -lpthread" && make DESTDIR=$DESTDIR install 1.18 } 1.19 1.20 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/memtest/stuff/unlz4.S Sun Aug 18 10:31:24 2024 +0100 2.2 +++ b/memtest/stuff/unlz4.S Wed Aug 21 14:07:08 2024 +0000 2.3 @@ -33,8 +33,10 @@ 2.4 2.5 //#define PARANOIA // cover rare cases, optional 2.6 2.7 -.macro norm1 reg, seg, ptr 2.8 +.macro norm1 reg, seg, ptr, loadax=1 2.9 + .if \loadax 2.10 movw \seg, %ax 2.11 + .endif 2.12 movw \ptr, \reg 2.13 #ifdef ONLY8086 2.14 shrw %cl, \reg 2.15 @@ -51,13 +53,13 @@ 2.16 movw %ax, \seg 2.17 .endm 2.18 2.19 -.macro norm reg 2.20 +.macro norm reg, loadax=1 2.21 #ifdef ONLY8086 2.22 pushw %cx 2.23 movb $4, %cl 2.24 #endif 2.25 #ifndef FLAT16 2.26 - norm1 \reg, %ds, %si 2.27 + norm1 \reg, %ds, %si, \loadax 2.28 #endif 2.29 norm1 \reg, %es, %di 2.30 #ifdef ONLY8086 2.31 @@ -159,7 +161,7 @@ 2.32 # endif 2.33 axok: 2.34 # if !defined (NeedLz4mov) 2.35 - norm %bx 2.36 + norm %bx, 0 2.37 rep movsb 2.38 # else 2.39 call lz4movStr // copy string 2.40 @@ -180,9 +182,11 @@ 2.41 sub BX, SI 2.42 # endif 2.43 # ifdef ONLY8086 2.44 -lz4movsb: 2.45 +# jcxz 1f 2.46 +2: 2.47 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 2.48 - loop lz4movsb 2.49 + loop 2b 2.50 +1: 2.51 # else 2.52 rep movsb %es:(SI), %es:(DI) 2.53 # endif 2.54 @@ -204,8 +208,8 @@ 2.55 stosb 2.56 # endif 2.57 # endif 2.58 +#endif 2.59 jmp lz4chunk 2.60 -#endif 2.61 2.62 #if defined(NeedLz4mov) 2.63 # if defined(PARANOIA) 2.64 @@ -219,7 +223,7 @@ 2.65 lz4mov: 2.66 movw %ds, %ax 2.67 lz4movStr: 2.68 - norm %bx 2.69 + norm %bx, 0 2.70 # if defined(PARANOIA) 2.71 cmp $0xFF, %ch // catch FFFX case 2.72 jz lz4movlp
3.1 --- a/memtest/stuff/unlzsa1.S Sun Aug 18 10:31:24 2024 +0100 3.2 +++ b/memtest/stuff/unlzsa1.S Wed Aug 21 14:07:08 2024 +0000 3.3 @@ -73,16 +73,16 @@ 3.4 lzsa1block: // uncompress chunk 3.5 movw $0x1000, %ax 3.6 lzsa1blockz: 3.7 - movw %es, %bx 3.8 - addw %ax, %bx 3.9 - movw %bx, %es 3.10 + movw %es, %cx 3.11 + addw %ax, %cx 3.12 + movw %cx, %es 3.13 # ifndef FLAT16 3.14 movw %si, %ax 3.15 andw $0xf, %si 3.16 shrclw $4, %ax 3.17 - movw %ds, %bx 3.18 - addw %ax, %bx 3.19 - movw %bx, %ds 3.20 + movw %ds, %cx 3.21 + addw %ax, %cx 3.22 + movw %cx, %ds 3.23 # endif 3.24 lodsw // block size 3.25 xchgw %ax, %cx 3.26 @@ -169,9 +169,11 @@ 3.27 xchg AX, SI // save %si 3.28 lea (BX,DI), SI 3.29 # ifdef ONLY8086 3.30 -lzsa2movsb: 3.31 +# jcxz 1f 3.32 +2: 3.33 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 3.34 - loop lzsa2movsb 3.35 + loop 2b 3.36 +1: 3.37 # else 3.38 rep movsb %es:(SI), %es:(DI) 3.39 # endif
4.1 --- a/memtest/stuff/unlzsa2.S Sun Aug 18 10:31:24 2024 +0100 4.2 +++ b/memtest/stuff/unlzsa2.S Wed Aug 21 14:07:08 2024 +0000 4.3 @@ -61,7 +61,6 @@ 4.4 // je lzsa2main 4.5 # endif 4.6 xorw %ax, %ax 4.7 - cwd // no nibble stored 4.8 xchgw %ax, %di 4.9 shrcl $4, %ax 4.10 jmp lzsa2blockz // %di *MUST* be paragraph aligned 4.11 @@ -74,16 +73,17 @@ 4.12 lzsa2block: // uncompress chunk 4.13 movw $0x1000, %ax 4.14 lzsa2blockz: 4.15 - movw %es, %bx 4.16 - addw %ax, %bx 4.17 - movw %bx, %es 4.18 + cwd // no nibble stored 4.19 + movw %es, %cx 4.20 + addw %ax, %cx 4.21 + movw %cx, %es 4.22 # ifndef FLAT16 4.23 movw %si, %ax 4.24 andw $0xf, %si 4.25 shrcl $4, %ax 4.26 - movw %ds, %bx 4.27 - addw %ax, %bx 4.28 - movw %bx, %ds 4.29 + movw %ds, %cx 4.30 + addw %ax, %cx 4.31 + movw %cx, %ds 4.32 # endif 4.33 lodsw // block size 4.34 xchgw %ax, %cx 4.35 @@ -225,9 +225,11 @@ 4.36 xchg AX, SI // save %si 4.37 lea (BX,DI), SI 4.38 # ifdef ONLY8086 4.39 -lzsa2movsb: 4.40 +# jcxz 1f 4.41 +2: 4.42 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 4.43 - loop lzsa2movsb 4.44 + loop 2b 4.45 +1: 4.46 # else 4.47 rep movsb %es:(SI), %es:(DI) 4.48 # endif
5.1 --- a/memtest/stuff/unzx0.S Sun Aug 18 10:31:24 2024 +0100 5.2 +++ b/memtest/stuff/unzx0.S Wed Aug 21 14:07:08 2024 +0000 5.3 @@ -72,22 +72,37 @@ 5.4 jmp .copy_match 5.5 .fix_di: 5.6 # ifdef BACKWARD 5.7 - addw $256*64, %di 5.8 + addw $64, %di 5.9 movw %es, %dx 5.10 - subw $16*64, %dx 5.11 + subw $4, %dx 5.12 movw %dx, %es 5.13 .copy_match: 5.14 cmpw $32640, %di // assume 32639 max window 5.15 jb .fix_di 5.16 # else 5.17 - subw $256*64, %di 5.18 + subw $64, %di 5.19 movw %es, %dx 5.20 - addw $16*64, %dx 5.21 + addw $4, %dx 5.22 movw %dx, %es 5.23 .copy_match: 5.24 cmpw $-32640, %di // assume 32639 max window 5.25 ja .fix_di 5.26 # endif 5.27 +# ifndef FLAT16 5.28 + test %si, si 5.29 +# ifdef BACKWARD 5.30 + js .si_ok 5.31 + movw %ds, %dx 5.32 + subw $8, %dh 5.33 +# else 5.34 + jns .si_ok 5.35 + movw %ds, %dx 5.36 + addw $8, %dh 5.37 +# endif 5.38 + movw %dx, %ds 5.39 + xorw $0x8000, %si 5.40 +.si_ok: 5.41 +# endif 5.42 #else 5.43 .copy_match: 5.44 #endif 5.45 @@ -97,9 +112,11 @@ 5.46 #endif 5.47 lea (BX,DI), SI // point to destination in es:di + offset in bx 5.48 #ifdef ONLY8086 5.49 -.copy_loop: 5.50 +# jcxz 1f 5.51 +2: 5.52 movsb %es:(SI), %es:(DI) // copy matched bytes using NMOS 8088/8086 workaround. 5.53 - loop .copy_loop 5.54 + loop 2b 5.55 +1: 5.56 #else 5.57 rep movsb %es:(SI), %es:(DI) // copy matched bytes 5.58 #endif
6.1 --- a/ncurses-common/receipt Sun Aug 18 10:31:24 2024 +0100 6.2 +++ b/ncurses-common/receipt Wed Aug 21 14:07:08 2024 +0000 6.3 @@ -6,7 +6,7 @@ 6.4 SHORT_DESC="Common files for the ncurses and ncursesw library." 6.5 MAINTAINER="pankso@slitaz.org" 6.6 LICENSE="MIT" 6.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 6.8 +WEB_SITE="https://invisible-island.net/ncurses/" 6.9 6.10 DEPENDS="glibc-base" 6.11 WANTED="ncurses"
7.1 --- a/ncurses-dev/receipt Sun Aug 18 10:31:24 2024 +0100 7.2 +++ b/ncurses-dev/receipt Wed Aug 21 14:07:08 2024 +0000 7.3 @@ -6,7 +6,7 @@ 7.4 SHORT_DESC="Development files for the ncurses library." 7.5 MAINTAINER="pankso@slitaz.org" 7.6 LICENSE="MIT" 7.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 7.8 +WEB_SITE="https://invisible-island.net/ncurses/" 7.9 7.10 DEPENDS="libtinfo ncurses ncursesw-dev" # pkg-config 7.11 WANTED="ncurses"
8.1 --- a/ncurses-extra/receipt Sun Aug 18 10:31:24 2024 +0100 8.2 +++ b/ncurses-extra/receipt Wed Aug 21 14:07:08 2024 +0000 8.3 @@ -6,7 +6,7 @@ 8.4 SHORT_DESC="Extra files for the ncurses library." 8.5 MAINTAINER="pascal.bellard@slitaz.org" 8.6 LICENSE="MIT" 8.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 8.8 +WEB_SITE="https://invisible-island.net/ncurses/" 8.9 8.10 DEPENDS="ncurses" 8.11 WANTED="ncurses"
9.1 --- a/ncurses-man/receipt Sun Aug 18 10:31:24 2024 +0100 9.2 +++ b/ncurses-man/receipt Wed Aug 21 14:07:08 2024 +0000 9.3 @@ -6,7 +6,7 @@ 9.4 SHORT_DESC="Manual pages for the ncurses library." 9.5 MAINTAINER="pascal.bellard@slitaz.org" 9.6 LICENSE="MIT" 9.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 9.8 +WEB_SITE="https://invisible-island.net/ncurses/" 9.9 9.10 WANTED="ncurses" 9.11
10.1 --- a/ncurses/receipt Sun Aug 18 10:31:24 2024 +0100 10.2 +++ b/ncurses/receipt Wed Aug 21 14:07:08 2024 +0000 10.3 @@ -6,7 +6,7 @@ 10.4 SHORT_DESC="Library of functions to manage display on terminals." 10.5 MAINTAINER="pankso@slitaz.org" 10.6 LICENSE="MIT" 10.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 10.8 +WEB_SITE="https://invisible-island.net/ncurses/" 10.9 10.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 10.11 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
11.1 --- a/ncursesw-dev/receipt Sun Aug 18 10:31:24 2024 +0100 11.2 +++ b/ncursesw-dev/receipt Wed Aug 21 14:07:08 2024 +0000 11.3 @@ -6,7 +6,7 @@ 11.4 SHORT_DESC="Development files for the ncursesw library." 11.5 MAINTAINER="pankso@slitaz.org" 11.6 LICENSE="MIT" 11.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 11.8 +WEB_SITE="https://invisible-island.net/ncurses/" 11.9 11.10 DEPENDS="ncursesw" 11.11 WANTED="ncursesw"
12.1 --- a/ncursesw-extra/receipt Sun Aug 18 10:31:24 2024 +0100 12.2 +++ b/ncursesw-extra/receipt Wed Aug 21 14:07:08 2024 +0000 12.3 @@ -6,7 +6,7 @@ 12.4 SHORT_DESC="Extra files for the ncursesw library." 12.5 MAINTAINER="pascal.bellard@slitaz.org" 12.6 LICENSE="MIT" 12.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 12.8 +WEB_SITE="https://invisible-island.net/ncurses/" 12.9 12.10 DEPENDS="ncurses-extra ncursesw" 12.11 WANTED="ncursesw"
13.1 --- a/ncursesw/receipt Sun Aug 18 10:31:24 2024 +0100 13.2 +++ b/ncursesw/receipt Wed Aug 21 14:07:08 2024 +0000 13.3 @@ -6,7 +6,7 @@ 13.4 SHORT_DESC="Library of functions to manage display on terminals." 13.5 MAINTAINER="pankso@slitaz.org" 13.6 LICENSE="MIT" 13.7 -WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html" 13.8 +WEB_SITE="https://invisible-island.net/ncurses/" 13.9 13.10 SOURCE="ncurses" 13.11 TARBALL="$SOURCE-$VERSION.tar.gz"
14.1 --- a/ofono-dev/receipt Sun Aug 18 10:31:24 2024 +0100 14.2 +++ b/ofono-dev/receipt Wed Aug 21 14:07:08 2024 +0000 14.3 @@ -4,7 +4,7 @@ 14.4 VERSION="1.14" 14.5 CATEGORY="network" 14.6 SHORT_DESC="Stack for mobile telephony (GSM/UMTS) - dev files" 14.7 -WEB_SITE="http://ofono.org" 14.8 +WEB_SITE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" 14.9 MAINTAINER="slaxemulator@gmail.com" 14.10 LICENSE="GPL2" 14.11 WANTED="ofono"
15.1 --- a/ofono/receipt Sun Aug 18 10:31:24 2024 +0100 15.2 +++ b/ofono/receipt Wed Aug 21 14:07:08 2024 +0000 15.3 @@ -7,7 +7,7 @@ 15.4 MAINTAINER="slaxemulator@gmail.com" 15.5 LICENSE="GPL2" 15.6 TARBALL="$PACKAGE-$VERSION.tar.xz" 15.7 -WEB_SITE="http://ofono.org" 15.8 +WEB_SITE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" 15.9 WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL" 15.10 15.11 DEPENDS="dbus glib udev bluez"
16.1 --- a/plop/stuff/unlz4.S Sun Aug 18 10:31:24 2024 +0100 16.2 +++ b/plop/stuff/unlz4.S Wed Aug 21 14:07:08 2024 +0000 16.3 @@ -33,6 +33,35 @@ 16.4 16.5 //#define PARANOIA // cover rare cases, optional 16.6 16.7 +.macro norm1 reg, seg, ptr, loadax=1 16.8 + .if \loadax 16.9 + movw \seg, %ax 16.10 + .endif 16.11 + movw \ptr, \reg 16.12 +#ifdef ONLY8086 16.13 + shrw %cl, \reg 16.14 +#else 16.15 + shrw $4, \reg 16.16 +#endif 16.17 + andw $0xF, \ptr 16.18 + addw \reg, %ax 16.19 + movw %ax, \seg 16.20 +.endm 16.21 + 16.22 +.macro norm reg, loadax=1 16.23 +#ifdef ONLY8086 16.24 + pushw %cx 16.25 + movb $4, %cl 16.26 +#endif 16.27 +#ifndef FLAT16 16.28 + norm1 \reg, %ds, %si, \loadax 16.29 +#endif 16.30 + norm1 \reg, %es, %di 16.31 +#ifdef ONLY8086 16.32 + popw %cx 16.33 +#endif 16.34 +.endm 16.35 + 16.36 lz4main: 16.37 #ifdef PARANOIA 16.38 cld 16.39 @@ -115,37 +144,13 @@ 16.40 pushw %ds 16.41 pushw %si 16.42 movw %di, %si 16.43 + movw %es, %ax 16.44 subw %bx, %si 16.45 - movw %es, %ax 16.46 jnc axok 16.47 subb $0x10, %ah 16.48 axok: 16.49 -.macro norm reg 16.50 - movw %si, \reg 16.51 - andw $0xF, %si 16.52 -# ifdef ONLY8086 16.53 - pushw %cx 16.54 - movb $4, %cl 16.55 - shrw %cl, \reg 16.56 -# else 16.57 - shrw $4, \reg 16.58 -# endif 16.59 - addw \reg, %ax 16.60 - movw %ax, %ds 16.61 - movw %di, \reg 16.62 - andw $0xF, %di 16.63 -# ifdef ONLY8086 16.64 - shrw %cl, \reg 16.65 - popw %cx 16.66 -# else 16.67 - shrw $4, \reg 16.68 -# endif 16.69 - movw %es, %ax 16.70 - addw \reg, %ax 16.71 - movw %ax, %es 16.72 -.endm 16.73 # if !defined (NeedLz4mov) 16.74 - norm %bx 16.75 + norm %bx, 0 16.76 rep movsb 16.77 # else 16.78 call lz4movStr // copy string 16.79 @@ -162,9 +167,11 @@ 16.80 mov DI, SI 16.81 sub BX, SI 16.82 # ifdef ONLY8086 16.83 -lz4movsb: 16.84 +# jcxz 1f 16.85 +2: 16.86 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 16.87 - loop lz4movsb 16.88 + loop 2b 16.89 +1: 16.90 # else 16.91 rep movsb %es:(SI), %es:(DI) 16.92 # endif 16.93 @@ -186,8 +193,8 @@ 16.94 stosb 16.95 # endif 16.96 # endif 16.97 +#endif 16.98 jmp lz4chunk 16.99 -#endif 16.100 16.101 #if defined(NeedLz4mov) 16.102 # if defined(PARANOIA) 16.103 @@ -201,7 +208,7 @@ 16.104 lz4mov: 16.105 movw %ds, %ax 16.106 lz4movStr: 16.107 - norm %bx 16.108 + norm %bx, 0 16.109 # if defined(PARANOIA) 16.110 cmp $0xFF, %ch // catch FFFX case 16.111 jz lz4movlp
17.1 --- a/plop/stuff/unlzsa1.S Sun Aug 18 10:31:24 2024 +0100 17.2 +++ b/plop/stuff/unlzsa1.S Wed Aug 21 14:07:08 2024 +0000 17.3 @@ -25,10 +25,16 @@ 17.4 #define PACKED_ONLY // assume no copy block, optional 17.5 //#define PARANOIA // cover rare cases, optional 17.6 17.7 -.macro shrclw cnt,obj 17.8 +.macro shrclw cnt,obj,keepcx=0 17.9 #ifdef ONLY8086 17.10 + .if \keepcx 17.11 + pushw %cx 17.12 + .endif 17.13 movb \cnt, %cl 17.14 shrw %cl, \obj 17.15 + .if \keepcx 17.16 + popw %cx 17.17 + .endif 17.18 #else 17.19 shrw \cnt, \obj 17.20 #endif 17.21 @@ -63,16 +69,16 @@ 17.22 lzsa1block: // uncompress chunk 17.23 movw $0x1000, %ax 17.24 lzsa1blockz: 17.25 - movw %es, %bx 17.26 - addw %ax, %bx 17.27 - movw %bx, %es 17.28 + movw %es, %cx 17.29 + addw %ax, %cx 17.30 + movw %cx, %es 17.31 # ifndef FLAT16 17.32 movw %si, %ax 17.33 andw $0xf, %si 17.34 shrclw $4, %ax 17.35 - movw %ds, %bx 17.36 - addw %ax, %bx 17.37 - movw %bx, %ds 17.38 + movw %ds, %cx 17.39 + addw %ax, %cx 17.40 + movw %cx, %ds 17.41 # endif 17.42 lodsw // block size 17.43 xchgw %ax, %cx 17.44 @@ -107,7 +113,7 @@ 17.45 movb $-1, %ah // set offset bits 15-8 to 1 17.46 #endif 17.47 lodsb 17.48 - .byte 0x3C // mask lodsw with cmpb $0xAD, %al 17.49 + .byte 0xA8 // mask lodsw with testb $0xAD, %al 17.50 lzsa1LongOfs: 17.51 lodsw 17.52 xchg AX, BX // %bx: match offset %ax: original token 17.53 @@ -125,13 +131,7 @@ 17.54 cmpw %si, %di 17.55 jnc lzsa1sameSeg 17.56 pushw %si 17.57 -# ifdef ONLY8086 17.58 - pushw %cx 17.59 -# endif 17.60 - shrclw $4, %si 17.61 -# ifdef ONLY8086 17.62 - popw %cx 17.63 -# endif 17.64 + shrclw $4, %si, 1 17.65 lea -4096(%bp,%si), %bp 17.66 popw %si 17.67 andw $0xF, %si 17.68 @@ -152,9 +152,11 @@ 17.69 xchg AX, SI // save %si 17.70 lea (BX,DI), SI 17.71 # ifdef ONLY8086 17.72 -lzsa2movsb: 17.73 +# jcxz 1f 17.74 +2: 17.75 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 17.76 - loop lzsa2movsb 17.77 + loop 2b 17.78 +1: 17.79 # else 17.80 rep movsb %es:(SI), %es:(DI) 17.81 # endif 17.82 @@ -202,7 +204,7 @@ 17.83 movb %al, %ah // S=256-1791, L=256-4607 or S=256-511, L=256-511 17.84 jne lzsa1midNumber 17.85 lodsw // 0-65535 %cx = word if (%al & %cl == %cl && %ch + %cl + byte == 0x100) 17.86 - .byte 0x3C // mask lodsb with cmpb $0xAC, %al 17.87 + .byte 0xA8 // mask lodsb with testb $0xAC, %al 17.88 lzsa1midNumber: 17.89 lodsb // %cx = (%ch + %cl + byte)*256 + byte2 if (%al & %cl == %cl && %ch + %cl + byte > 0x100) 17.90 lzsa1gotNumber:
18.1 --- a/plop/stuff/unlzsa2.S Sun Aug 18 10:31:24 2024 +0100 18.2 +++ b/plop/stuff/unlzsa2.S Wed Aug 21 14:07:08 2024 +0000 18.3 @@ -25,10 +25,16 @@ 18.4 #define PACKED_ONLY // assume no copy block, optional 18.5 //#define PARANOIA // cover rare cases, optional 18.6 18.7 -.macro shrcl cnt,obj 18.8 +.macro shrcl cnt,obj,keepcx=0 18.9 #ifdef ONLY8086 18.10 + .if \keepcx 18.11 + pushw %cx 18.12 + .endif 18.13 movb \cnt, %cl 18.14 shr %cl, \obj 18.15 + .if \keepcx 18.16 + popw %cx 18.17 + .endif 18.18 #else 18.19 shr \cnt, \obj 18.20 #endif 18.21 @@ -51,7 +57,6 @@ 18.22 // je lzsa2main 18.23 # endif 18.24 xorw %ax, %ax 18.25 - cwd // no nibble stored 18.26 xchgw %ax, %di 18.27 shrcl $4, %ax 18.28 jmp lzsa2blockz // %di *MUST* be paragraph aligned 18.29 @@ -64,16 +69,17 @@ 18.30 lzsa2block: // uncompress chunk 18.31 movw $0x1000, %ax 18.32 lzsa2blockz: 18.33 - movw %es, %bx 18.34 - addw %ax, %bx 18.35 - movw %bx, %es 18.36 + cwd // no nibble stored 18.37 + movw %es, %cx 18.38 + addw %ax, %cx 18.39 + movw %cx, %es 18.40 # ifndef FLAT16 18.41 movw %si, %ax 18.42 andw $0xf, %si 18.43 shrcl $4, %ax 18.44 - movw %ds, %bx 18.45 - addw %ax, %bx 18.46 - movw %bx, %ds 18.47 + movw %ds, %cx 18.48 + addw %ax, %cx 18.49 + movw %cx, %ds 18.50 # endif 18.51 lodsw // block size 18.52 xchgw %ax, %cx 18.53 @@ -178,13 +184,7 @@ 18.54 cmpw %si, %di 18.55 jnc lzsa2sameSeg 18.56 pushw %si 18.57 -# ifdef ONLY8086 18.58 - pushw %cx 18.59 -# endif 18.60 - shrcl $4, %si 18.61 -# ifdef ONLY8086 18.62 - popw %cx 18.63 -# endif 18.64 + shrcl $4, %si, 1 18.65 lea -4096(%bp,%si), %bp 18.66 popw %si 18.67 andw $0xF, %si 18.68 @@ -208,9 +208,11 @@ 18.69 xchg AX, SI // save %si 18.70 lea (BX,DI), SI 18.71 # ifdef ONLY8086 18.72 -lzsa2movsb: 18.73 +# jcxz 1f 18.74 +2: 18.75 movsb %es:(SI), %es:(DI) // NMOS 8088/8086 workaround. 18.76 - loop lzsa2movsb 18.77 + loop 2b 18.78 +1: 18.79 # else 18.80 rep movsb %es:(SI), %es:(DI) 18.81 # endif 18.82 @@ -270,7 +272,7 @@ 18.83 # endif 18.84 xchgb %al, %ah // S=256-4351, L=256-5887 18.85 lodsb // %cx = (%ch + %cl + 0xE + byte)*256 + byte2 if (%al & %cl == %cl && nibble == 0xF && %ch + %cl + 0xF + byte > 0x100) 18.86 - .byte 0xB1 // mask lodsw with movb $0xAD, %cl 18.87 + .byte 0xA8 // mask lodsw with testb $0xAD, %al 18.88 lzsa2maxNumber: 18.89 #endif 18.90 lodsw // 0-65535 %cx = word if (%al & %cl == %cl && nibble == 0xF && %ch + %cl + 0xF + byte == 0x100)
19.1 --- a/plop/stuff/unshr.S Sun Aug 18 10:31:24 2024 +0100 19.2 +++ b/plop/stuff/unshr.S Wed Aug 21 14:07:08 2024 +0000 19.3 @@ -2,7 +2,7 @@ 19.4 // This is depacker for data compressed with Shrinkler by Aske Simon Christensen. 19.5 // You can freely use it as you like. 19.6 // Uses only 8086 instructions, suitable for IBM PC/XT (~2 KB/s on 4.77 MHz 8088). 19.7 -// Assembled size is 170/167 bytes. 19.8 +// Assembled size is 160 bytes. 19.9 19.10 #define NUM_CONTEXTS 1024 19.11 #define INIT_ONE_PROB 0x8000
20.1 --- a/plop/stuff/unzx0.S Sun Aug 18 10:31:24 2024 +0100 20.2 +++ b/plop/stuff/unzx0.S Wed Aug 21 14:07:08 2024 +0000 20.3 @@ -66,22 +66,39 @@ 20.4 #if !defined(FLAT16OUT) && !defined(FLAT32) 20.5 jmp .copy_match 20.6 .fix_di: 20.7 - subw $256*64, %di 20.8 + subw $64, %di 20.9 movw %es, %dx 20.10 - addw $16*64, %dx 20.11 + addw $4, %dx 20.12 movw %dx, %es 20.13 .copy_match: 20.14 cmpw $-32640, %di // assume 32639 max window 20.15 ja .fix_di 20.16 +# ifndef FLAT16 20.17 + test %si, si 20.18 +# ifdef BACKWARD 20.19 + js .si_ok 20.20 + movw %ds, %dx 20.21 + subw $8, %dh 20.22 +# else 20.23 + jns .si_ok 20.24 + movw %ds, %dx 20.25 + addw $8, %dh 20.26 +# endif 20.27 + movw %dx, %ds 20.28 + xorw $0x8000, %si 20.29 +.si_ok: 20.30 +# endif 20.31 #else 20.32 .copy_match: 20.33 #endif 20.34 push SI // save si (current pointer to compressed data) 20.35 lea (BX,DI), SI // point to destination in es:di + offset in bx 20.36 #ifdef ONLY8086 20.37 -.copy_loop: 20.38 +# jcxz 1f 20.39 +2: 20.40 movsb %es:(SI), %es:(DI) // copy matched bytes using NMOS 8088/8086 workaround. 20.41 - loop .copy_loop 20.42 + loop 2b 20.43 +1: 20.44 #else 20.45 rep movsb %es:(SI), %es:(DI) // copy matched bytes 20.46 #endif
21.1 --- a/thermald/receipt Sun Aug 18 10:31:24 2024 +0100 21.2 +++ b/thermald/receipt Wed Aug 21 14:07:08 2024 +0000 21.3 @@ -6,7 +6,7 @@ 21.4 LICENSE="GPL2" 21.5 SHORT_DESC="Linux thermal daemon (thermald) monitors and controls temperature." 21.6 MAINTAINER="yuripourre@gmail.com" 21.7 -WEB_SITE="https://01.org/linux-thermal-daemon" 21.8 +WEB_SITE="https://github.com/intel/thermal_daemon" 21.9 21.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 21.11 WGET_URL="https://github.com/intel/thermal_daemon/archive/v$VERSION.tar.gz"
22.1 --- a/xz/receipt Sun Aug 18 10:31:24 2024 +0100 22.2 +++ b/xz/receipt Wed Aug 21 14:07:08 2024 +0000 22.3 @@ -1,7 +1,7 @@ 22.4 # SliTaz package receipt. 22.5 22.6 PACKAGE="xz" 22.7 -VERSION="5.2.6" 22.8 +VERSION="5.6.2" 22.9 CATEGORY="base-system" 22.10 TAGS="compression archive" 22.11 SHORT_DESC="General-purpose data compressor with a high compression ratio." 22.12 @@ -21,7 +21,7 @@ 22.13 current_version() 22.14 { 22.15 wget -O - $WEB_SITE 2>/dev/null | \ 22.16 - sed '/was released/!d;s| .*||;q' 22.17 + sed '/tar..z/!d;s|.*xz-||;s|.tar.*||;q' 22.18 } 22.19 22.20 # Rules to configure and make the package.