recode makefile; add _IS_NEED_decompressor_ldef_replace_zlib;

Author: housisong

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 full changelog at: https://github.com/sisong/HDiffPatch/commits   
 
-## [v4.8.0](https://github.com/sisong/HDiffPatch/tree/v4.8.0) - 2024-07-25
+## [v4.8.0](https://github.com/sisong/HDiffPatch/tree/v4.8.0) - 2024-07-26
 ### Added
-* cmdline hdiffz support option "-c-ldef-{1..12}", used libdeflate compressor; compatible with -c-zlib, faster or better than zlib;
+* cmdline hdiffz support option "-c-ldef-{1..12}"; used libdeflate compressor, compatible with -c-zlib, faster or better than zlib;
  (hpatchz now default closed libdeflate decompressor)
 * add plugin ldefCompressPlugin, pldefCompressPlugin, ldefDecompressPlugin;
 ### Changed
@@ -62,7 +62,7 @@ if diffFile created by empty oldPath, then extract with default option `$selfExt
 
 ## [v4.3.0](https://github.com/sisong/HDiffPatch/tree/v4.3.0) - 2022-09-23
 ### Changed
-* recode some patch error code: decompresser errors, file error, disk space full error, jni error
+* recode some patch error code: decompressor errors, file error, disk space full error, jni error
 
 ## [v4.2.0](https://github.com/sisong/HDiffPatch/tree/v4.2.0) - 2022-05-15
 ### Added

Makefile

@@ -11,8 +11,12 @@ else
 endif
 # 0: not need lzma;  1: compile lzma source code;  2: used -llzma to link lzma lib;
 LZMA     := 1
+# lzma decompressor used arm64 asm optimize? 
 ARM64ASM := 0
-RISCV32  := 0
+# lzma only can used software CRC? (no hardware CRC)
+USE_CRC_EMU := 0
+# supported atomic uint64?
+ATOMIC_U64 := 1
 # 0: not need zstd;  1: compile zstd source code;  2: used -lzstd to link zstd lib;
 ZSTD     := 1
 MD5      := 1
@@ -23,9 +27,9 @@ CL  	 := 0
 M32      := 0
 # build for out min size
 MINS     := 0
-# support VCDIFF? 
+# need support VCDIFF? 
 VCD      := 1
-# support bsdiff&bspatch?
+# need support bsdiff&bspatch?
 BSD      := 1
 ifeq ($(OS),Windows_NT) # mingw?
   CC    := gcc
@@ -44,7 +48,7 @@ endif
 ifeq ($(LDEF),0)
 else
   ifeq ($(ZLIB),2)
-  $(error error: libdeflate not support -lz! need zlib source code, set ZLIB=1 continue)
+  $(error error: now libdeflate decompressor not support -lz! need zlib source code, set ZLIB=1 continue)
   else
     ifeq ($(ZLIB),0)
     $(warning warning: libdeflate can't support all of the deflate code, when no zlib source code)
@@ -238,8 +242,7 @@ DEF_FLAGS := \
     -D_IS_NEED_DEFAULT_CompressPlugin=0 \
     -D_IS_NEED_ALL_ChecksumPlugin=0 \
     -D_IS_NEED_DEFAULT_ChecksumPlugin=0 
-ifeq ($(RISCV32),0)
-else
+ifeq ($(ATOMIC_U64),0)
   DEF_FLAGS += -D_IS_NO_ATOMIC_U64=1
 endif
 ifeq ($(M32),0)
@@ -321,9 +324,10 @@ else
     else
       DEF_FLAGS += -DZ7_LZMA_DEC_OPT
     endif
-    ifeq ($(VCD),0)
-    else
-      DEF_FLAGS += -DUSE_CRC_EMU
+    ifneq ($(VCD),0)
+      ifneq ($(USE_CRC_EMU),0)
+        DEF_FLAGS += -DUSE_CRC_EMU
+      endif
     endif
   endif
 endif

builds/xcode_iOS_hpatchz/hpatchz.xcodeproj/project.pbxproj

@@ -510,7 +510,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					Z7_ST,
-					USE_CRC_EMU,
 					ZSTD_STATIC_LINKING_ONLY,
 					"ZSTD_HAVE_WEAK_SYMBOLS=0",
 					"ZSTD_TRACE=0",
@@ -591,7 +590,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
 					Z7_ST,
-					USE_CRC_EMU,
 					ZSTD_STATIC_LINKING_ONLY,
 					"ZSTD_HAVE_WEAK_SYMBOLS=0",
 					"ZSTD_TRACE=0",
@@ -657,7 +655,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					Z7_ST,
-					USE_CRC_EMU,
 					ZSTD_STATIC_LINKING_ONLY,
 					"ZSTD_HAVE_WEAK_SYMBOLS=0",
 					"ZSTD_TRACE=0",
@@ -672,6 +669,7 @@
                     _CompressPlugin_zstd,
                     _CompressPlugn_7zXZ,
 					Z7_LZMA_DEC_OPT,
+					USE_CRC_EMU,
 					"$(inherited)",
 				);
 				OTHER_LDFLAGS = "-ObjC";
@@ -688,7 +686,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
 					Z7_ST,
-					USE_CRC_EMU,
 					ZSTD_STATIC_LINKING_ONLY,
 					"ZSTD_HAVE_WEAK_SYMBOLS=0",
 					"ZSTD_TRACE=0",
@@ -703,6 +700,7 @@
                     _CompressPlugin_zstd,
                     _CompressPlugn_7zXZ,
 					Z7_LZMA_DEC_OPT,
+					USE_CRC_EMU,
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";

hdiffz.cpp

@@ -66,27 +66,30 @@
 #if (_IS_NEED_DEFAULT_CompressPlugin)
 //===== select needs decompress plugins or change to your plugin=====
 #   define _CompressPlugin_zlib  // memory requires less
-#   define _CompressPlugin_ldef  // faster or better compress than zlib / (now used ldef+zlib decompresser)
+#   define _CompressPlugin_ldef  // faster or better compress than zlib / (now used ldef+zlib decompressor)
 #   define _CompressPlugin_bz2
 #   define _CompressPlugin_lzma  // better compresser
 #   define _CompressPlugin_lzma2 // better compresser
-#   define _CompressPlugin_zstd  // better compresser / faster decompresser
+#   define _CompressPlugin_zstd  // better compresser / faster decompressor
 #if (_IS_NEED_VCDIFF)
 #   define _CompressPlugin_7zXZ  //only for VCDIFF, used lzma2
 #endif
 
 #endif
 #if (_IS_NEED_ALL_CompressPlugin)
 //===== select needs decompress plugins or change to your plugin=====
-#   define _CompressPlugin_lz4   // faster compresser / faster decompresser
-#   define _CompressPlugin_lz4hc // compress slower & better than lz4 / (used lz4 decompresser) 
-#   define _CompressPlugin_brotli// better compresser / faster decompresser
+#   define _CompressPlugin_lz4   // faster compresser / faster decompressor
+#   define _CompressPlugin_lz4hc // compress slower & better than lz4 / (used lz4 decompressor) 
+#   define _CompressPlugin_brotli// better compresser / faster decompressor
 #   define _CompressPlugin_lzham // better compresser / decompress faster than lzma2
 #   define _CompressPlugin_tuz   // slower compresser / decompress requires tiny code(.text) & ram
 #endif
 #ifdef _CompressPlugin_ldef
 #   ifndef _CompressPlugin_ldef_is_use_zlib
-#       define _CompressPlugin_ldef_is_use_zlib 1 //now ldef need zlib decompresser
+#       define _CompressPlugin_ldef_is_use_zlib         1 //now ldef need zlib decompressor for any all of deflate code
+#   endif
+#   ifndef _IS_NEED_decompressor_ldef_replace_zlib
+#       define _IS_NEED_decompressor_ldef_replace_zlib  0 
 #   endif
 #endif
 
@@ -517,9 +520,7 @@ static hpatch_BOOL _getIsVcDiffFile(const char* diffFileName) {
 #define _try_rt_dec(dec) { if (dec.is_can_open(compressType)) return &dec; }
 
 static hpatch_TDecompress* __find_decompressPlugin(const char* compressType){
-#if (0) //now closed ldef decompressor// ((defined(_CompressPlugin_ldef))&&_CompressPlugin_ldef_is_use_zlib)
-    //NOTE: if _CompressPlugin_ldef_is_use_zlib==0, ldefDecompressPlugin can't support all of deflate encoding, only support for (p)ldefCompressPlugin!
-    //  if _CompressPlugin_ldef_is_use_zlib==1, ldefDecompressPlugin can support all of deflate encoding by zlib decompressor.
+#if ((defined(_CompressPlugin_ldef))&&_IS_NEED_decompressor_ldef_replace_zlib)
     _try_rt_dec(ldefDecompressPlugin);
 #else
 #  ifdef  _CompressPlugin_zlib

hpatchz.c

@@ -78,8 +78,14 @@
 #endif
 #if (_IS_NEED_DEFAULT_CompressPlugin)
 //===== select needs decompress plugins or change to your plugin=====
-#   define _CompressPlugin_zlib
-//#   define _CompressPlugin_ldef
+#   ifndef _IS_NEED_decompressor_ldef_replace_zlib
+#       define _IS_NEED_decompressor_ldef_replace_zlib  0 
+#   endif
+#   if (_IS_NEED_decompressor_ldef_replace_zlib)
+#       define _CompressPlugin_ldef  //optimized zlib&ldef's deflate code decompress speed by libdeflate
+#   else
+#       define _CompressPlugin_zlib
+#   endif
 #   define _CompressPlugin_bz2
 #   define _CompressPlugin_lzma
 #   define _CompressPlugin_lzma2
@@ -97,10 +103,10 @@
 #endif
 #ifdef _CompressPlugin_ldef
 #   ifndef _CompressPlugin_ldef_is_use_zlib
-#       define _CompressPlugin_ldef_is_use_zlib 1 //now ldef need zlib decompresser
+#       define _CompressPlugin_ldef_is_use_zlib         1 //now ldef need zlib decompressor for any all of deflate code
 #   endif
-#   if ((defined(_CompressPlugin_zlib))&&_CompressPlugin_ldef_is_use_zlib)
-#       //undef _CompressPlugin_zlib
+#   if (_IS_NEED_decompressor_ldef_replace_zlib&&(defined(_CompressPlugin_zlib)))
+#       undef _CompressPlugin_zlib
 #   endif
 #endif
 
@@ -790,9 +796,7 @@ int hpatch_cmd_line(int argc, const char * argv[]){
 #define _try_rt_dec(dec) { if (dec.is_can_open(compressType)) return &dec; }
 
 static const hpatch_TDecompress* __find_decompressPlugin(const char* compressType){
-#if (0) //now closed ldef decompressor// ((defined(_CompressPlugin_ldef))&&_CompressPlugin_ldef_is_use_zlib)
-    //NOTE: if _CompressPlugin_ldef_is_use_zlib==0, ldefDecompressPlugin can't support all of deflate encoding, only support for (p)ldefCompressPlugin!
-    //  if _CompressPlugin_ldef_is_use_zlib==1, ldefDecompressPlugin can support all of deflate encoding by zlib decompressor.
+#if ((defined(_CompressPlugin_ldef))&&_IS_NEED_decompressor_ldef_replace_zlib)
     _try_rt_dec(ldefDecompressPlugin);
 #else
 #  ifdef  _CompressPlugin_zlib