Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Applied changes same as on previous source (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-01-11 08:30:12 +01:00
parent 05bb04cd29
commit d67caf1860
11 changed files with 75 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/lzma/C/7zCrc.c vendored
View File

@ -6,10 +6,7 @@
#define kCrcPoly 0xEDB88320 #define kCrcPoly 0xEDB88320
#ifdef MY_CPU_X86_OR_AMD64 #if defined(MY_CPU_LE)
#define CRC_NUM_TABLES 8
UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
#elif defined(MY_CPU_LE)
#define CRC_NUM_TABLES 4 #define CRC_NUM_TABLES 4
#else #else
#define CRC_NUM_TABLES 5 #define CRC_NUM_TABLES 5

4
3rdparty/lzma/C/Alloc.c vendored
View File

@ -3,7 +3,7 @@
Igor Pavlov Igor Pavlov
Public domain */ Public domain */
#ifdef _WIN32 #ifdef _WIN32_7Z
#include <windows.h> #include <windows.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -44,7 +44,7 @@ void MyFree(void *address)
free(address); free(address);
} }
#ifdef _WIN32 #ifdef _WIN32_7Z
void *MidAlloc(size_t size) void *MidAlloc(size_t size)
{ {

2
3rdparty/lzma/C/Alloc.h vendored
View File

@ -13,7 +13,7 @@ extern "C" {
void *MyAlloc(size_t size); void *MyAlloc(size_t size);
void MyFree(void *address); void MyFree(void *address);
#ifdef _WIN32 #ifdef _WIN32_7Z
void SetLargePageSize(); void SetLargePageSize();

36
3rdparty/lzma/C/CpuArch.c vendored
View File

@ -72,15 +72,27 @@ static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
#else #else
__asm__ __volatile__ ( #ifdef __PIC__
"cpuid" __asm__ __volatile__ (
: "=a" (*a) , "mov %%ebx, %%edi;"
"=b" (*b) , "cpuid;"
"=c" (*c) , "xchgl %%ebx, %%edi;"
"=d" (*d) : "=a" (*a) ,
: "0" (function)) ; "=D" (*b) , /* edi */
"=c" (*c) ,
"=d" (*d)
: "0" (function)) ;
#else // __PIC__
__asm__ __volatile__ (
"cpuid"
: "=a" (*a) ,
"=b" (*b) ,
"=c" (*c) ,
"=d" (*d)
: "0" (function)) ;
#endif // __PIC__
#endif #endif
#else #else
@ -123,7 +135,7 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
return -1; return -1;
} }
Bool CPU_Is_InOrder() Bool CPU_Is_InOrder(void)
{ {
Cx86cpuid p; Cx86cpuid p;
int firm; int firm;
@ -142,8 +154,8 @@ Bool CPU_Is_InOrder()
return True; return True;
} }
#if !defined(MY_CPU_AMD64) && defined(_WIN32) #if !defined(MY_CPU_AMD64) && defined(_WIN32_7Z)
static Bool CPU_Sys_Is_SSE_Supported() static Bool CPU_Sys_Is_SSE_Supported(void)
{ {
OSVERSIONINFO vi; OSVERSIONINFO vi;
vi.dwOSVersionInfoSize = sizeof(vi); vi.dwOSVersionInfoSize = sizeof(vi);
@ -156,7 +168,7 @@ static Bool CPU_Sys_Is_SSE_Supported()
#define CHECK_SYS_SSE_SUPPORT #define CHECK_SYS_SSE_SUPPORT
#endif #endif
Bool CPU_Is_Aes_Supported() Bool CPU_Is_Aes_Supported(void)
{ {
Cx86cpuid p; Cx86cpuid p;
CHECK_SYS_SSE_SUPPORT CHECK_SYS_SSE_SUPPORT

15
3rdparty/lzma/C/CpuArch.h vendored
View File

@ -20,7 +20,7 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla
#define MY_CPU_AMD64 #define MY_CPU_AMD64
#endif #endif
#if defined(MY_CPU_AMD64) || defined(_M_IA64) #ifdef PTR64
#define MY_CPU_64BIT #define MY_CPU_64BIT
#endif #endif
@ -36,11 +36,11 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla
#define MY_CPU_32BIT #define MY_CPU_32BIT
#endif #endif
#if defined(_WIN32) && defined(_M_ARM) #if defined(_WIN32_7Z) && defined(_M_ARM)
#define MY_CPU_ARM_LE #define MY_CPU_ARM_LE
#endif #endif
#if defined(_WIN32) && defined(_M_IA64) #if defined(_WIN32_7Z) && defined(_M_IA64)
#define MY_CPU_IA64_LE #define MY_CPU_IA64_LE
#endif #endif
@ -52,7 +52,7 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of pla
#define MY_CPU_LE #define MY_CPU_LE
#endif #endif
#if defined(__BIG_ENDIAN__) || defined(__m68k__) || defined(__ARMEB__) || defined(__MIPSEB__) #ifdef BIGENDIAN
#define MY_CPU_BE #define MY_CPU_BE
#endif #endif
@ -97,7 +97,8 @@ Stop_Compiling_Bad_Endian
#endif #endif
#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300) #if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (defined(_MSC_VER) && (_MSC_VER >= 1300))
#include <stdlib.h>
#pragma intrinsic(_byteswap_ulong) #pragma intrinsic(_byteswap_ulong)
#pragma intrinsic(_byteswap_uint64) #pragma intrinsic(_byteswap_uint64)
@ -145,8 +146,8 @@ int x86cpuid_GetFirm(const Cx86cpuid *p);
#define x86cpuid_GetModel(p) (((p)->ver >> 4) & 0xF00F) #define x86cpuid_GetModel(p) (((p)->ver >> 4) & 0xF00F)
#define x86cpuid_GetStepping(p) ((p)->ver & 0xF) #define x86cpuid_GetStepping(p) ((p)->ver & 0xF)
Bool CPU_Is_InOrder(); Bool CPU_Is_InOrder(void);
Bool CPU_Is_Aes_Supported(); Bool CPU_Is_Aes_Supported(void);
#endif #endif

21
3rdparty/lzma/C/LzmaDec.c vendored
View File

@ -967,6 +967,27 @@ SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAll
return SZ_OK; return SZ_OK;
} }
// why isn't there an interface to pass in the properties directly????
SRes LzmaDec_Allocate_MAME(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
{
SizeT dicBufSize;
RINOK(LzmaDec_AllocateProbs2(p, propNew, alloc));
dicBufSize = propNew->dicSize;
if (p->dic == 0 || dicBufSize != p->dicBufSize)
{
LzmaDec_FreeDict(p, alloc);
p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
if (p->dic == 0)
{
LzmaDec_FreeProbs(p, alloc);
return SZ_ERROR_MEM;
}
}
p->dicBufSize = dicBufSize;
p->prop = *propNew;
return SZ_OK;
}
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
ELzmaStatus *status, ISzAlloc *alloc) ELzmaStatus *status, ISzAlloc *alloc)

5
3rdparty/lzma/C/LzmaDec.h vendored
View File

@ -224,6 +224,11 @@ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
ELzmaStatus *status, ISzAlloc *alloc); ELzmaStatus *status, ISzAlloc *alloc);
/*
* Why isn't there an interface to pass in the properties directly????
*/
SRes LzmaDec_Allocate_MAME(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

12
3rdparty/lzma/C/LzmaEnc.c vendored
View File

@ -1905,11 +1905,13 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
{ {
UInt32 beforeSize = kNumOpts; UInt32 beforeSize = kNumOpts;
Bool btMode;
if (!RangeEnc_Alloc(&p->rc, alloc))
return SZ_ERROR_MEM;
btMode = (p->matchFinderBase.btMode != 0);
#ifndef _7ZIP_ST #ifndef _7ZIP_ST
Bool btMode;
#endif
if (!RangeEnc_Alloc(&p->rc, alloc))
return SZ_ERROR_MEM;
#ifndef _7ZIP_ST
btMode = (p->matchFinderBase.btMode != 0);
p->mtMode = (p->multiThread && !p->fastMode && btMode); p->mtMode = (p->multiThread && !p->fastMode && btMode);
#endif #endif
@ -2085,8 +2087,6 @@ void LzmaEnc_Finish(CLzmaEncHandle pp)
CLzmaEnc *p = (CLzmaEnc *)pp; CLzmaEnc *p = (CLzmaEnc *)pp;
if (p->mtMode) if (p->mtMode)
MatchFinderMt_ReleaseStream(&p->matchFinderMt); MatchFinderMt_ReleaseStream(&p->matchFinderMt);
#else
pp = pp;
#endif #endif
} }

2
3rdparty/lzma/C/Ppmd7.c vendored
View File

@ -2,7 +2,7 @@
2010-03-12 : Igor Pavlov : Public domain 2010-03-12 : Igor Pavlov : Public domain
This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */ This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
#include <memory.h> #include <string.h>
#include "Ppmd7.h" #include "Ppmd7.h"

2
3rdparty/lzma/C/Threads.c vendored
View File

@ -1,7 +1,7 @@
/* Threads.c -- multithreading library /* Threads.c -- multithreading library
2009-09-20 : Igor Pavlov : Public domain */ 2009-09-20 : Igor Pavlov : Public domain */
#ifndef _WIN32_WCE #ifndef _WIN32_7Z_WCE
#include <process.h> #include <process.h>
#endif #endif

8
3rdparty/lzma/C/Types.h vendored
View File

@ -6,7 +6,7 @@
#include <stddef.h> #include <stddef.h>
#ifdef _WIN32 #ifdef _WIN32_7Z
#include <windows.h> #include <windows.h>
#endif #endif
@ -42,7 +42,7 @@ EXTERN_C_BEGIN
typedef int SRes; typedef int SRes;
#ifdef _WIN32 #ifdef _WIN32_7Z
typedef DWORD WRes; typedef DWORD WRes;
#else #else
typedef int WRes; typedef int WRes;
@ -97,7 +97,7 @@ typedef int Bool;
#define False 0 #define False 0
#ifdef _WIN32 #ifdef _WIN32_7Z
#define MY_STD_CALL __stdcall #define MY_STD_CALL __stdcall
#else #else
#define MY_STD_CALL #define MY_STD_CALL
@ -233,7 +233,7 @@ typedef struct
#define IAlloc_Alloc(p, size) (p)->Alloc((p), size) #define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
#define IAlloc_Free(p, a) (p)->Free((p), a) #define IAlloc_Free(p, a) (p)->Free((p), a)
#ifdef _WIN32 #ifdef _WIN32_7Z
#define CHAR_PATH_SEPARATOR '\\' #define CHAR_PATH_SEPARATOR '\\'
#define WCHAR_PATH_SEPARATOR L'\\' #define WCHAR_PATH_SEPARATOR L'\\'