Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/lzma_sdk/chromium.patch

Issue 1700453002: Update lzma_sdk sources to 15.14. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium modifications Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/lzma_sdk/Types.h ('k') | third_party/lzma_sdk/lzma_sdk.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/lzma_sdk/chromium.patch
diff --git a/third_party/lzma_sdk/chromium.patch b/third_party/lzma_sdk/chromium.patch
index 7cd1ea88de9a0fcf2830b8c5348ff4ec6d911ff9..ec15101c3de398225835f5d061ceca14e08eb7cf 100644
--- a/third_party/lzma_sdk/chromium.patch
+++ b/third_party/lzma_sdk/chromium.patch
@@ -1,357 +1,27 @@
-1,168c1,187
-< /* CpuArch.c -- CPU specific code
-< 2010-10-26: Igor Pavlov : Public domain */
-<
-< #include "CpuArch.h"
-<
-< #ifdef MY_CPU_X86_OR_AMD64
-<
-< #if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__)
-< #define USE_ASM
-< #endif
-<
-< #if defined(USE_ASM) && !defined(MY_CPU_AMD64)
-< static UInt32 CheckFlag(UInt32 flag)
-< {
-< #ifdef _MSC_VER
-< __asm pushfd;
-< __asm pop EAX;
-< __asm mov EDX, EAX;
-< __asm xor EAX, flag;
-< __asm push EAX;
-< __asm popfd;
-< __asm pushfd;
-< __asm pop EAX;
-< __asm xor EAX, EDX;
-< __asm push EDX;
-< __asm popfd;
-< __asm and flag, EAX;
-< #else
-< __asm__ __volatile__ (
-< "pushf\n\t"
-< "pop %%EAX\n\t"
-< "movl %%EAX,%%EDX\n\t"
-< "xorl %0,%%EAX\n\t"
-< "push %%EAX\n\t"
-< "popf\n\t"
-< "pushf\n\t"
-< "pop %%EAX\n\t"
-< "xorl %%EDX,%%EAX\n\t"
-< "push %%EDX\n\t"
-< "popf\n\t"
-< "andl %%EAX, %0\n\t":
-< "=c" (flag) : "c" (flag));
-< #endif
-< return flag;
-< }
-< #define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return False;
-< #else
-< #define CHECK_CPUID_IS_SUPPORTED
-< #endif
-<
-< static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
-< {
-< #ifdef USE_ASM
-<
-< #ifdef _MSC_VER
-<
-< UInt32 a2, b2, c2, d2;
-< __asm xor EBX, EBX;
-< __asm xor ECX, ECX;
-< __asm xor EDX, EDX;
-< __asm mov EAX, function;
-< __asm cpuid;
-< __asm mov a2, EAX;
-< __asm mov b2, EBX;
-< __asm mov c2, ECX;
-< __asm mov d2, EDX;
-<
-< *a = a2;
-< *b = b2;
-< *c = c2;
-< *d = d2;
-<
-< #else
-<
-< __asm__ __volatile__ (
-< "cpuid"
-< : "=a" (*a) ,
-< "=b" (*b) ,
-< "=c" (*c) ,
-< "=d" (*d)
-< : "0" (function)) ;
-<
-< #endif
-<
-< #else
-<
-< int CPUInfo[4];
-< __cpuid(CPUInfo, function);
-< *a = CPUInfo[0];
-< *b = CPUInfo[1];
-< *c = CPUInfo[2];
-< *d = CPUInfo[3];
-<
-< #endif
-< }
-<
-< Bool x86cpuid_CheckAndRead(Cx86cpuid *p)
-< {
-< CHECK_CPUID_IS_SUPPORTED
-< MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
-< MyCPUID(1, &p->ver, &p->b, &p->c, &p->d);
-< return True;
-< }
-<
-< static UInt32 kVendors[][3] =
-< {
-< { 0x756E6547, 0x49656E69, 0x6C65746E},
-< { 0x68747541, 0x69746E65, 0x444D4163},
-< { 0x746E6543, 0x48727561, 0x736C7561}
-< };
-<
-< int x86cpuid_GetFirm(const Cx86cpuid *p)
-< {
-< unsigned i;
-< for (i = 0; i < sizeof(kVendors) / sizeof(kVendors[i]); i++)
-< {
-< const UInt32 *v = kVendors[i];
-< if (v[0] == p->vendor[0] &&
-< v[1] == p->vendor[1] &&
-< v[2] == p->vendor[2])
-< return (int)i;
-< }
-< return -1;
-< }
-<
-< Bool CPU_Is_InOrder()
-< {
-< Cx86cpuid p;
-< int firm;
-< UInt32 family, model;
-< if (!x86cpuid_CheckAndRead(&p))
-< return True;
-< family = x86cpuid_GetFamily(&p);
-< model = x86cpuid_GetModel(&p);
-< firm = x86cpuid_GetFirm(&p);
-< switch (firm)
-< {
-< case CPU_FIRM_INTEL: return (family < 6 || (family == 6 && model == 0x100C));
-< case CPU_FIRM_AMD: return (family < 5 || (family == 5 && (model < 6 || model == 0xA)));
-< case CPU_FIRM_VIA: return (family < 6 || (family == 6 && model < 0xF));
-< }
-< return True;
-< }
-<
-< #if !defined(MY_CPU_AMD64) && defined(_WIN32)
-< static Bool CPU_Sys_Is_SSE_Supported()
-< {
-< OSVERSIONINFO vi;
-< vi.dwOSVersionInfoSize = sizeof(vi);
-< if (!GetVersionEx(&vi))
-< return False;
-< return (vi.dwMajorVersion >= 5);
-< }
-< #define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return False;
-< #else
-< #define CHECK_SYS_SSE_SUPPORT
-< #endif
-<
-< Bool CPU_Is_Aes_Supported()
-< {
-< Cx86cpuid p;
-< CHECK_SYS_SSE_SUPPORT
-< if (!x86cpuid_CheckAndRead(&p))
-< return False;
-< return (p.c >> 25) & 1;
-< }
-<
-< #endif
----
-> /* CpuArch.c -- CPU specific code
-> 2010-10-26: Igor Pavlov : Public domain */
->
-> #include "CpuArch.h"
->
-> #ifdef MY_CPU_X86_OR_AMD64
->
-> #if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__)
-> #define USE_ASM
-> #endif
->
-> #if defined(USE_ASM) && !defined(MY_CPU_AMD64)
-> static UInt32 CheckFlag(UInt32 flag)
-> {
-> #ifdef _MSC_VER
-> __asm pushfd;
-> __asm pop EAX;
-> __asm mov EDX, EAX;
-> __asm xor EAX, flag;
-> __asm push EAX;
-> __asm popfd;
-> __asm pushfd;
-> __asm pop EAX;
-> __asm xor EAX, EDX;
-> __asm push EDX;
-> __asm popfd;
-> __asm and flag, EAX;
-> #else
-> __asm__ __volatile__ (
-> "pushf\n\t"
-> "pop %%EAX\n\t"
-> "movl %%EAX,%%EDX\n\t"
-> "xorl %0,%%EAX\n\t"
-> "push %%EAX\n\t"
-> "popf\n\t"
-> "pushf\n\t"
-> "pop %%EAX\n\t"
-> "xorl %%EDX,%%EAX\n\t"
-> "push %%EDX\n\t"
-> "popf\n\t"
-> "andl %%EAX, %0\n\t":
-> "=c" (flag) : "c" (flag):
-> "%eax", "%edx" );
-> #endif
-> return flag;
-> }
-> #define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return False;
-> #else
-> #define CHECK_CPUID_IS_SUPPORTED
-> #endif
->
-> static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
-> {
-> #ifdef USE_ASM
->
-> #ifdef _MSC_VER
->
-> UInt32 a2, b2, c2, d2;
-> __asm xor EBX, EBX;
-> __asm xor ECX, ECX;
-> __asm xor EDX, EDX;
-> __asm mov EAX, function;
-> __asm cpuid;
-> __asm mov a2, EAX;
-> __asm mov b2, EBX;
-> __asm mov c2, ECX;
-> __asm mov d2, EDX;
->
-> *a = a2;
-> *b = b2;
-> *c = c2;
-> *d = d2;
->
-> #else
->
-> #if defined(MY_CPU_AMD64)
->
-> __asm__ __volatile__ (
-> "mov %%rbx, %%rdi\n"
-> "cpuid\n"
-> "xchg %%rdi, %%rbx\n"
-> : "=a" (*a) ,
-> "=D" (*b) ,
-> "=c" (*c) ,
-> "=d" (*d)
-> : "0" (function)) ;
->
-> #else
->
-> __asm__ __volatile__ (
-> "mov %%ebx, %%edi\n"
-> "cpuid\n"
-> "xchg %%edi, %%ebx\n"
-> : "=a" (*a) ,
-> "=D" (*b) ,
-> "=c" (*c) ,
-> "=d" (*d)
-> : "0" (function)) ;
->
-> #endif
->
-> #endif
->
-> #else
->
-> int CPUInfo[4];
-> __cpuid(CPUInfo, function);
-> *a = CPUInfo[0];
-> *b = CPUInfo[1];
-> *c = CPUInfo[2];
-> *d = CPUInfo[3];
->
-> #endif
-> }
->
-> Bool x86cpuid_CheckAndRead(Cx86cpuid *p)
-> {
-> CHECK_CPUID_IS_SUPPORTED
-> MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
-> MyCPUID(1, &p->ver, &p->b, &p->c, &p->d);
-> return True;
-> }
->
-> static UInt32 kVendors[][3] =
-> {
-> { 0x756E6547, 0x49656E69, 0x6C65746E},
-> { 0x68747541, 0x69746E65, 0x444D4163},
-> { 0x746E6543, 0x48727561, 0x736C7561}
-> };
->
-> int x86cpuid_GetFirm(const Cx86cpuid *p)
-> {
-> unsigned i;
-> for (i = 0; i < sizeof(kVendors) / sizeof(kVendors[i]); i++)
-> {
-> const UInt32 *v = kVendors[i];
-> if (v[0] == p->vendor[0] &&
-> v[1] == p->vendor[1] &&
-> v[2] == p->vendor[2])
-> return (int)i;
-> }
-> return -1;
-> }
->
-> Bool CPU_Is_InOrder()
-> {
-> Cx86cpuid p;
-> int firm;
-> UInt32 family, model;
-> if (!x86cpuid_CheckAndRead(&p))
-> return True;
-> family = x86cpuid_GetFamily(&p);
-> model = x86cpuid_GetModel(&p);
-> firm = x86cpuid_GetFirm(&p);
-> switch (firm)
-> {
-> case CPU_FIRM_INTEL: return (family < 6 || (family == 6 && model == 0x100C));
-> case CPU_FIRM_AMD: return (family < 5 || (family == 5 && (model < 6 || model == 0xA)));
-> case CPU_FIRM_VIA: return (family < 6 || (family == 6 && model < 0xF));
-> }
-> return True;
-> }
->
-> #if !defined(MY_CPU_AMD64) && defined(_WIN32)
-> static Bool CPU_Sys_Is_SSE_Supported()
-> {
-> OSVERSIONINFO vi;
-> vi.dwOSVersionInfoSize = sizeof(vi);
-> if (!GetVersionEx(&vi))
-> return False;
-> return (vi.dwMajorVersion >= 5);
-> }
-> #define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return False;
-> #else
-> #define CHECK_SYS_SSE_SUPPORT
-> #endif
->
-> Bool CPU_Is_Aes_Supported()
-> {
-> Cx86cpuid p;
-> CHECK_SYS_SSE_SUPPORT
-> if (!x86cpuid_CheckAndRead(&p))
-> return False;
-> return (p.c >> 25) & 1;
-> }
->
-> #endif
+--- a\CpuArch.c 2015-03-25 08:17:41.042711000 -0400
++++ lzma_sdk\CpuArch.c 2016-02-12 16:32:45.484718900 -0500
+@@ -45,7 +45,8 @@
+ "push %%EDX\n\t"
+ "popf\n\t"
+ "andl %%EAX, %0\n\t":
+- "=c" (flag) : "c" (flag));
++ "=c" (flag) : "c" (flag):
++ "%eax", "%edx" );
+ #endif
+ return flag;
+ }
+@@ -79,7 +80,13 @@
+ #else
+
+ __asm__ __volatile__ (
+- #if defined(MY_CPU_X86) && defined(__PIC__)
++ #if defined(MY_CPU_AMD64)
++ "mov %%rbx, %%rdi\n"
++ "cpuid\n"
++ "xchg %%rdi, %%rbx\n"
++ : "=a" (*a) ,
++ "=D" (*b) ,
++ #elif defined(MY_CPU_X86) && defined(__PIC__)
+ "mov %%ebx, %%edi;"
+ "cpuid;"
+ "xchgl %%ebx, %%edi;"
« no previous file with comments | « third_party/lzma_sdk/Types.h ('k') | third_party/lzma_sdk/lzma_sdk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698