From c44d77055cd4a89606dbe377824053ef074208b7 Mon Sep 17 00:00:00 2001
From: "hp.com!davidm" <hp.com!davidm>
Date: Thu, 22 Jan 2004 08:36:15 +0000
Subject: [PATCH] Move debug defines after definition of UNWI_ARCH_OBJ().
Replace tdep_debug_level with unwi_debug_level and declare it here.
(Logical change 1.158)
---
include/internal.h | 59 ++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 28 deletions(-)
diff --git a/include/internal.h b/include/internal.h
index 4409b5d7..88e0e194 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -95,34 +95,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
# define UNW_DEBUG 0
#endif
-#if UNW_DEBUG
-# include <stdio.h>
-# define debug(level,format...) \
-do { \
- if (tdep_debug_level > level) fprintf (stderr, format); \
-} while (0)
-# define Debug(level,format...) \
-do { \
- if (tdep_debug_level > level) \
- { \
- int _n = level; \
- if (_n > 16) \
- _n = 16; \
- fprintf (stderr, "%*c>%s: ", _n, ' ', __FUNCTION__); \
- fprintf (stderr, format); \
- } \
-} while (0)
-# define dprintf(format...) \
- fprintf (stderr, format)
-# ifdef __GNUC__
-# undef inline
-# define inline UNUSED
-# endif
-#else
-# define debug(level,format...)
-# define dprintf(format...)
-#endif
-
#define NELEMS(a) (sizeof (a) / sizeof ((a)[0]))
/* Make it easy to write thread-safe code which may or may not be
@@ -240,6 +212,37 @@ extern int UNWI_OBJ(get_proc_name) (unw_addr_space_t as, unw_word_t ip,
extern unw_dyn_info_list_t _U_dyn_info_list;
extern pthread_mutex_t _U_dyn_info_list_lock;
+#if UNW_DEBUG
+#define unwi_debug_level UNWI_ARCH_OBJ(debug_level)
+extern long unwi_debug_level;
+
+# include <stdio.h>
+# define debug(level,format...) \
+do { \
+ if (unwi_debug_level > level) fprintf (stderr, format); \
+} while (0)
+# define Debug(level,format...) \
+do { \
+ if (unwi_debug_level > level) \
+ { \
+ int _n = level; \
+ if (_n > 16) \
+ _n = 16; \
+ fprintf (stderr, "%*c>%s: ", _n, ' ', __FUNCTION__); \
+ fprintf (stderr, format); \
+ } \
+} while (0)
+# define dprintf(format...) \
+ fprintf (stderr, format)
+# ifdef __GNUC__
+# undef inline
+# define inline UNUSED
+# endif
+#else
+# define debug(level,format...)
+# define dprintf(format...)
+#endif
+
#define WSIZE (sizeof (unw_word_t))
static inline ALWAYS_INLINE void