isolate architecture dependent code

4 files changed, 44 insertions, 5 deletions

diff --git a/include/asm.h b/include/asm.h
new file mode 100644
index 0000000..a58622e
--- /dev/null
+++ b/include/asm.h
@@ -0,0 +1,14 @@
+/* liblitmus platform dependent includes */
+
+#ifndef ASM_H
+#define ASM_H
+
+#ifdef __i386__
+#include "asm_i386.h"
+#endif
+
+#ifdef __sparc__
+#include "asm_sparc.h"
+#endif
+
+#endif
diff --git a/include/asm_i386.h b/include/asm_i386.h
new file mode 100644
index 0000000..51ba501
--- /dev/null
+++ b/include/asm_i386.h
@@ -0,0 +1,8 @@
+/* Intel ia32 assembly. 
+ * Don't include directly, use asm.h instead.
+ */
+
+static inline void barrier(void)
+{
+        __asm__ __volatile__("sfence": : :"memory");
+}
diff --git a/include/asm_sparc.h b/include/asm_sparc.h
new file mode 100644
index 0000000..0e0ca78
--- /dev/null
+++ b/include/asm_sparc.h
@@ -0,0 +1,21 @@
+/* sparc64 assembly.
+ * Don't include directly, use asm.h instead.
+ */
+
+/* From Linux: 
+   <<snip>>*/
+#define membar_safe(type) \
+do {    __asm__ __volatile__("ba,pt     %%xcc, 1f\n\t" \
+                             " membar   " type "\n" \
+                             "1:\n" \
+                             : : : "memory"); \
+} while (0)
+
+#define mb()    \
+        membar_safe("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
+/*  <<snap>> */
+
+static inline void barrier(void)
+{
+        mb();
+}
diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index 35c84b6..d29c652 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -2,6 +2,7 @@
 
 #include "litmus.h"
 #include "internal.h"
+#include "asm.h"
 
 /* per real-time thread kernel <-> user space flags */
 
@@ -35,11 +36,6 @@ int init_kernel_iface(void)
         return ret;
 }
 
-static inline void barrier(void)
-{
-        __asm__ __volatile__("sfence": : :"memory");
-}
-
 void enter_np(void)
 {
         if (++np_flag.ctr == 1)