Changeset 53634f9 in mainline

Timestamp:

2009-01-31T13:24:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1e241723

Parents:

896ad9f

Message:

make RANDI a generic macro

Location:

kernel

Files:

• arch/amd64/src/boot/boot.S (modified) (1 diff)
• arch/ppc32/src/mm/tlb.c (modified) (2 diffs)
• generic/include/macros.h (modified) (1 diff)
• test/synch/rwlock4.c (modified) (1 diff)
• test/synch/semaphore2.c (modified) (1 diff)

kernel/arch/amd64/src/boot/boot.S

@@ -1 @@
-
+#
 # Copyright (c) 2005 Ondrej Palkovsky
 # Copyright (c) 2006 Martin Decky

kernel/arch/ppc32/src/mm/tlb.c

@@ -41 +41 @@
 #include <print.h>
 #include <symtab.h>
+#include <macros.h>
 
 
@@ -130 +131 @@
 
 
-/** Pseudorandom generator
- *
- * A pretty standard linear congruential pseudorandom
- * number generator (m = 2^32).
- *
- */
-#define RANDI(seed) \
-        ({ \
-                (seed) = 1103515245 * (seed) + 12345; \
-                (seed); \
-        })
-
-
 static void pht_insert(const uintptr_t vaddr, const pte_t *pte)
 {

kernel/generic/include/macros.h

@@ -77 +77 @@
 #define STRING_ARG(arg) #arg
 
+/** Pseudorandom generator
+ *
+ * A pretty standard linear congruential pseudorandom
+ * number generator (m = 2^32 or 2^64 depending on architecture).
+ *
+ */
+#define RANDI(seed) \
+        ({ \
+                (seed) = 1103515245 * (seed) + 12345; \
+                (seed); \
+        })
+
 #endif
 

kernel/test/synch/rwlock4.c

@@ -61 +61 @@
         spinlock_lock(&rw_lock);        
         rc = seed % max;
-        seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
+        seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc;
         spinlock_unlock(&rw_lock);
         return rc;

kernel/test/synch/semaphore2.c

@@ -54 +54 @@
         spinlock_lock(&sem_lock);       
         rc = seed % max;
-        seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
+        seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc;
         spinlock_unlock(&sem_lock);
         return rc;