From 5df338a4dcefcd9375309b4a69bdb234b358ccd2 Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Thu, 16 Mar 2006 17:13:44 +0000
Subject: [PATCH] Changes to atomic operations on Solaris.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@167 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 flaim/src/fposix.cpp |  4 ++--
 flaim/src/ftk.h      | 34 ++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/flaim/src/fposix.cpp b/flaim/src/fposix.cpp
index a784974..b528d09 100644
--- a/flaim/src/fposix.cpp
+++ b/flaim/src/fposix.cpp
@@ -55,13 +55,13 @@
 
 extern RCODE gv_CriticalFSError;
 
-#if FLM_USE_SPIN_LOCK_ATOMICS
+#if defined( FLM_USE_SPIN_LOCK_ATOMICS)
 
 	#if defined( FLM_SPARC)
 		volatile unsigned char gv_flmAtomicLock;
 	#endif
 	
-#elif FLM_USE_MUTEX_ATOMICS
+#elif defined( FLM_USE_MUTEX_ATOMICS)
 
 	FSTATIC pthread_mutex_t 	gv_flmAtomicLock = PTHREAD_MUTEX_INITIALIZER;
 
diff --git a/flaim/src/ftk.h b/flaim/src/ftk.h
index 55448f2..af33bbd 100644
--- a/flaim/src/ftk.h
+++ b/flaim/src/ftk.h
@@ -1955,23 +1955,31 @@ Note:	Some of this code is derived from the Ximian source code contained
 		/**********************************************************************
 		Desc:
 		**********************************************************************/
-		#define BEGIN_SPIN(tmp,lock) \
+		FINLINE void BEGIN_SPIN(
+			volatile unsigned char *	lock)
+		{
+			int		iTmp;
+			
 			__asm__ __volatile__("1:        ldstub [%1],%0\n\t"  \
 												  "          cmp %0, 0\n\t" \
 												  "          bne 1b\n\t" \
 												  "          nop" \
-												  : "=&r" (tmp) \
-												  : "r" (&lock) \
-												  : "memory"); 
+												  : "=&r" (iTmp) \
+												  : "r" (lock) \
+												  : "memory");
+		}
 		
 		/**********************************************************************
 		Desc:
 		**********************************************************************/
-		#define END_SPIN(lock) \
+		FINLINE void END_SPIN(
+			volatile unsigned char *	lock)
+		{
 			__asm__ __volatile__("stb	%%g0, [%0]"  \
 										 : /* no outputs */ \
-										 : "r" (&lock)\
+										 : "r" (lock)\
 										 : "memory");
+		}
 										 
 		#define FLM_USE_SPIN_LOCK_ATOMICS
 		
@@ -2201,13 +2209,14 @@ Note:	Some of this code is derived from the Ximian source code contained
 	FINLINE void begin_spin(
 		volatile unsigned char *		lock)
 	{
+		(void)lock;
 		asm( "1: ldstub [%i0], %l0");
 		asm( "cmp %l0,0");
 		asm( "bne 1b");
 		asm( "nop");
 	}
 	
-	#define BEGIN_SPIN(tmp,lock) \
+	#define BEGIN_SPIN(lock) \
 		begin_spin( &lock);
 		
 	#define END_SPIN(lock) \
@@ -2223,7 +2232,7 @@ Note:	Some of this code is derived from the Ximian source code contained
 
 #if defined( FLM_USE_SPIN_LOCK_ATOMICS) || defined( FLM_USE_MUTEX_ATOMICS)
 
-	#if FLM_USE_SPIN_LOCK_ATOMICS
+	#if defined( FLM_USE_SPIN_LOCK_ATOMICS)
 		#if defined( FLM_SPARC)
 			extern volatile unsigned char gv_flmAtomicLock;
 		#endif
@@ -2235,11 +2244,10 @@ Note:	Some of this code is derived from the Ximian source code contained
 	FINLINE FLMINT32 ftkAtomicIncrement(
 		volatile FLMINT32 *		pi32Target)
 	{
-		int 			iTmp;
 		FLMINT32 	i32RetVal;
 		
 	#ifdef FLM_USE_SPIN_LOCK_ATOMICS
-		BEGIN_SPIN( iTmp, gv_flmAtomicLock)
+		BEGIN_SPIN( gv_flmAtomicLock)
 	#else
 		pthread_mutex_lock( &gv_flmAtomicLock);
 	#endif
@@ -2262,11 +2270,10 @@ Note:	Some of this code is derived from the Ximian source code contained
 	FINLINE FLMINT32 ftkAtomicDecrement(
 		volatile FLMINT32 *		pi32Target)
 	{
-		int 			iTmp;
 		FLMINT32 	i32RetVal;
 		
 	#ifdef FLM_USE_SPIN_LOCK_ATOMICS
-		BEGIN_SPIN( iTmp, gv_flmAtomicLock)
+		BEGIN_SPIN( gv_flmAtomicLock)
 	#else
 		pthread_mutex_lock( &gv_flmAtomicLock);
 	#endif
@@ -2290,11 +2297,10 @@ Note:	Some of this code is derived from the Ximian source code contained
 		volatile FLMINT32 *		pi32Target,
 		FLMINT32						i32NewVal)
 	{
-		int 			iTmp;
 		FLMINT32 	i32RetVal;
 		
 	#ifdef FLM_USE_SPIN_LOCK_ATOMICS
-		BEGIN_SPIN( iTmp, gv_flmAtomicLock)
+		BEGIN_SPIN( gv_flmAtomicLock)
 	#else
 		pthread_mutex_lock( &gv_flmAtomicLock);
 	#endif