update

git-svn-id: http://ltt.polymtl.ca/svn@2854 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index fd37c7735ef2dab90c1a2a6eea3dfcb597e360dc..48f627e0db4fc117e3763c7d78b0ad7206dbf62d 100644 (file)
--- a/markers-test/test-mark-speed-edit.c
+++ b/markers-test/test-mark-speed-edit.c
@@ -62,15 +62,12 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 10;
-
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = temp * 100 + 60;
-       temp = temp << 10;
+       asm ("" : : "i" ((100 + 60) << 10));
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        test2(NULL, NULL, 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index 20bcc621af0dfbcaf62a35bff192edd15fbbea39..c960ec03b7fcf0ab0bb37772fda80aebfc97d47b 100644 (file)
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -52,15 +52,12 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 10;
-
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = temp * 100 + 60;
-       temp = temp << 10;
+       asm ("" : : "i" ((100 + 60) << 10));
        asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index 9393f0ffc2321b3e1c5ec21af79b9ab7d9ba7ff6..3bc716d08900c3c33abf982592571dabf9993b92 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -62,15 +62,12 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 10;
-
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = temp * 100 + 60;
-       temp = temp << 10;
+       asm ("" : : "i" ((100 + 60) << 10));
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        test2(NULL, NULL, 2, 10, arg, arg2);

diff --git a/markers-test/test-mark-speed-opt.c b/markers-test/test-mark-speed-opt.c
index 1800dea7d75b215dd04b81e1ba9ad96aecb4c63e..8374c2d50c80fdb83dc7e8c1488edc14971db7f3 100644 (file)
--- a/markers-test/test-mark-speed-opt.c
+++ b/markers-test/test-mark-speed-opt.c
@@ -52,15 +52,12 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 10;
-
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = temp * 100 + 60;
-       temp = temp << 10;
+       asm ("" : : "i" ((100 + 60) << 10));
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        __my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index bec60164a81919bbe79da1a66f2bd03529fd4b41..3f0b0d703b306e0aa1e5cef7afcd8a10c83d1248 100644 (file)
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -52,15 +52,12 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 10;
-
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = temp * 100 + 60;
-       temp = temp << 10;
+       asm ("" : : "i" ((100 + 60) << 10));
        //asm volatile ("");
        __my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);