Changeset 371bd7d in mainline for uspace/lib/c/arch/ia32


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/lib/c/arch/ia32
Files:
5 added
18 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/arch/ia32/Makefile.common

    rcd82bb1 r371bd7d  
    2727#
    2828
     29CLANG_ARCH = i386
     30GCC_CFLAGS += -march=pentium
    2931
    30 ## Common names
    31 #
     32ENDIANESS = LE
    3233
    33 LIBC_PREFIX = ../libc
    34 DEPEND = Makefile.depend
    35 DEPEND_PREV = $(DEPEND).prev
    36 LIBSOFTFLOAT = libsoftfloat.a
     34BFD_NAME = elf32-i386
     35BFD_ARCH = i386

  • uspace/lib/c/arch/ia32/_link.ld.in

    rcd82bb1 r371bd7d  
    1 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
     1STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/c/arch/ia32/include/atomic.h

    rcd82bb1 r371bd7d  
    3636#define LIBC_ia32_ATOMIC_H_
    3737
    38 static inline void atomic_inc(atomic_t *val) {
    39         asm volatile ("lock incl %0\n" : "+m" (val->count));
     38#define LIBC_ARCH_ATOMIC_H_
     39
     40#include <atomicdflt.h>
     41
     42static inline void atomic_inc(atomic_t *val)
     43{
     44        asm volatile (
     45                "lock incl %[count]\n"
     46                : [count] "+m" (val->count)
     47        );
    4048}
    4149
    42 static inline void atomic_dec(atomic_t *val) {
    43         asm volatile ("lock decl %0\n" : "+m" (val->count));
     50static inline void atomic_dec(atomic_t *val)
     51{
     52        asm volatile (
     53                "lock decl %[count]\n"
     54                : [count] "+m" (val->count)
     55        );
    4456}
    4557
    46 static inline long atomic_postinc(atomic_t *val)
     58static inline atomic_count_t atomic_postinc(atomic_t *val)
    4759{
    48         long r;
    49 
    50         asm volatile (
    51                 "movl $1, %0\n"
    52                 "lock xaddl %0, %1\n"
    53                 : "=r" (r), "+m" (val->count)
    54         );
    55 
    56         return r;
    57 }
    58 
    59 static inline long atomic_postdec(atomic_t *val)
    60 {
    61         long r;
     60        atomic_count_t r = 1;
    6261       
    6362        asm volatile (
    64                 "movl $-1, %0\n"
    65                 "lock xaddl %0, %1\n"
    66                 : "=r" (r), "+m" (val->count)
     63                "lock xaddl %[r], %[count]\n"
     64                : [count] "+m" (val->count),
     65                  [r] "+r" (r)
    6766        );
    6867       
    … …  
    7069}
    7170
    72 #define atomic_preinc(val) (atomic_postinc(val) + 1)
    73 #define atomic_predec(val) (atomic_postdec(val) - 1)
     71static inline atomic_count_t atomic_postdec(atomic_t *val)
     72{
     73        atomic_count_t r = -1;
     74       
     75        asm volatile (
     76                "lock xaddl %[r], %[count]\n"
     77                : [count] "+m" (val->count),
     78                  [r] "+r" (r)
     79        );
     80       
     81        return r;
     82}
     83
     84#define atomic_preinc(val)  (atomic_postinc(val) + 1)
     85#define atomic_predec(val)  (atomic_postdec(val) - 1)
    7486
    7587#endif

  • uspace/lib/c/arch/ia32/include/fibril.h

    rcd82bb1 r371bd7d  
    4444#define SP_DELTA     (12)
    4545
     46#define context_set(c, _pc, stack, size, ptls) \
     47        do { \
     48                (c)->pc = (sysarg_t) (_pc); \
     49                (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
     50                (c)->tls = (sysarg_t) (ptls); \
     51                (c)->ebp = 0; \
     52        } while (0)
     53       
    4654/* We include only registers that must be preserved
    4755 * during function call

  • uspace/lib/c/arch/ia32/include/limits.h

    rcd82bb1 r371bd7d  
    3636#define LIBC_ia32__LIMITS_H_
    3737
    38 # define LONG_MIN MIN_INT32
    39 # define LONG_MAX MAX_INT32
    40 # define ULONG_MIN MIN_UINT32
    41 # define ULONG_MAX MAX_UINT32
     38#define LONG_MIN MIN_INT32
     39#define LONG_MAX MAX_INT32
     40#define ULONG_MIN MIN_UINT32
     41#define ULONG_MAX MAX_UINT32
     42
     43#define SIZE_MIN MIN_UINT32
     44#define SIZE_MAX MAX_UINT32
     45#define SSIZE_MIN MIN_INT32
     46#define SSIZE_MAX MAX_INT32
    4247
    4348#endif

  • uspace/lib/c/arch/ia32/include/syscall.h

    rcd82bb1 r371bd7d  
    4040#include <kernel/syscall/syscall.h>
    4141
    42 #define __syscall0      __syscall_fast_func
    43 #define __syscall1      __syscall_fast_func
    44 #define __syscall2      __syscall_fast_func
    45 #define __syscall3      __syscall_fast_func
    46 #define __syscall4      __syscall_fast_func
    47 #define __syscall5      __syscall_slow
    48 #define __syscall6      __syscall_slow
     42#define __syscall0  __syscall_fast_func
     43#define __syscall1  __syscall_fast_func
     44#define __syscall2  __syscall_fast_func
     45#define __syscall3  __syscall_fast_func
     46#define __syscall4  __syscall_fast_func
     47#define __syscall5  __syscall_slow
     48#define __syscall6  __syscall_slow
    4949
    50 extern sysarg_t
    51 (* __syscall_fast_func)(const sysarg_t, const sysarg_t, const sysarg_t,
     50extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t,
     51    const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
     52    const syscall_t);
     53
     54extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t,
    5255    const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t);
    53 
    54 extern sysarg_t
    55 __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
    56     const sysarg_t, const sysarg_t, const syscall_t);
    5756
    5857#endif

  • uspace/lib/c/arch/ia32/include/tls.h

    rcd82bb1 r371bd7d  
    5353{
    5454        void *retval;
    55 
    56         asm ("movl %%gs:0, %0" : "=r"(retval));
     55       
     56        asm (
     57                "movl %%gs:0, %0"
     58                : "=r" (retval)
     59        );
     60       
    5761        return retval;
    5862}

  • uspace/lib/c/arch/ia32/include/types.h

    rcd82bb1 r371bd7d  
    3636#define LIBC_ia32_TYPES_H_
    3737
     38#define __32_BITS__
     39
    3840typedef unsigned int sysarg_t;
    3941
    … …  
    5254
    5355typedef uint32_t uintptr_t;
     56typedef uint32_t atomic_count_t;
     57typedef int32_t atomic_signed_t;
    5458
    5559#endif

  • uspace/lib/c/arch/ia32/src/entry.s

    rcd82bb1 r371bd7d  
    5555        movl $__syscall_fast, (%eax)
    56560:
     57        #
     58        # Create the first stack frame.
     59        #
     60        pushl $0
     61        movl %esp, %ebp
    5762
    5863        # Pass the PCB pointer to __main as the first argument

  • uspace/lib/c/arch/ia32/src/thread_entry.s

    rcd82bb1 r371bd7d  
    4242
    4343        #
     44        # Create the first stack frame.
     45        #
     46        pushl $0
     47        mov %esp, %ebp
     48
     49        #
    4450        # EAX contains address of uarg.
    4551        #
Note: See TracChangeset for help on using the changeset viewer.