Changeset c621f4aa in mainline for uspace/lib/c/arch/ia32/include

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

Location:

uspace/lib/c/arch/ia32/include

Files:

• atomic.h (moved) (moved from uspace/lib/libc/arch/ia32/include/atomic.h ) (2 diffs)
• config.h (moved) (moved from uspace/lib/libc/arch/ia32/include/config.h )
• ddi.h (moved) (moved from uspace/lib/libc/arch/ia32/include/ddi.h )
• faddr.h (moved) (moved from uspace/lib/libc/arch/ia32/include/faddr.h )
• fibril.h (moved) (moved from uspace/lib/libc/arch/ia32/include/fibril.h )
• inttypes.h (moved) (moved from uspace/lib/libc/arch/ia32/include/inttypes.h )
• istate.h (moved) (moved from uspace/lib/libc/arch/ia32/include/istate.h )
• limits.h (moved) (moved from uspace/lib/libc/arch/ia32/include/limits.h )
• syscall.h (moved) (moved from uspace/lib/libc/arch/ia32/include/syscall.h ) (1 diff)
• thread.h (moved) (moved from uspace/lib/libc/arch/ia32/include/thread.h )
• tls.h (moved) (moved from uspace/lib/libc/arch/ia32/include/tls.h ) (1 diff)
• types.h (moved) (moved from uspace/lib/libc/arch/ia32/include/types.h ) (2 diffs)

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

@@ -40 +40 @@
 #include <atomicdflt.h>
 
-static inline void atomic_inc(atomic_t *val) {
-        asm volatile ("lock incl %0\n" : "+m" (val->count));
+static inline void atomic_inc(atomic_t *val)
+{
+        asm volatile (
+                "lock incl %[count]\n"
+                : [count] "+m" (val->count)
+        );
 }
 
-static inline void atomic_dec(atomic_t *val) {
-        asm volatile ("lock decl %0\n" : "+m" (val->count));
+static inline void atomic_dec(atomic_t *val)
+{
+        asm volatile (
+                "lock decl %[count]\n"
+                : [count] "+m" (val->count)
+        );
 }
 
-static inline long atomic_postinc(atomic_t *val) 
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
-        long r;
-
-        asm volatile (
-                "movl $1, %0\n"
-                "lock xaddl %0, %1\n"
-                : "=r" (r), "+m" (val->count)
-        );
-
-        return r;
-}
-
-static inline long atomic_postdec(atomic_t *val) 
-{
-        long r;
+        atomic_count_t r = 1;
         
         asm volatile (
-                "movl $-1, %0\n"
-                "lock xaddl %0, %1\n"
-                : "=r" (r), "+m" (val->count)
+                "lock xaddl %[r], %[count]\n"
+                : [count] "+m" (val->count),
+                  [r] "+r" (r)
         );
         
@@ -74 +69 @@
 }
 
-#define atomic_preinc(val) (atomic_postinc(val) + 1)
-#define atomic_predec(val) (atomic_postdec(val) - 1)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
+{
+        atomic_count_t r = -1;
+        
+        asm volatile (
+                "lock xaddl %[r], %[count]\n"
+                : [count] "+m" (val->count),
+                  [r] "+r" (r)
+        );
+        
+        return r;
+}
+
+#define atomic_preinc(val)  (atomic_postinc(val) + 1)
+#define atomic_predec(val)  (atomic_postdec(val) - 1)
 
 #endif

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

@@ -40 +40 @@
 #include <kernel/syscall/syscall.h>
 
-#define __syscall0      __syscall_fast_func
-#define __syscall1      __syscall_fast_func
-#define __syscall2      __syscall_fast_func
-#define __syscall3      __syscall_fast_func
-#define __syscall4      __syscall_fast_func
-#define __syscall5      __syscall_slow
-#define __syscall6      __syscall_slow
+#define __syscall0  __syscall_fast_func
+#define __syscall1  __syscall_fast_func
+#define __syscall2  __syscall_fast_func
+#define __syscall3  __syscall_fast_func
+#define __syscall4  __syscall_fast_func
+#define __syscall5  __syscall_slow
+#define __syscall6  __syscall_slow
 
-extern sysarg_t
-(* __syscall_fast_func)(const sysarg_t, const sysarg_t, const sysarg_t,
+extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t,
+    const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
+    const syscall_t);
+
+extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t,
     const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t);
-
-extern sysarg_t
-__syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
-    const sysarg_t, const sysarg_t, const syscall_t);
 
 #endif

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

@@ -53 +53 @@
 {
         void *retval;
-
-        asm ("movl %%gs:0, %0" : "=r"(retval));
+        
+        asm (
+                "movl %%gs:0, %0"
+                : "=r" (retval)
+        );
+        
         return retval;
 }

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

@@ -38 +38 @@
 #define __32_BITS__
 
-typedef unsigned int sysarg_t;
+#include <libarch/common.h>
 
-typedef char int8_t;
-typedef short int int16_t;
-typedef int int32_t;
-typedef long long int int64_t;
+#define SIZE_MIN  UINT32_MIN
+#define SIZE_MAX  UINT32_MAX
 
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long int uint64_t;
+#define SSIZE_MIN  INT32_MIN
+#define SSIZE_MAX  INT32_MAX
+
+typedef uint32_t sysarg_t;
 
 typedef int32_t ssize_t;
@@ -54 +52 @@
 
 typedef uint32_t uintptr_t;
+typedef uint32_t atomic_count_t;
+typedef int32_t atomic_signed_t;
 
 #endif