Changeset 53f9821 in mainline for generic


Ignore:
Timestamp:
2006-03-20T20:32:17Z (20 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
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • generic/include/synch/spinlock.h

    r9d3e185 r53f9821  
    3434#include <preemption.h>
    3535#include <arch/atomic.h>
     36#include <debug.h>
    3637
    3738#ifdef CONFIG_SMP
    … …  
    6768
    6869extern void spinlock_initialize(spinlock_t *sl, char *name);
    69 extern void spinlock_lock(spinlock_t *sl);
    7070extern int spinlock_trylock(spinlock_t *sl);
    71 extern void spinlock_unlock(spinlock_t *sl);
     71extern void spinlock_lock_debug(spinlock_t *sl);
     72
     73#ifdef CONFIG_DEBUG_SPINLOCK
     74#  define spinlock_lock(x) spinlock_lock_debug(x)
     75#else
     76#  define spinlock_lock(x) atomic_lock_arch(&(x)->val)
     77#endif
     78
     79/** Unlock spinlock
     80 *
     81 * Unlock spinlock.
     82 *
     83 * @param sl Pointer to spinlock_t structure.
     84 */
     85static inline void spinlock_unlock(spinlock_t *sl)
     86{
     87        ASSERT(atomic_get(&sl->val) != 0);
     88
     89        /*
     90         * Prevent critical section code from bleeding out this way down.
     91         */
     92        CS_LEAVE_BARRIER();
     93       
     94        atomic_set(&sl->val,0);
     95        preemption_enable();
     96}
    7297
    7398#else

  • generic/include/syscall/syscall.h

    r9d3e185 r53f9821  
    5656
    5757extern syshandler_t syscall_table[SYSCALL_END];
     58extern __native syscall_handler(__native a1, __native a2, __native a3,
     59                                __native a4, __native id);
    5860
    5961#endif

  • generic/src/lib/func.c

    r9d3e185 r53f9821  
    5555        }
    5656#else
    57         atomic_set(haltstate, 1);
     57        atomic_set(&haltstate, 1);
    5858#endif
    5959

  • generic/src/synch/spinlock.c

    r9d3e185 r53f9821  
    5252}
    5353
    54 #ifdef CONFIG_DEBUG_SPINLOCK
    5554/** Lock spinlock
    5655 *
    … …  
    6160 * @param sl Pointer to spinlock_t structure.
    6261 */
    63 void spinlock_lock(spinlock_t *sl)
     62#ifdef CONFIG_DEBUG_SPINLOCK
     63void spinlock_lock_debug(spinlock_t *sl)
    6464{
    6565        count_t i = 0;
    … …  
    8383        if (deadlock_reported)
    8484                printf("cpu%d: not deadlocked\n", CPU->id);
    85 
    86         /*
    87          * Prevent critical section code from bleeding out this way up.
    88          */
    89         CS_ENTER_BARRIER();
    90 
    91 }
    92 
    93 #else
    94 
    95 /** Lock spinlock
    96  *
    97  * Lock spinlock.
    98  *
    99  * @param sl Pointer to spinlock_t structure.
    100  */
    101 void spinlock_lock(spinlock_t *sl)
    102 {
    103         preemption_disable();
    104 
    105         /*
    106          * Each architecture has its own efficient/recommended
    107          * implementation of spinlock.
    108          */
    109         spinlock_arch(&sl->val);
    11085
    11186        /*
    … …  
    144119}
    145120
    146 /** Unlock spinlock
    147  *
    148  * Unlock spinlock.
    149  *
    150  * @param sl Pointer to spinlock_t structure.
    151  */
    152 void spinlock_unlock(spinlock_t *sl)
    153 {
    154         ASSERT(atomic_get(&sl->val) != 0);
    155 
    156         /*
    157          * Prevent critical section code from bleeding out this way down.
    158          */
    159         CS_LEAVE_BARRIER();
    160        
    161         atomic_set(&sl->val,0);
    162         preemption_enable();
    163 }
    164 
    165121#endif

  • generic/src/syscall/syscall.c

    r9d3e185 r53f9821  
    6363}
    6464
     65/** Dispatch system call */
     66__native syscall_handler(__native a1, __native a2, __native a3,
     67                         __native a4, __native id)
     68{
     69        if (id < SYSCALL_END)
     70                return syscall_table[id](a1,a2,a3,a4);
     71        else
     72                panic("Undefined syscall %d", id);
     73}
     74
    6575syshandler_t syscall_table[SYSCALL_END] = {
    6676        sys_io,
Note: See TracChangeset for help on using the changeset viewer.