Merge pull request #79 from Cyan4973/dev

Dev
facebook · Nov 29, 2015 · e07e66c · e07e66c
2 parents dc1af5f + 305c325
commit e07e66c
Show file tree

Hide file tree

Showing 41 changed files with 9,036 additions and 2,070 deletions.
diff --git a/Makefile b/Makefile
@@ -32,12 +32,19 @@
 # ################################################################
 
 # Version number
-export VERSION := 0.3.6
+export VERSION := 0.4.0
 
 PRGDIR  = programs
 ZSTDDIR = lib
 
-.PHONY: clean
+# Define nul output
+ifneq (,$(filter Windows%,$(OS)))
+VOID = nul
+else
+VOID = /dev/null
+endif
+
+.PHONY: default all zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
 
 default: zstdprogram
 
@@ -49,8 +56,8 @@ zstdprogram:
 	$(MAKE) -C $(PRGDIR)
 
 clean:
-	$(MAKE) -C $(ZSTDDIR) $@
-	$(MAKE) -C $(PRGDIR) $@
+	@$(MAKE) -C $(ZSTDDIR) $@ > $(VOID)
+	@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
 	@echo Cleaning completed
 
 

diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+v0.4.0
+Command line utility is now compatible with high compression levels 
+Removed zstdhc => merged into zstd
+Added : ZBUFF API (see zstd_buffered.h)
+Rolling buffer support
+
 v0.3.6
 small blocks params
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ For a taste of its performance, here are a few benchmark numbers from a number o
 |Name             | Ratio | C.speed | D.speed |
 |-----------------|-------|--------:|--------:|
 |                 |       |   MB/s  |  MB/s   |
-| **zstd 0.3**    |**2.858**|**280**| **670** |
+| **zstd 0.4**    |**2.872**|**280**| **670** |
 | [zlib] 1.2.8 -1 | 2.730 |    70   |   300   | 
 | QuickLZ 1.5.1b6 | 2.237 |   370   |   415   |
 | LZO 2.06        | 2.106 |   400   |   580   |

diff --git a/images/CSpeed.png b/images/CSpeed.png
diff --git a/images/DSpeed.png b/images/DSpeed.png
diff --git a/lib/Makefile b/lib/Makefile
@@ -27,8 +27,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
 # You can contact the author at :
+#  - ZSTD homepage : http://www.zstd.net
 #  - ZSTD source repository : https://github.com/Cyan4973/zstd
-#  - Public forum : https://groups.google.com/forum/#!forum/lz4c
 # ################################################################
 
 # Version numbers
@@ -63,14 +63,18 @@ else
 	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
 endif
 
-default: libzstd
 
-all: libzstd
+.PHONY: default all clean install uninstall
 
-libzstd: zstd.c huff0.c fse.c
+default: clean libzstd
+
+all: clean libzstd
+
+libzstd: zstd_compress.c zstd_decompress.c huff0.c fse.c \
+         legacy/zstd_v01.c legacy/zstd_v02.c legacy/zstd_v03.c
 	@echo compiling static library
 	@$(CC) $(FLAGS) -c $^
-	@$(AR) rcs libzstd.a zstd.o huff0.o fse.o
+	@$(AR) rcs libzstd.a *.o
 	@echo compiling dynamic library $(LIBVER)
 	@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
 	@echo creating versioned links

diff --git a/lib/bitstream.h b/lib/bitstream.h
@@ -208,7 +208,7 @@ MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC)
     MEM_writeLEST(bitC->ptr, bitC->bitContainer);
     bitC->ptr += nbBytes;
     bitC->bitPos &= 7;
-    bitC->bitContainer >>= nbBytes*8;
+    bitC->bitContainer >>= nbBytes*8;   /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */
 }
 
 MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC)
@@ -218,7 +218,7 @@ MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC)
     bitC->ptr += nbBytes;
     if (bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr;
     bitC->bitPos &= 7;
-    bitC->bitContainer >>= nbBytes*8;
+    bitC->bitContainer >>= nbBytes*8;   /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */
 }
 
 /*! BIT_closeCStream

diff --git a/lib/error.h b/lib/error.h
@@ -68,9 +68,10 @@ extern "C" {
 
 #define ERROR_LIST(ITEM) \
         ITEM(PREFIX(No_Error)) ITEM(PREFIX(GENERIC)) \
-        ITEM(PREFIX(memory_allocation)) \
+        ITEM(PREFIX(prefix_unknown)) ITEM(PREFIX(frameParameter_unsupported)) ITEM(PREFIX(frameParameter_unsupportedBy32bitsImplementation)) \
+        ITEM(PREFIX(init_missing)) ITEM(PREFIX(memory_allocation)) \
         ITEM(PREFIX(dstSize_tooSmall)) ITEM(PREFIX(srcSize_wrong)) \
-        ITEM(PREFIX(prefix_unknown)) ITEM(PREFIX(corruption_detected)) \
+        ITEM(PREFIX(corruption_detected)) \
         ITEM(PREFIX(tableLog_tooLarge)) ITEM(PREFIX(maxSymbolValue_tooLarge)) ITEM(PREFIX(maxSymbolValue_tooSmall)) \
         ITEM(PREFIX(maxCode))
 

diff --git a/lib/huff0.c b/lib/huff0.c
@@ -1495,10 +1495,7 @@ static inline size_t HUF_decodeStreamX6(BYTE* p, BIT_DStream_t* bitDPtr, BYTE* c
     while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) && (p <= pEnd-4))
         HUF_DECODE_SYMBOLX6_0(p, bitDPtr);
 
-    while (p <= pEnd-4)
-        HUF_DECODE_SYMBOLX6_0(p, bitDPtr);   /* no need to reload : reached the end of DStream */
-
-    while (p < pEnd)
+    while ((BIT_reloadDStream(bitDPtr) <= BIT_DStream_endOfBuffer) && (p < pEnd))
         p += HUF_decodeLastSymbolsX6(p, (U32)(pEnd-p), bitDPtr, dd, ds, dtLog);
 
     return p-pStart;

diff --git a/lib/legacy/zstd_legacy.h b/lib/legacy/zstd_legacy.h
@@ -1,5 +1,5 @@
 /*
-    zstd_v02 - decoder for 0.2 format
+    zstd_legacy - decoder for legacy format
     Header File
     Copyright (C) 2015, Yann Collet.
 
@@ -44,13 +44,15 @@ extern "C" {
 #include "error.h"      /* ERROR */
 #include "zstd_v01.h"
 #include "zstd_v02.h"
+#include "zstd_v03.h"
 
 MEM_STATIC unsigned ZSTD_isLegacy (U32 magicNumberLE)
 {
 	switch(magicNumberLE)
 	{
 		case ZSTDv01_magicNumberLE :
-		case ZSTDv02_magicNumber : return 1;
+		case ZSTDv02_magicNumber : 
+		case ZSTDv03_magicNumber : return 1;
 		default : return 0;
 	}
 }
@@ -67,6 +69,8 @@ MEM_STATIC size_t ZSTD_decompressLegacy(
 			return ZSTDv01_decompress(dst, maxOriginalSize, src, compressedSize);
 		case ZSTDv02_magicNumber :
 			return ZSTDv02_decompress(dst, maxOriginalSize, src, compressedSize);
+		case ZSTDv03_magicNumber :
+			return ZSTDv03_decompress(dst, maxOriginalSize, src, compressedSize);
 		default :
 		    return ERROR(prefix_unknown);
 	}

diff --git a/lib/legacy/zstd_v02.c b/lib/legacy/zstd_v02.c
@@ -475,7 +475,7 @@ MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits);
 MEM_STATIC unsigned BIT_highbit32 (register U32 val)
 {
 #   if defined(_MSC_VER)   /* Visual */
-    unsigned long r;
+    unsigned long r=0;
     _BitScanReverse ( &r, val );
     return (unsigned) r;
 #   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* Use GCC Intrinsic */
@@ -3155,6 +3155,7 @@ static size_t ZSTD_decodeLiteralsBlock(void* ctx,
             {
 				if (litSize > srcSize-3) return ERROR(corruption_detected);
 				memcpy(dctx->litBuffer, istart, litSize);
+				dctx->litPtr = dctx->litBuffer;
 				dctx->litBufSize = BLOCKSIZE;
 				dctx->litSize = litSize;
 				return litSize+3;