Changeset 53f9821 in mainline for generic/src

Timestamp:

2006-03-20T20:32:17Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

018d957e

Parents:

9d3e185

Message:

Cleanup of spinlocks, now compiles both ia32 and amd64 with
and without DEBUG_SPINLOCKS. Made spinlocks inline.
Moved syscall_handler to generic (it was identical for ia32,amd64 & mips32).
Made slightly faster syscall for ia32.
Made better interrupt routines for ia32.
Allow not saving non-scratch registers during interrupt on ia32,amd64,mips32.
Aligned interrupt handlers on ia32,amd64, this should prevent problems
with different instruction lengths.

Location:

generic/src

Files:

• lib/func.c (modified) (1 diff)
• synch/spinlock.c (modified) (4 diffs)
• syscall/syscall.c (modified) (1 diff)

generic/src/lib/func.c

@@ -55 +55 @@
         }
 #else
-        atomic_set(haltstate, 1);
+        atomic_set(&haltstate, 1);
 #endif
 

generic/src/synch/spinlock.c

@@ -52 +52 @@
 }
 
-#ifdef CONFIG_DEBUG_SPINLOCK
 /** Lock spinlock
  *
@@ -61 +60 @@
  * @param sl Pointer to spinlock_t structure.
  */
-void spinlock_lock(spinlock_t *sl)
+#ifdef CONFIG_DEBUG_SPINLOCK
+void spinlock_lock_debug(spinlock_t *sl)
 {
         count_t i = 0;
@@ -83 +83 @@
         if (deadlock_reported)
                 printf("cpu%d: not deadlocked\n", CPU->id);
-
-        /*
-         * Prevent critical section code from bleeding out this way up.
-         */
-        CS_ENTER_BARRIER();
-
-}
-
-#else
-
-/** Lock spinlock
- *
- * Lock spinlock.
- *
- * @param sl Pointer to spinlock_t structure.
- */
-void spinlock_lock(spinlock_t *sl)
-{
-        preemption_disable();
-
-        /*
-         * Each architecture has its own efficient/recommended
-         * implementation of spinlock.
-         */
-        spinlock_arch(&sl->val);
 
         /*
@@ -144 +119 @@
 }
 
-/** Unlock spinlock
- *
- * Unlock spinlock.
- *
- * @param sl Pointer to spinlock_t structure.
- */
-void spinlock_unlock(spinlock_t *sl)
-{
-        ASSERT(atomic_get(&sl->val) != 0);
-
-        /*
-         * Prevent critical section code from bleeding out this way down.
-         */
-        CS_LEAVE_BARRIER();
-        
-        atomic_set(&sl->val,0);
-        preemption_enable();
-}
-
 #endif

generic/src/syscall/syscall.c

@@ -63 +63 @@
 }
 
+/** Dispatch system call */
+__native syscall_handler(__native a1, __native a2, __native a3,
+                         __native a4, __native id)
+{
+        if (id < SYSCALL_END)
+                return syscall_table[id](a1,a2,a3,a4);
+        else
+                panic("Undefined syscall %d", id);
+}
+
 syshandler_t syscall_table[SYSCALL_END] = {
         sys_io,