Changeset 3fc03fd in mainline

Timestamp:

2005-12-14T20:34:15Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

dc747e3

Parents:

d91e54b

Message:

Better gcc CALLER implementation

Files:

• arch/ia32/include/debug.h (modified) (1 diff)
• arch/mips32/include/debug.h (modified) (1 diff)
• generic/include/debug.h (modified) (1 diff)
• generic/src/synch/spinlock.c (modified) (2 diffs)

arch/ia32/include/debug.h

@@ -32 +32 @@
 #include <arch/asm.h>
 
-/** Return caller of this function 
- *
- * @param first_arg First argument of the function
- */
-#define CALLER(first_arg)        ((__address *) &first_arg)[-1];
-
 #define HERE get_ip()
 

arch/mips32/include/debug.h

@@ -43 +43 @@
 #define ___intmode()    asm volatile ( "\t.word\t0x29\n");
 
-/** Return current IP address */
-static inline __address * _get_ra() 
-{
-        __address *ip;
-
-        __asm__ volatile (
-                "mov %%31, %0"
-                : "=r" (ip)
-                );
-        return ip;
-}
-#define CALLER(first_arg)    (_get_ra())
-
 
 #endif

generic/include/debug.h

@@ -34 +34 @@
 #include <arch.h>
 
-#ifndef CALLER
-/**  Default (returns 0) macro for getting address of calling function
- *   @param x First argument of the called function
- */
-#  define CALLER(x)       ((__address *) 0)
-#endif
+#define CALLER       ((__address *)__builtin_return_address(0))
 
 #ifndef HERE

generic/src/synch/spinlock.c

@@ -64 +64 @@
 {
         count_t i = 0;
-        __address caller = CALLER(sl);
         char *symbol;
         bool deadlock_reported = false;
@@ -72 +71 @@
                 if (i++ > 300000) {
                         printf("cpu%d: looping on spinlock %p:%s, caller=%p",
-                               CPU->id, sl, sl->name, caller);
-                        symbol = get_symtab_entry(caller);
+                               CPU->id, sl, sl->name, CALLER);
+                        symbol = get_symtab_entry(CALLER);
                         if (symbol)
                                 printf("(%s)", symbol);