X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbacktrace.c;h=91549db347812b516e2eb4fb27b93c54349deb62;hb=46aef12ee5fcb028d20bac654c8a08cf993cfac8;hp=131bdf4fc87881d3440964745579ef842f6c71d9;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=openvswitch diff --git a/lib/backtrace.c b/lib/backtrace.c index 131bdf4f..91549db3 100644 --- a/lib/backtrace.c +++ b/lib/backtrace.c @@ -23,7 +23,7 @@ #include "compiler.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(backtrace) +VLOG_DEFINE_THIS_MODULE(backtrace); static uintptr_t OVS_UNUSED get_max_stack(void) @@ -69,20 +69,8 @@ stack_high(void) static uintptr_t stack_low(void) { -#ifdef __i386__ - uintptr_t low; - asm("movl %%esp,%0" : "=g" (low)); + uintptr_t low = (uintptr_t) &low; return low; -#elif __x86_64__ - uintptr_t low; - asm("movq %%rsp,%0" : "=g" (low)); - return low; -#else - /* This causes a warning in GCC that cannot be disabled, so use it only on - * non-x86. */ - int dummy; - return (uintptr_t) &dummy; -#endif } static bool @@ -95,6 +83,7 @@ in_stack(void *p) void backtrace_capture(struct backtrace *backtrace) { +#ifdef __GNUC__ void **frame; size_t n; @@ -107,4 +96,7 @@ backtrace_capture(struct backtrace *backtrace) backtrace->frames[n++] = (uintptr_t) frame[1]; } backtrace->n_frames = n; +#else + backtrace->n_frames = 0; +#endif }