X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbacktrace.c;h=91549db347812b516e2eb4fb27b93c54349deb62;hb=f9ef1c31cfcd2d9ded66588a11c59e29e5aaa2ca;hp=42ab8c48b70b59524c054530385f14c060b75cf7;hpb=7559c396688cbbc6fab80897bbb4b993646bcf54;p=openvswitch

diff --git a/lib/backtrace.c b/lib/backtrace.c
index 42ab8c48..91549db3 100644
--- a/lib/backtrace.c
+++ b/lib/backtrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "compiler.h"
-
-#define THIS_MODULE VLM_backtrace
 #include "vlog.h"
 
-static uintptr_t UNUSED
+VLOG_DEFINE_THIS_MODULE(backtrace);
+
+static uintptr_t OVS_UNUSED
 get_max_stack(void)
 {
     static const char file_name[] = "/proc/self/maps";
@@ -69,16 +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;
-#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
@@ -91,6 +83,7 @@ in_stack(void *p)
 void
 backtrace_capture(struct backtrace *backtrace)
 {
+#ifdef __GNUC__
     void **frame;
     size_t n;
 
@@ -103,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
 }