Changeset 345ce2f in mainline

Timestamp:

2005-09-03T11:43:54Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

4f0bba0

Parents:

be56c17

Message:

Fixed asm problems in asm in atomic instructions.

Files:

• arch/amd64/include/atomic.h (deleted)
• arch/ia32/include/atomic.h (modified) (3 diffs)
• src/build.amd64 (modified) (1 diff)

arch/ia32/include/atomic.h

@@ -34 +34 @@
 static inline void atomic_inc(volatile int *val) {
 #ifdef __SMP__
-        __asm__ volatile ("lock incl (%0)\n" : : "r" (val));
+        __asm__ volatile ("lock incl %0\n" : "=m" (*val));
 #else
-        __asm__ volatile ("incl (%0)\n" : : "r" (val));
+        __asm__ volatile ("incl %0\n" : "=m" (*val));
 #endif /* __SMP__ */
 }
@@ -42 +42 @@
 static inline void atomic_dec(volatile int *val) {
 #ifdef __SMP__
-        __asm__ volatile ("lock decl (%0)\n" : : "r" (val));
+        __asm__ volatile ("lock decl %0\n" : "=m" (*val));
 #else
-        __asm__ volatile ("decl (%0)\n" : : "r" (val));
+        __asm__ volatile ("decl %0\n" : "=m" (*val));
 #endif /* __SMP__ */
 }
@@ -53 +53 @@
         __asm__ volatile (
                 "movl $1, %0\n"
-                "xchgl %0, (%1)\n"
-                : "=r" (v)
-                : "r" (val)
+                "xchgl %0, %1\n"
+                : "=r" (v),"=m" (*val)
         );
         

src/build.amd64

@@ -16 +16 @@
 done
 
-for a in ega.h i8042.h i8259.h i8254.h interrupt.h bios mm/memory_init.h boot/memmap.h boot/memmapasm.h; do
+for a in atomic.h ega.h i8042.h i8259.h i8254.h interrupt.h bios mm/memory_init.h boot/memmap.h boot/memmapasm.h; do
   if [ \! -e amd64/include/$a ]; then
     echo ln -sf `pwd`/ia32/include/$a amd64/include/$a