Changeset 0187fd0 in mainline

Timestamp:

2005-11-08T17:21:53Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b5ac364

Parents:

0060b1d

Message:

fix IA-32 fences (½)

Files:

• arch/ia32/Makefile.inc (modified) (2 diffs)
• arch/ia32/include/barrier.h (modified) (1 diff)
• clean (added)

arch/ia32/Makefile.inc

@@ -50 +50 @@
 ifeq ($(CPU),athlon-xp)
         CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
-        DEFS += -DFENCES=p3
+        DEFS += -DCONFIG_FENCES_P3
         CONFIG_SMP = n
         CONFIG_HT = n
@@ -56 +56 @@
 ifeq ($(CPU),athlon-mp)
         CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
-        DEFS += -DFENCES=p3
+        DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
 ifeq ($(CPU),pentium3)
         CFLAGS += -march=pentium3 -mmmx -msse
-        DEFS += -DFENCES=p3
+        DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
 ifeq ($(CPU),prescott)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
-        DEFS += -DFENCES=p4
+        DEFS += -DCONFIG_FENCES_P4
 endif
 ifeq ($(CPU),pentium4)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
-        DEFS += -DFENCES=p4
+        DEFS += -DCONFIG_FENCES_P4
 endif
 

arch/ia32/include/barrier.h

@@ -44 +44 @@
 #define CS_LEAVE_BARRIER()      __asm__ volatile ("" ::: "memory")
 
-#if (FENCES == p4)
+#ifdef CONFIG_FENCES_P4
 #       define memory_barrier() __asm__ volatile ("mfence\n" ::: "memory")
-#       define read_barrier()           __asm__ volatile ("sfence\n" ::: "memory")
-#       define write_barrier()          __asm__ volatile ("lfence\n" ::: "memory")
-#elif (FENCES == p3)
-#       define memory_barrier() __asm__ volatile ("xchgl %%eax,%%eax\n" ::: "memory")
-#       define read_barrier()           __asm__ volatile ("sfence\n" ::: "memory")
-#       define write_barrier()          __asm__ volatile ("xchgl %%eax,%%eax\n" ::: "memory")
-#else
-#       error Unsupported FENCES value
+#       define read_barrier()           __asm__ volatile ("lfence\n" ::: "memory")
+#       define write_barrier()          __asm__ volatile ("sfence\n" ::: "memory")
+#elif CONFIG_FENCES_P3
+#       define memory_barrier() __asm__ volatile ("\n" ::: "memory")
+#       define read_barrier()           __asm__ volatile ("\n" ::: "memory")
+#       define write_barrier()          __asm__ volatile ("sfence\n" ::: "memory")
 #endif