X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Flib.c;h=0471deba284fbbaabe830e0339ad51609e3b2ba2;hb=c5de7b08d4a82908a5acf6454fd7836bdab68715;hp=5c2bf648df5db40745df1b0d6a8da511dff9953d;hpb=c0a6af0e8c4840c370e819cd44925502fae8c4ba;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index 5c2bf648..0471deba 100644
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -45,13 +45,7 @@ int IS_LOCKED(struct sShortSpinlock *Lock)
  */
 int CPU_HAS_LOCK(struct sShortSpinlock *Lock)
 {
-	#if STACKED_LOCKS == 1
 	return Lock->Lock == GetCPUNum() + 1;
-	#elif STACKED_LOCKS == 2
-	return Lock->Lock == Proc_GetCurThread();
-	#else
-	return 0;
-	#endif
 }
 
 /**
@@ -70,32 +64,12 @@ int CPU_HAS_LOCK(struct sShortSpinlock *Lock)
 void SHORTLOCK(struct sShortSpinlock *Lock)
 {
 	 int	v = 1;
-	#if LOCK_DISABLE_INTS
 	 int	IF;
-	#endif
-	#if STACKED_LOCKS == 1
 	 int	cpu = GetCPUNum() + 1;
-	#elif STACKED_LOCKS == 2
-	void	*thread = Proc_GetCurThread();
-	#endif
 	
-	#if LOCK_DISABLE_INTS
 	// Save interrupt state
 	__ASM__ ("pushf;\n\tpop %0" : "=r"(IF));
 	IF &= 0x200;	// AND out all but the interrupt flag
-	#endif
-	
-	#if STACKED_LOCKS == 1
-	if( Lock->Lock == cpu ) {
-		Lock->Depth ++;
-		return ;
-	}
-	#elif STACKED_LOCKS == 2
-	if( Lock->Lock == thread ) {
-		Lock->Depth ++;
-		return ;
-	}
-	#endif
 	
 	#if TRACE_LOCKS
 	if( Lock != &glDebug_Lock && Lock != &glThreadListLock )
@@ -105,34 +79,14 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
 	}
 	#endif
 	
+	__ASM__("cli");
+	
 	// Wait for another CPU to release
 	while(v) {
-		// CMPXCHG:
-		//  If r/m32 == EAX, set ZF and set r/m32 = r32
-		//  Else, clear ZF and set EAX = r/m32
-		#if STACKED_LOCKS == 1
-		__ASM__("lock cmpxchgl %2, (%3)"
-			: "=a"(v)
-			: "a"(0), "r"(cpu), "r"(&Lock->Lock)
-			);
-		#elif STACKED_LOCKS == 2
-		__ASM__("lock cmpxchgl %2, (%3)"
-			: "=a"(v)
-			: "a"(0), "r"(thread), "r"(&Lock->Lock)
-			);
-		#else
-		__ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
-		#endif
-		
-		#if LOCK_DISABLE_INTS
-		if( v )	__ASM__("sti");	// Re-enable interrupts
-		#endif
+		__ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(cpu),"D"(&Lock->Lock));
 	}
 	
-	#if LOCK_DISABLE_INTS
-	__ASM__("cli");
 	Lock->IF = IF;
-	#endif
 	
 	#if TRACE_LOCKS
 	if( Lock != &glDebug_Lock && Lock != &glThreadListLock )
@@ -149,13 +103,6 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
  */
 void SHORTREL(struct sShortSpinlock *Lock)
 {	
-	#if STACKED_LOCKS
-	if( Lock->Depth ) {
-		Lock->Depth --;
-		return ;
-	}
-	#endif
-	
 	#if TRACE_LOCKS
 	if( Lock != &glDebug_Lock && Lock != &glThreadListLock )
 	{
@@ -164,7 +111,6 @@ void SHORTREL(struct sShortSpinlock *Lock)
 	}
 	#endif
 	
-	#if LOCK_DISABLE_INTS
 	// Lock->IF can change anytime once Lock->Lock is zeroed
 	if(Lock->IF) {
 		Lock->Lock = 0;
@@ -173,9 +119,6 @@ void SHORTREL(struct sShortSpinlock *Lock)
 	else {
 		Lock->Lock = 0;
 	}
-	#else
-	Lock->Lock = 0;
-	#endif
 }
 
 // === DEBUG IO ===