Changeset 73838ed in mainline

Timestamp:

2005-09-01T19:21:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7df54df

Parents:

437e35a0

Message:

Cleanups so that it compiles on ia-32 & amd-64 cleanly

Files:

• arch/amd64/include/atomic.h (modified) (1 diff)
• arch/amd64/src/fmath.c (modified) (1 diff)
• arch/ia32/include/atomic.h (modified) (2 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

arch/amd64/include/atomic.h

@@ -30 +30 @@
 #define __amd64_ATOMIC_H__
 
-/*
- * TODO: these are just placeholders for real implementations of atomic_inc and atomic_dec.
- * WARNING: the following functions cause the code to be preemption-unsafe !!!
- */
 
-static inline atomic_inc(volatile int *val) {
-        *val++;
+/* Count_t is 32-bits on AMD-64 */
+static inline void atomic_inc(volatile count_t *val) {
+#ifdef __SMP__
+        __asm__ volatile ("lock incl (%0)\n" : : "r" (val));
+#else
+        __asm__ volatile ("incl (%0)\n" : : "r" (val));
+#endif /* __SMP__ */
 }
 
-static inline atomic_dec(volatile int *val) {
-        *val--;
+static inline void atomic_dec(volatile count_t *val) {
+#ifdef __SMP__
+        __asm__ volatile ("lock decl (%0)\n" : : "r" (val));
+#else
+        __asm__ volatile ("decl (%0)\n" : : "r" (val));
+#endif /* __SMP__ */
 }
 

arch/amd64/src/fmath.c

@@ -123 +123 @@
         fmath_ld_union.ldd[7]=((fmath_ld_union.ldd[7])&0x7f)|(sign<<7); // change 64th bit (IA32 is a little endian)
         return fmath_ld_union.bf;
-*/      return 1.0
+*/      return 1.0;
 }
 

arch/ia32/include/atomic.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-static inline void atomic_inc(volatile int *val) {
+static inline void atomic_inc(volatile count_t *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock incl (%0)\n" : : "r" (val));
@@ -40 +40 @@
 }
 
-static inline void atomic_dec(volatile int *val) {
+static inline void atomic_dec(volatile count_t *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock decl (%0)\n" : : "r" (val));

src/proc/scheduler.c

@@ -150 +150 @@
                 spinlock_unlock(&CPU->lock);
 
-                atomic_dec((int *) &nrdy);
+                atomic_dec(&nrdy);
                 r->n--;
 

src/proc/thread.c

@@ -137 +137 @@
         spinlock_unlock(&r->lock);
 
-        atomic_inc((int *) &nrdy);
+        atomic_inc(&nrdy);
         avg = nrdy / config.cpu_active;