Some code optimization

Author: asimba

axissums

@@ -1,8 +1,8 @@
 5e2a6182f5455d95869a16753c56079eef9775e1 ./LICENSE
 09112e52227f0182675725568c005221164cd671 ./README.md
 547331b6beccf7bd63231084b8fa85db7202da80 ./makefile
-3e3cd7373c753ecd539d804496f65e60e176c0cf ./bin/axis
-ef4f6a0a0e54f58a54d1164813f9eba6a3859d02 ./bin/axis.exe
+012e972b521104e23f542a2aee2bae64e4f50800 ./bin/axis
+363e159d2c408fae781dbcdac411063549f01179 ./bin/axis.exe
 ffd10c35dad3e3cedac3969b7c77153084e12e51 ./bin/axisgui.py
 20bbf8559dfdc191399c4b80a07ab28fe85d1d9f ./src/archive.cc
 681b5f03eff93283c4a3a2bef493bb61961d3a8e ./src/archive.h
@@ -16,7 +16,7 @@ c401f18709e9ba1200f7be24e722197147735369 ./src/axislogo.svg
 ac28702e2fc0df8d7adee5d33a75d81b32fbfbd4 ./src/axisum.h
 99e08b3d63bc04321940cb164ea851530a4dbd03 ./src/bnode.cc
 66872236291e1a931acbd9adeeb496d18c61ddcb ./src/bnode.h
-8bd610a7a14055b67f8398b13e64d5e9936d0478 ./src/build.inc
+8c68ef55a14055b68016775f3df6c47793ffe326 ./src/build.inc
 4d94b873542e3d87b318cf24f2c15dd226b2434d ./src/buildinc
 9f1cd4c3b54f4c7bfd6c350067a99977a86a7d32 ./src/canonicalize.cc
 6d06c63018cf30c1ca1b78d6a33dde98aedfe388 ./src/canonicalize.h
@@ -51,7 +51,7 @@ e3b60e4feb6a99f12af95e078bbc8b7f603fba36 ./src/langdata.py
 c95f3e2a22128e7e83108e5e52f735d9542598c9 ./src/makefile.mk
 db1f0474200d1ff94e42a862cb8e9c637b2189dc ./src/mdirs.cc
 2abbe0769065cbc81448baca09d6d30960862e06 ./src/mdirs.h
-abeda236e2a8893b50b8735d1a22617a901bc092 ./src/packer.cc
+632b074d1dddcc5162b8e4c9bed1d7ec08d376a2 ./src/packer.cc
 e1ef1016c72be12503e29fa5f75469bbd9c2a7a7 ./src/packer.h
 56a1e17ff2d6fbd94daabf810234c253490d870b ./src/permutation.cc
 fae079803baac75cbf6154a3f536628310f7e768 ./src/permutation.h
@@ -65,5 +65,5 @@ e8408d7808d4535e25ee9d55ac1e99ae350fdcb3 ./src/timebits.h
 ef3526c8993eb84cb42bbd30b4b4d897aa595d56 ./src/translate.py
 538872498e61b87cf08aa7265e1506648f35bde2 ./src/vars.cc
 afbd6daec11670aca86a20b675e56651cf6ec33a ./src/vars.h
-4d078440c13a35cfc1667f4aed2c83d1524c49fa ./src/version.h
-98376c7cc3679906c2d7563b13ed618a235ae7d1 ./src/version.inc
+468f6b7b91d6678f0098367d6bf22c9ac1438701 ./src/version.h
+98376c7cc36799062ede8c730ee92195a1f87c7c ./src/version.inc

bin/axis

@@ -1,5 +1,5 @@
-18fb27c715ae190e4a3efc51ab41d66ec3448cc3 *./bin/axis
-50b164ccf0aa77875db9523287041bc572e6936f *./bin/axis.exe
+4b6cce5e925db6174d0ba604904f6f16d2a6a8d0 *./bin/axis
+047c05479b23b15af1dbf948c21c03bc18c6f653 *./bin/axis.exe
 6d8f7d55f6243c2b43f0fb64ad22523bb271a6c8 *./bin/axisgui.py
 04a02a05b856af499c7e12a4ca54b192f6ee8b1c *./LICENSE
 f4b7439d3196b6ac2ecc57930853e8293736ce22 *./makefile
@@ -16,7 +16,7 @@ ab1f44390543c26b49b94eba1eb736b4cdc8702c *./src/axismain.cc
 4a5d5ae6faa04225a35aa5751b290570a48809fb *./src/axisum.h
 78882afd798f90d581c75347ebb9bfc1264dcd1c *./src/bnode.cc
 da07eb161d5606ad1db49cd6e027b0fb095f7f30 *./src/bnode.h
-3af4cdea7f566687c202189ca00af2dc2834a8ef *./src/build.inc
+7635d0f69168b9065a7a679b0f73f2d0eb4933f1 *./src/build.inc
 01d7ae4d64aac4aa3a7cb5a34e5dd008b95058f0 *./src/buildinc
 2a4ba2232e37cde6ccf4d85c0429bdb90081a687 *./src/canonicalize.cc
 d3cdb3d4423c1dc67367029ba7d6c73f3d332eee *./src/canonicalize.h
@@ -51,7 +51,7 @@ a948a84493f5dc355b678e79b9008d7094ff85c1 *./src/hash.h
 fcfe84ba2f191ef654d5cb65a99e92947f4e8ab2 *./src/makefile.mk
 c139da5ddf1c747eee44e5aafee6eb312af3e29e *./src/mdirs.cc
 7e2e741f8abec81de2f5372bb36963c67365267f *./src/mdirs.h
-759ab84c00ebb17754e5532c0844f8a809e7a952 *./src/packer.cc
+dbcdc351c4159d217288f4162c854d1e0c18f8e9 *./src/packer.cc
 218423b3ee3004a7698f6a8228ae6f67f19a4dc6 *./src/packer.h
 59f93ff4a50024bd34349b0c98d5b8f7fc8470e6 *./src/permutation.cc
 69db3be840f0ce074cfd51731553ad680a8d14b7 *./src/permutation.h
@@ -65,5 +65,5 @@ d14f84cf902170ff48510ebaa4a7365b2525f8eb *./src/random.cc
 55e7bb198358c358942c553bca178ad1658aa0d5 *./src/translate.py
 46025207b186c68b74526686560ed72decb7d64e *./src/vars.cc
 b496214fa6b932662b09dd09ab5d794359886ecd *./src/vars.h
-e79619686825538d84decf6db8a7b155c199e930 *./src/version.h
-50544f825c11e2e6ff69d5bfc9aeb5ec6bfb4d49 *./src/version.inc
+76f5e44bdaf3f7741b267862e3592bad54d2b2ee *./src/version.h
+6944736b02fac421d2c2a678cef9fc9c435fddb0 *./src/version.inc

bin/axis.exe

@@ -1 +1 @@
-BUILD_NUMBER=641
+BUILD_NUMBER=650

sha1sums

@@ -167,24 +167,22 @@ bool packer::packer_putc(void *file, uint8_t c){
       return false;
     }
     else{
-      uint16_t i,rle,cnode,rle_shift=0;;
       uint8_t *w;
       *cbuffer<<=1;
-      rle=symbol=vocroot-buf_size;
       if(buf_size){
-        cnode=vocbuf[symbol];
-        while(rle!=vocroot&&vocbuf[++rle]==cnode);
+        uint16_t rle,rle_shift;
+        rle=symbol=vocroot-buf_size;
+        while(rle!=vocroot&&vocbuf[++rle]==vocbuf[symbol]);
         rle-=symbol;
         length=LZ_MIN_MATCH;
         if(buf_size>LZ_MIN_MATCH&&rle<buf_size){
-          cnode=vocindx[hashes[symbol]].in;
+          uint16_t cnode=vocindx[hashes[symbol]].in;
           rle_shift=(uint16_t)(vocroot+LZ_BUF_SIZE-buf_size);
           while(cnode!=symbol){
             if(vocbuf[(uint16_t)(symbol+length)]==vocbuf[(uint16_t)(cnode+length)]){
-              uint16_t k=cnode;
-              i=symbol;
-              while(vocbuf[i++]==vocbuf[k]&&k++!=symbol);
-              if((i=(uint16_t)(i-symbol)-1)>=length){
+              uint16_t i=symbol,j=cnode;
+              while(i!=vocroot&&vocbuf[i]==vocbuf[j++]) i++;
+              if((i-=symbol)>=length){
                 //while buf_size==LZ_BUF_SIZE: minimal offset > 0x0104;
                 if(buf_size<LZ_BUF_SIZE){
                   if((uint16_t)(cnode-rle_shift)>0xfeff){
@@ -193,11 +191,7 @@ bool packer::packer_putc(void *file, uint8_t c){
                   };
                 };
                 offset=cnode;
-                if(i>=buf_size){
-                  length=buf_size;
-                  break;
-                }
-                else length=i;
+                if((length=i)==buf_size) break;
               };
             };
             cnode=vocarea[cnode];
@@ -231,12 +225,12 @@ bool packer::packer_putc(void *file, uint8_t c){
       if(!flags||eofs){
         *cbuffer<<=flags;
         w=cbuffer;
-        for(i=cpos-cbuffer;i;i--)
+        for(int i=cpos-cbuffer;i;i--)
           if(rc32_putc(file,*w++)) return true;
         flags=8;
         cpos=&cbuffer[1];
         if(eofs){
-          for(i=4;i;i--){
+          for(int i=4;i;i--){
             wbuf(file,*lowp);
             if(wpos==0) return true;
             low<<=8;

src/build.inc

@@ -1 +1 @@
-#define VERSION "0.8.28 (build 641 2023-05-08)"
+#define VERSION "0.8.29 (build 650 2023-05-14)"

src/packer.cc

@@ -1 +1 @@
-VERSION_STRING="0.8.28"
+VERSION_STRING="0.8.29"