add more sparc assembly, and platform indepenent get_cycles()

3 files changed, 170 insertions, 3 deletions

diff --git a/include/asm_i386.h b/include/asm_i386.h
index 51ba501..e077ddc 100644
--- a/include/asm_i386.h
+++ b/include/asm_i386.h
@@ -1,8 +1,68 @@
 /* Intel ia32 assembly. 
  * Don't include directly, use asm.h instead.
+ *
+ * Most of this code comes straight out of the Linux kernel.
+ *
+ * The terms of the GPL v2 apply.
  */
 
 static inline void barrier(void)
 {
         __asm__ __volatile__("sfence": : :"memory");
 }
+
+static __inline__ void cpu_relax(void)
+{
+        __asm__ __volatile("pause");
+}
+
+typedef struct { int counter; } atomic_t;
+
+#define ATOMIC_INIT(i)  { (i) }
+
+/**
+ * atomic_read - read atomic variable
+ * @v: pointer of type atomic_t
+ * 
+ * Atomically reads the value of @v.
+ */ 
+#define atomic_read(v)          ((v)->counter)
+
+/**
+ * atomic_set - set atomic variable
+ * @v: pointer of type atomic_t
+ * @i: required value
+ * 
+ * Atomically sets the value of @v to @i.
+ */ 
+#define atomic_set(v,i)         (((v)->counter) = (i))
+
+static __inline__ void atomic_add(int i, atomic_t *v)
+{
+        __asm__ __volatile__(
+                "lock; addl %1,%0"
+                :"+m" (v->counter)
+                :"ir" (i));
+}
+
+/**
+ * atomic_add_return - add and return
+ * @v: pointer of type atomic_t
+ * @i: integer value to add
+ *
+ * Atomically adds @i to @v and returns @i + @v
+ */
+static __inline__ int atomic_add_return(int i, atomic_t *v)
+{
+        int __i;
+        __i = i;
+        __asm__ __volatile__(
+                "lock; xaddl %0, %1"
+                :"+r" (i), "+m" (v->counter)
+                : : "memory");
+        return i + __i;
+}
+ 
+#define atomic_inc_return(v)  (atomic_add_return(1,v))
+
+
diff --git a/include/asm_sparc.h b/include/asm_sparc.h
index 0e0ca78..96c8049 100644
--- a/include/asm_sparc.h
+++ b/include/asm_sparc.h
@@ -1,9 +1,12 @@
 /* sparc64 assembly.
  * Don't include directly, use asm.h instead.
+ *
+ * Most of this code comes straight out of the Linux kernel.
+ *
+ * The terms of the GPL v2 apply.
+ *
  */
 
-/* From Linux: 
-   <<snip>>*/
 #define membar_safe(type) \
 do {    __asm__ __volatile__("ba,pt     %%xcc, 1f\n\t" \
                              " membar   " type "\n" \
@@ -13,9 +16,77 @@ do {	__asm__ __volatile__("ba,pt	%%xcc, 1f\n\t" \
 
 #define mb()    \
         membar_safe("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
-/*  <<snap>> */
 
 static inline void barrier(void)
 {
         mb();
 }
+
+
+#define cpu_relax() barrier()
+
+static inline int
+cmpxchg(volatile int *m, int old, int new)
+{
+        __asm__ __volatile__("membar #StoreLoad | #LoadLoad\n"
+                             "cas [%2], %3, %0\n\t"
+                             "membar #StoreLoad | #StoreStore"
+                             : "=&r" (new)
+                             : "0" (new), "r" (m), "r" (old)
+                             : "memory");
+
+        return new;
+}
+
+
+typedef struct { int counter; } atomic_t;
+
+#define ATOMIC_INIT(i)  { (i) }
+
+/**
+ * atomic_read - read atomic variable
+ * @v: pointer of type atomic_t
+ * 
+ * Atomically reads the value of @v.
+ */ 
+#define atomic_read(v)          ((v)->counter)
+
+/**
+ * atomic_set - set atomic variable
+ * @v: pointer of type atomic_t
+ * @i: required value
+ * 
+ * Atomically sets the value of @v to @i.
+ */ 
+#define atomic_set(v,i)         (((v)->counter) = (i))
+
+
+/**
+ * atomic_add_return - add and return
+ * @v: pointer of type atomic_t
+ * @i: integer value to add
+ *
+ * Atomically adds @i to @v and returns @i + @v
+ */
+static __inline__ int atomic_add_return(int i, atomic_t *v)
+{
+        int old; 
+        int ret;
+        goto first;
+        do {
+                cpu_relax();
+        first:
+                old = atomic_read(v);
+                ret = cmpxchg(&v->counter, old, old + i);               
+        } while (ret != old);
+        return old + i;
+}
+ 
+static __inline__ void atomic_add(int i, atomic_t *v)
+{
+        atomic_add_return(i, v);
+}
+
+#define atomic_inc_return(v)  (atomic_add_return(1,v))
+
+
diff --git a/include/cycles.h b/include/cycles.h
new file mode 100644
index 0000000..01f36a9
--- /dev/null
+++ b/include/cycles.h
@@ -0,0 +1,36 @@
+#ifndef CYCLES_H
+#define CYCLES_H
+
+#ifdef __i386__
+
+typedef unsigned long long cycles_t;
+
+#define CYCLES_FMT "llu"
+
+static inline cycles_t get_cycles(void) 
+{
+        unsigned long long ret;
+        __asm__ __volatile__("rdtsc" : "=A" (ret));
+        return ret;
+}
+
+#endif
+
+
+#ifdef __sparc__
+
+#define NPT_BIT 63
+
+typedef unsigned long cycles_t;
+
+#define CYCLES_FMT "lu"
+
+static inline cycles_t get_cycles(void) {
+        unsigned long cycles = 0;
+        __asm__ __volatile__("rd %%asr24, %0" : "=r" (cycles));
+        return cycles & ~(1UL << NPT_BIT);
+}
+
+#endif
+
+#endif