AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected lz4io

Browse Source
This commit is contained in:
Yann Collet 2014-11-23 01:14:04 +01:00
parent b3b207c4db
commit 2ad37dbe58
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lz4.c
View File

@ -44,7 +44,7 @@
/* /*
* CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS : * CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS :
* You can force the code to use unaligned memory access if you know your CPU can handle it. * You can force the code to use unaligned memory access if you know your CPU can handle it efficiently.
*/ */
/* #define CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS 1 */ /* #define CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS 1 */
@ -58,7 +58,9 @@
#if defined(CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS) \ #if defined(CPU_HAS_EFFICIENT_UNALIGNED_MEMORY_ACCESS) \
|| defined(__ARM_FEATURE_UNALIGNED) \ || defined(__ARM_FEATURE_UNALIGNED) \
|| defined(__i386__) || defined(__x86_64__) \ || defined(__i386__) || defined(__x86_64__) \
|| defined(_M_IX86) || defined(_M_X64) || defined(_M_IX86) || defined(_M_X64) \
|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_8__) \
|| (defined(_M_ARM) && (_M_ARM >= 7))
# define LZ4_UNALIGNED_ACCESS 1 # define LZ4_UNALIGNED_ACCESS 1
#else #else
# define LZ4_UNALIGNED_ACCESS 0 # define LZ4_UNALIGNED_ACCESS 0
@ -153,6 +155,7 @@ static U16 LZ4_readLE16(const void* memPtr)
{ {
if ((LZ4_UNALIGNED_ACCESS) && (LZ4_isLittleEndian())) if ((LZ4_UNALIGNED_ACCESS) && (LZ4_isLittleEndian()))
return *(U16*)memPtr; return *(U16*)memPtr;
else
{ {
const BYTE* p = memPtr; const BYTE* p = memPtr;
return (U16)((U16)p[0] + (p[1]<<8)); return (U16)((U16)p[0] + (p[1]<<8));
@ -166,6 +169,7 @@ static void LZ4_writeLE16(void* memPtr, U16 value)
*(U16*)memPtr = value; *(U16*)memPtr = value;
return; return;
} }
else
{ {
BYTE* p = memPtr; BYTE* p = memPtr;
p[0] = (BYTE) value; p[0] = (BYTE) value;
@ -202,6 +206,7 @@ static void LZ4_copy4(void* dstPtr, const void* srcPtr)
*(U32*)dstPtr = *(U32*)srcPtr; *(U32*)dstPtr = *(U32*)srcPtr;
return; return;
} }
else
{ {
BYTE* d = dstPtr; BYTE* d = dstPtr;
const BYTE* s = srcPtr; const BYTE* s = srcPtr;
@ -216,6 +221,7 @@ static U64 LZ4_readLE64(const void* memPtr)
{ {
if ((LZ4_UNALIGNED_ACCESS) && (LZ4_isLittleEndian())) if ((LZ4_UNALIGNED_ACCESS) && (LZ4_isLittleEndian()))
return *(U64*)memPtr; return *(U64*)memPtr;
else
{ {
const BYTE* p = memPtr; const BYTE* p = memPtr;
return (U64)((U64)p[0] + (p[1]<<8) + (p[2]<<16) + ((U64)p[3]<<24) + return (U64)((U64)p[0] + (p[1]<<8) + (p[2]<<16) + ((U64)p[3]<<24) +
@ -249,6 +255,7 @@ static void LZ4_copy8(void* dstPtr, const void* srcPtr)
((U32*)dstPtr)[1] = ((U32*)srcPtr)[1]; ((U32*)dstPtr)[1] = ((U32*)srcPtr)[1];
return; return;
} }
else
{ {
BYTE* d = dstPtr; BYTE* d = dstPtr;
const BYTE* s = srcPtr; const BYTE* s = srcPtr;

2
lz4.h
View File

@ -48,7 +48,7 @@ extern "C" {
**************************************/ **************************************/
#define LZ4_VERSION_MAJOR 1 /* for major interface/format changes */ #define LZ4_VERSION_MAJOR 1 /* for major interface/format changes */
#define LZ4_VERSION_MINOR 4 /* for minor interface/format changes */ #define LZ4_VERSION_MINOR 4 /* for minor interface/format changes */
#define LZ4_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */ #define LZ4_VERSION_RELEASE 1 /* for tweaks, bug-fixes, or development */
#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE) #define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
int LZ4_versionNumber (void); int LZ4_versionNumber (void);

2
programs/lz4cli.c
View File

@ -113,7 +113,7 @@
//**************************** //****************************
#define COMPRESSOR_NAME "LZ4 Compression CLI" #define COMPRESSOR_NAME "LZ4 Compression CLI"
#ifndef LZ4_VERSION #ifndef LZ4_VERSION
# define LZ4_VERSION "r122" # define LZ4_VERSION "r125"
#endif #endif
#define AUTHOR "Yann Collet" #define AUTHOR "Yann Collet"
#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__ #define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__

2
programs/lz4io.c
View File

@ -357,7 +357,7 @@ int LZ4IO_compressFilename_Legacy(char* input_filename, char* output_filename, i
static void* LZ4IO_LZ4_createStream (const char* inputBuffer) static void* LZ4IO_LZ4_createStream (const char* inputBuffer)
{ {
(void)inputBuffer; (void)inputBuffer;
return calloc(4, LZ4_STREAMSIZE_U32); return calloc(8, LZ4_STREAMSIZE_U64);
} }
static int LZ4IO_LZ4_compress_limitedOutput_continue (void* ctx, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel) static int LZ4IO_LZ4_compress_limitedOutput_continue (void* ctx, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel)