[ros-diffs] [sir_richard] 45233: [HAL] Merge HalpAcquireSystemHardwareSpinLock and HalpReleaseCmosSpinLock from Timo's AMD64 branch, and delete ASM implementations.

[sir_richard at svn.reactos.org]

Author: sir_richard
Date: Mon Jan 25 00:12:30 2010
New Revision: 45233

URL: http://svn.reactos.org/svn/reactos?rev=45233&view=rev
Log:
[HAL] Merge HalpAcquireSystemHardwareSpinLock and HalpReleaseCmosSpinLock from Timo's AMD64 branch, and delete ASM implementations.

Modified:
    trunk/reactos/hal/halx86/generic/spinlock.c
    trunk/reactos/hal/halx86/generic/systimer.S

Modified: trunk/reactos/hal/halx86/generic/spinlock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinlock.c?rev=45233&r1=45232&r2=45233&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Mon Jan 25 00:12:30 2010
@@ -113,6 +113,46 @@
 
 #endif
 
+/* GLOBALS ********************************************************************/
+
+ULONG HalpSystemHardwareFlags;
+KSPIN_LOCK HalpSystemHardwareLock;
+
+/* PRIVATE FUNCTIONS **********************************************************/
+
+VOID
+NTAPI
+HalpAcquireSystemHardwareSpinLock(VOID)
+{
+    ULONG Flags;
+
+    /* Get flags and disable interrupts */
+    Flags = __readeflags();
+    _disable();
+
+    /* Acquire the lock */
+    KxAcquireSpinLock(&HalpSystemHardwareLock);
+
+    /* We have the lock, save the flags now */
+    HalpSystemHardwareFlags = Flags;
+}
+
+VOID
+NTAPI
+HalpReleaseCmosSpinLock(VOID)
+{
+    ULONG Flags;
+
+    /* Get the flags */
+    Flags = HalpSystemHardwareFlags;
+
+    /* Release the lock */
+    KxReleaseSpinLock(&HalpSystemHardwareLock);
+
+    /* Restore the flags */
+    __writeeflags(Flags);
+}
+
 /* FUNCTIONS *****************************************************************/
 
 /*

Modified: trunk/reactos/hal/halx86/generic/systimer.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systimer.S?rev=45233&r1=45232&r2=45233&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Mon Jan 25 00:12:30 2010
@@ -13,8 +13,10 @@
 
 /* GLOBALS *******************************************************************/
 
+.globl _HalpPerfCounter
 _HalpLastPerfCounterLow:    .long 0
 _HalpLastPerfCounterHigh:   .long 0
+_HalpPerfCounter:
 _HalpPerfCounterLow:        .long 0
 _HalpPerfCounterHigh:       .long 0
 _HalpSystemHardwareFlags:   .long 0
@@ -23,76 +25,6 @@
     .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n"
 
 /* FUNCTIONS *****************************************************************/
-
-.global _HalpReleaseCmosSpinLock at 0
-.func HalpReleaseCmosSpinLock at 0
-_HalpReleaseCmosSpinLock at 0:
-
-#ifdef CONFIG_SMP
-    /* Save clobbered register */
-    push eax
-    
-    /* Push saved EFLAGS */
-    push _HalpSystemHardwareFlags
-    
-    /* Release the lock */
-    lea eax, _HalpSystemHardwareLock
-    RELEASE_SPINLOCK(eax)
-    
-    /* Restore EFLAGS */
-    popf
-    
-    /* Return */
-    pop eax
-    ret
-#else
-    /* Restore EFLAGS and return */
-    push _HalpSystemHardwareFlags
-    popf
-    ret
-#endif
-
-.endfunc
-
-.global _HalpAcquireSystemHardwareSpinLock at 0
-.func HalpAcquireSystemHardwareSpinLock at 0
-_HalpAcquireSystemHardwareSpinLock at 0:
-
-#ifdef CONFIG_SMP
-    /* Save clobbered register */
-    push eax
-    
-HardwareLock:
-    /* Save EFLAGS and disable interrupts */
-    pushf
-    cli
-    
-    /* This is the CMOS lock, acquire it */
-    lea eax, _HalpSystemHardwareLock
-    ACQUIRE_SPINLOCK(eax, CmosSpin)
-    
-    /* We have it, return the flags */
-    pop _HalpSystemHardwareFlags
-    pop eax
-    ret
-    
-CmosSpin:
-
-    /* Restore EFLAGS */
-    pushf _HalpSystemHardwareLock
-    popf 
-
-    /* Spin */
-    SPIN_ON_LOCK(eax, HardwareLock)
-#else
-    /* Save EFLAGS, disable interrupts and return */
-    pushf
-    cli
-    pop _HalpSystemHardwareFlags
-    ret
-#endif
-
-.endfunc
 
 .global _HalpCalibrateStallExecution at 0
 .func HalpCalibrateStallExecution at 0