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/testzlib.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'contrib/testzlib/testzlib.c') 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) { -- cgit v1.2.3-55-g6feb