# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1706271351 0
# Node ID 70750875bc0b272243e185bad1ce3a63f994d44e
# Parent  eaa4b9eff9433615a41ed3f15dfd54794969d671
Backout salvador 10% speedup: crashes with large files

diff -r eaa4b9eff943 -r 70750875bc0b emu2/receipt
--- a/emu2/receipt	Sun Jan 21 10:02:07 2024 +0000
+++ b/emu2/receipt	Fri Jan 26 12:15:51 2024 +0000
@@ -24,6 +24,7 @@
 compile_rules()
 {
 	cp $stuff/* src
+	sed -i '/HALT instruction/{N;s|.*|/*& */|}' src/cpu.c
 	mkdir obj
 	make CC=gcc-83 DESTDIR=$DESTDIR install
 }
@@ -35,3 +36,28 @@
 	cp $src/README.md $install/usr/doc
 	cp -a $install/usr/bin $fs/usr
 }
+
+# Post install command for Tazpkg.
+post_install()
+{
+	fmt="binfmt_misc"
+	proc="/proc/sys/fs/binfmt_misc"
+	exe=":EMU2:E::exe::/usr/bin/emu2:"
+	com=":EMU2:E::com::/usr/bin/emu2:"
+	cat > /tmp/runcom$$ <<EOT
+[ ! -e $proc/register ] && modprobe $fmt && mount -t $fmt $fmt $proc
+echo "$exe" >$proc/register
+echo "$com" >$proc/register
+EOT
+	rc="$1/etc/init.d/local.sh"
+	grep -q "$com" $rc || cat /tmp/runcom$$ >> $rc
+	[ -n "$1" ] || . /tmp/runcom$$
+	rm -f /tmp/runcom$$
+}
+
+# Pre remove command for Tazpkg.
+pre_remove()
+{
+	echo -1 > /proc/sys/fs/binfmt_misc/EMU2
+	sed -i '/binfmt_misc/{NN;/EMU2:E::com/d}' "$1/etc/init.d/local.sh"
+}
diff -r eaa4b9eff943 -r 70750875bc0b salvador/receipt
--- a/salvador/receipt	Sun Jan 21 10:02:07 2024 +0000
+++ b/salvador/receipt	Fri Jan 26 12:15:51 2024 +0000
@@ -23,7 +23,6 @@
 {
 	sed -i 's|^CC=.*$|CC=gcc|;s|^CFLAGS=|&-std=gnu99 |' \
 		Makefile
-	patch -p0 < $stuff/shrink.u
 	make
 }
 
diff -r eaa4b9eff943 -r 70750875bc0b salvador/stuff/shrink.u
--- a/salvador/stuff/shrink.u	Sun Jan 21 10:02:07 2024 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
---- src/shrink.c
-+++ src/shrink.c
-@@ -41,7 +41,9 @@
- #define OFFSET_COST(__offset)    (((__offset) <= 128) ? 8 : (7 + salvador_get_elias_size((((__offset) - 1) >> 7) + 1)))
- 
- /** Costs, per length */
--static const char salvador_cost_for_len[8192] = {
-+static char salvador_cost_for_len[MAX_OFFSET];
-+
-+/**
-    0, 2, 4, 4, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-    18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-@@ -74,7 +76,8 @@
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
--};
-+   ...
-+ */
- 
- /**
-  * Get the number of bits required to encode a gamma value
-@@ -84,29 +87,7 @@
-  * @return number of bits required for encoding
-  */
- static int salvador_get_elias_size(const int nValue) {
--   if (nValue >= 0 && nValue < 8192) {
--      return salvador_cost_for_len[nValue] - TOKEN_SIZE;
--   }
--   else {
--      int i = nValue;
--      int nBits = 0;
--
--      i |= (i >> 1);
--      i |= (i >> 2);
--      i |= (i >> 4);
--      i |= (i >> 8);
--      i |= (i >> 16);
--      i = (i - (i >> 1));
--
--      while ((i >>= 1) > 0) {
--         nBits++;
--         nBits++;
--      }
--
--      nBits++;
--
--      return nBits;
--   }
-+   return salvador_cost_for_len[nValue] - TOKEN_SIZE;
- }
- 
- /**
-@@ -317,10 +298,7 @@
-  * @return number of extra bits required
-  */
- static inline int salvador_get_literals_varlen_size(const int nLength) {
--   if (nLength >= 0 && nLength < 8192)
--      return salvador_cost_for_len[nLength];
--   else
--      return TOKEN_SIZE + salvador_get_elias_size(nLength);
-+   return salvador_cost_for_len[nLength];
- }
- 
- /**
-@@ -642,7 +620,7 @@
- 
-                for (k = nStartingMatchLen; k <= nMatchLen; k++) {
-                   salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition];
--                  const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k - 1] : (salvador_get_match_varlen_size_norep(k) + TOKEN_SIZE /* token */);
-+                  const int nMatchLenCost = salvador_cost_for_len[k - 1];
-                   const int nCodingChoiceCost = nMatchLenCost + nNoRepmatchOffsetCost;
- 
-                   if (nCodingChoiceCost < pDestSlots[nArrivalsPerPosition - 2].cost ||
-@@ -716,7 +694,7 @@
-             }
- 
-             for (k = nStartingMatchLen; k <= (nOverallMaxRepLen < nMatchLen ? nOverallMaxRepLen : nMatchLen); k++) {
--               const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k] : (salvador_get_match_varlen_size_rep(k) + TOKEN_SIZE /* token */);
-+               const int nMatchLenCost = salvador_cost_for_len[k];
-                salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition];
-                int nCurRepMatchArrival;
- 
-@@ -1789,6 +1767,17 @@
- static int salvador_compressor_init(salvador_compressor *pCompressor, const int nBlockSize, const int nMaxWindowSize, const size_t nMaxOffset, const int nMaxArrivals, const int nFlags) {
-    int nResult;
- 
-+   if (salvador_cost_for_len[1] == 0) {
-+      int i, j, k;
-+
-+      for (i = 0, j = 0, k = 1; i < MAX_OFFSET; i++) {
-+         if (k <= i) {
-+            j = j + 2;
-+            k = k + k;
-+         }
-+         salvador_cost_for_len[i] = j;
-+      }
-+   }
-    nResult = divsufsort_init(&pCompressor->divsufsort_context);
-    pCompressor->intervals = NULL;
-    pCompressor->pos_data = NULL;