X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Fprocessor.h;h=68ac258631a61491b287d0c1f492253dd5881fda;hb=066b83b8dfc562e00cb61d39eca0e0f77242828c;hp=db39ee8b5382ac249ab77b5ad467f537034a7dcc;hpb=a09dac63957396890b1085cac0fee92ecc5db87a;p=ust.git

diff --git a/include/ust/processor.h b/include/ust/processor.h
index db39ee8..68ac258 100644
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -20,11 +20,14 @@
 
 #include <stddef.h>
 #include <string.h>
+#include <urcu-bp.h>
 
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
-#ifndef __x86_64
+#define ____cacheline_aligned __attribute__((aligned(CACHE_LINE_SIZE)))
+
+#ifdef __i386
 
 struct registers {
 	short ss;
@@ -40,6 +43,15 @@ struct registers {
 	long esp;
 };
 
+static inline int fls(int x)
+{
+        int r;
+        asm("bsrl %1,%0\n\t"
+            "cmovzl %2,%0"
+            : "=&r" (r) : "rm" (x), "rm" (-1));
+        return r + 1;
+}
+
 #ifdef CONFIG_UST_GDB_INTEGRATION
 
 /* save_registers - saves most of the processor's registers so
@@ -198,11 +210,13 @@ struct registers {
 
 #define RELATIVE_ADDRESS(__rel_label__) __rel_label__
 
-#define ARCH_COPY_ADDR(src, dst) "lea " src "," dst
+#define ARCH_COPY_ADDR(dst) "lea 2b," dst "\n\t"
 
 #define _ASM_PTR ".long "
 
-#else /* below is code for x86-64 */
+#endif /* below is code for x86-64 */
+
+#ifdef __x86_64
 
 struct registers {
 	int padding; /* 4 bytes */
@@ -227,6 +241,15 @@ struct registers {
 	unsigned long rsp;
 };
 
+static inline int fls(int x)
+{
+        int r;
+        asm("bsrl %1,%0\n\t"
+            "cmovzl %2,%0"
+            : "=&r" (r) : "rm" (x), "rm" (-1));
+        return r + 1;
+}
+
 #ifdef CONFIG_UST_GDB_INTEGRATION
 
 #define save_registers(regsptr) \
@@ -398,10 +421,32 @@ struct registers {
  * in a relocatable way. On x86-64, this uses a special (%rip) notation. */
 #define RELATIVE_ADDRESS(__rel_label__) __rel_label__(%%rip)
 
-#define ARCH_COPY_ADDR(src, dst) "lea " src "(%%rip)," dst
+#define ARCH_COPY_ADDR(dst) "lea 2b(%%rip)," dst "\n\t"
 
 #define _ASM_PTR ".quad "
 
-#endif
+#endif /* x86_64 */
+
+#ifdef __PPC__
+
+struct registers {
+};
+
+static __inline__ int fls(unsigned int x)
+{
+        int lz;
+
+        asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
+        return 32 - lz;
+}
+
+#define ARCH_COPY_ADDR(dst) \
+		     "lis " dst ",2b@h\n\t" /* load high bytes */ \
+		     "ori " dst "," dst ",2b@l\n\t" /* load low bytes */
+
+#define _ASM_PTR ".long "
+#define save_registers(a)
+
+#endif /* __PPC__ */
 
 #endif /* UST_PROCESSOR_H */