mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FTK change. Enabled use of fast checkum routines on all x86 platforms when building with gcc.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@757 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-08-09 20:36:41 +00:00
parent 9e08e127e8
commit 2e508596bc
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ftk/src/ftkcsum.cpp
View File

@@ -27,7 +27,7 @@
static FLMUINT32 * gv_pui32CRCTbl = NULL;
#if defined( FLM_X86) && (defined( FLM_WIN) || defined( FLM_LINUX) || defined( FLM_NLM))
#if defined( FLM_X86) && (defined( FLM_GNUC) || defined( FLM_WIN) || defined( FLM_NLM))
static unsigned long gv_mmxCheckSumFlag = 1;
@@ -103,7 +103,7 @@ unsigned long ftkGetMMXSupported( void)
/********************************************************************
Desc:
*********************************************************************/
#if defined( FLM_X86) && defined( FLM_32BIT) && defined( FLM_LINUX)
#if defined( FLM_X86) && defined( FLM_32BIT) && defined( FLM_GNUC)
unsigned long ftkGetMMXSupported( void)
{
FLMUINT32 bMMXSupported;
@@ -359,7 +359,7 @@ Done:
/********************************************************************
Desc:
*********************************************************************/
#if defined( FLM_X86) && defined( FLM_32BIT) && defined( FLM_LINUX)
#if defined( FLM_X86) && defined( FLM_32BIT) && defined( FLM_GNUC)
static void ftkFastCheckSumMMX(
void * pBlk,
unsigned long * puiChecksum,
@@ -474,7 +474,7 @@ static void ftkFastCheckSumMMX(
/********************************************************************
Desc:
*********************************************************************/
#if defined( FLM_X86) && defined( FLM_64BIT) && defined( FLM_LINUX)
#if defined( FLM_X86) && defined( FLM_64BIT) && defined( FLM_GNUC)
static void ftkFastCheckSumMMX(
void * pBlk,
unsigned long * puiChecksum,
@@ -589,7 +589,7 @@ Desc: Sets the global variable to check if MMX instructions are allowed.
******************************************************************************/
void f_initFastCheckSum( void)
{
#if defined( FLM_X86) && (defined( FLM_WIN) || defined( FLM_LINUX) || defined( FLM_NLM))
#if defined( FLM_X86) && (defined( FLM_GNUC) || defined( FLM_WIN) || defined( FLM_NLM))
// NOTE that ftkGetMMXSupported assumes that we are running on at least a
// pentium. The check to see if we are on a pentium requires that we
// modify the flags register, and we can't do that if we are running
@@ -629,7 +629,7 @@ FLMUINT32 FLMAPI f_calcFastChecksum(
uiXORs = *puiXORs;
}
#if defined( FLM_X86) && (defined( FLM_WIN) || defined( FLM_LINUX) || defined( FLM_NLM))
#if defined( FLM_X86) && (defined( FLM_GNUC) || defined( FLM_WIN) || defined( FLM_NLM))
if( gv_mmxCheckSumFlag == 1)
{
ftkFastCheckSumMMX( (void *) pucData, (unsigned long *) &uiAdds,
@@ -768,7 +768,7 @@ FLMBYTE FLMAPI f_calcPacketChecksum(
{
FLMUINT uiChecksum = 0;
#if defined( FLM_X86) && (defined( FLM_WIN) || defined( FLM_LINUX) || defined( FLM_NLM))
#if defined( FLM_X86) && (defined( FLM_GNUC) || defined( FLM_WIN) || defined( FLM_NLM))
if( gv_mmxCheckSumFlag == 1)
{
unsigned long uiAdds = 0;

4
ftk/src/ftkunix.cpp
View File

@@ -1355,7 +1355,7 @@ void sparc_asm_code( void)
/****************************************************************************
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
#if defined( FLM_PPC) && defined( FLM_GNUC)
FLMATOMIC ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta)
@@ -1381,7 +1381,7 @@ FLMATOMIC ppc_atomic_add(
/****************************************************************************
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
#if defined( FLM_PPC) && defined( FLM_GNUC)
FLMATOMIC ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue)

6
ftk/util/ftktest.cpp
View File

@@ -468,7 +468,7 @@ FSTATIC RCODE ftkFastChecksumTest( void)
}
}
f_printf( "Slow time = %u ms, FastTime = %u ms. ",
f_printf( "Slow time = %u ms, Fast time = %u ms. ",
(unsigned)FLM_TIMER_UNITS_TO_MILLI( uiSlowTime),
(unsigned)FLM_TIMER_UNITS_TO_MILLI( uiFastTime));
@@ -503,7 +503,7 @@ FSTATIC RCODE ftkPacketChecksumTest( void)
f_printf( "Running checksum tests ... ");
uiDataLength = 8192;
uiDataLength = 64 * 1024;
if( RC_BAD( rc = f_alloc( uiDataLength, &pucData)))
{
goto Exit;
@@ -537,7 +537,7 @@ FSTATIC RCODE ftkPacketChecksumTest( void)
}
}
f_printf( "Slow time = %u ms, FastTime = %u ms. ",
f_printf( "Slow time = %u ms, Fast time = %u ms. ",
(unsigned)FLM_TIMER_UNITS_TO_MILLI( uiSlowTime),
(unsigned)FLM_TIMER_UNITS_TO_MILLI( uiFastTime));