From abf180a067223611620dd97dd5681df7c7fa7c9b Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:25:17 -0700 Subject: zlib 1.2.3 --- contrib/testzlib/rdtsc64.asm | 18 -- contrib/testzlib/rdtsc64.obj | Bin 744 -> 0 bytes contrib/testzlib/testzlib.c | 33 +- contrib/testzlib/testzlib.sln | 21 -- contrib/testzlib/testzlib.vcproj | 124 -------- contrib/testzlib/testzlib8.sln | 32 -- contrib/testzlib/testzlib8.vcproj | 638 -------------------------------------- 7 files changed, 25 insertions(+), 841 deletions(-) delete mode 100644 contrib/testzlib/rdtsc64.asm delete mode 100644 contrib/testzlib/rdtsc64.obj delete mode 100644 contrib/testzlib/testzlib.sln delete mode 100644 contrib/testzlib/testzlib.vcproj delete mode 100644 contrib/testzlib/testzlib8.sln delete mode 100644 contrib/testzlib/testzlib8.vcproj (limited to 'contrib/testzlib') diff --git a/contrib/testzlib/rdtsc64.asm b/contrib/testzlib/rdtsc64.asm deleted file mode 100644 index 6b78a8b..0000000 --- a/contrib/testzlib/rdtsc64.asm +++ /dev/null @@ -1,18 +0,0 @@ -; rdtsc64.asm -; -; unsigned _int64 myrdtsc(); -; -; return the performance rdtsc value, on AMD64/Intel EM64T -; -; compile with : -; ml64.exe" /Flrdtsc64 /c /Zi rdtsc64.asm -; -.code -myrdtsc PROC - rdtsc - shl rdx,32 - or rax,rdx - ret -myrdtsc ENDP - -END diff --git a/contrib/testzlib/rdtsc64.obj b/contrib/testzlib/rdtsc64.obj deleted file mode 100644 index 7905142..0000000 Binary files a/contrib/testzlib/rdtsc64.obj and /dev/null differ diff --git a/contrib/testzlib/testzlib.c b/contrib/testzlib/testzlib.c index 6c3ff9f..e5574f4 100644 --- a/contrib/testzlib/testzlib.c +++ b/contrib/testzlib/testzlib.c @@ -1,7 +1,7 @@ - #include #include #include + #include "zlib.h" @@ -17,23 +17,25 @@ void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B) } } -#ifdef _AMD64_ -unsigned _int64 myrdtsc(); +#ifdef _M_X64 +// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc +unsigned __int64 __rdtsc(void); void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) { - // printf("rdtsc = %I64x\n",myrdtsc()); - pbeginTime64->QuadPart=myrdtsc(); + // printf("rdtsc = %I64x\n",__rdtsc()); + pbeginTime64->QuadPart=__rdtsc(); } LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) { LARGE_INTEGER LIres; - unsigned _int64 res=myrdtsc()-((unsigned _int64)(beginTime64.QuadPart)); + unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart)); LIres.QuadPart=res; - // printf("rdtsc = %I64x\n",myrdtsc()); + // printf("rdtsc = %I64x\n",__rdtsc()); return LIres; } #else +#ifdef _M_IX86 void myGetRDTSC32(LARGE_INTEGER * pbeginTime64) { DWORD dwEdx,dwEax; @@ -61,8 +63,23 @@ LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) MyDoMinus64(&LIres,endTime64,beginTime64); return LIres; } -#endif +#else +void myGetRDTSC32(LARGE_INTEGER * pbeginTime64) +{ +} + +void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64) +{ +} +LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf) +{ + LARGE_INTEGER lr; + lr.QuadPart=0; + return lr; +} +#endif +#endif void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf) { diff --git a/contrib/testzlib/testzlib.sln b/contrib/testzlib/testzlib.sln deleted file mode 100644 index 86da716..0000000 --- a/contrib/testzlib/testzlib.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/contrib/testzlib/testzlib.vcproj b/contrib/testzlib/testzlib.vcproj deleted file mode 100644 index bd9b39b..0000000 --- a/contrib/testzlib/testzlib.vcproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/testzlib/testzlib8.sln b/contrib/testzlib/testzlib8.sln deleted file mode 100644 index 794f72d..0000000 --- a/contrib/testzlib/testzlib8.sln +++ /dev/null @@ -1,32 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib8", "testzlib8.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|Win64 (AMD64) = Debug|Win64 (AMD64) - Release|Win32 = Release|Win32 - Release|Win64 (AMD64) = Release|Win64 (AMD64) - ReleaseAsm|Win32 = ReleaseAsm|Win32 - ReleaseAsm|Win64 (AMD64) = ReleaseAsm|Win64 (AMD64) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win64 (AMD64).ActiveCfg = Debug|Win64 (AMD64) - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win64 (AMD64).Build.0 = Debug|Win64 (AMD64) - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win64 (AMD64).ActiveCfg = Release|Win64 (AMD64) - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win64 (AMD64).Build.0 = Release|Win64 (AMD64) - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.ActiveCfg = ReleaseAsm|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.Build.0 = ReleaseAsm|Win32 - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).ActiveCfg = ReleaseAsm|Win64 (AMD64) - {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).Build.0 = ReleaseAsm|Win64 (AMD64) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/contrib/testzlib/testzlib8.vcproj b/contrib/testzlib/testzlib8.vcproj deleted file mode 100644 index 3cab776..0000000 --- a/contrib/testzlib/testzlib8.vcproj +++ /dev/null @@ -1,638 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb