util: Move u_debug to utils

Tested-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

9 files changed, 4 insertions, 910 deletions

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 75df7d0717a..72cf2ec6443 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -224,8 +224,6 @@ C_SOURCES := \
 	util/u_cache.h \
 	util/u_cpu_detect.c \
 	util/u_cpu_detect.h \
-	util/u_debug.c \
-	util/u_debug.h \
 	util/u_debug_gallium.h \
 	util/u_debug_gallium.c \
 	util/u_debug_describe.c \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 9c158b6b373..1b5eb4d155d 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -244,8 +244,6 @@ files_libgallium = files(
   'util/u_cache.h',
   'util/u_cpu_detect.c',
   'util/u_cpu_detect.h',
-  'util/u_debug.c',
-  'util/u_debug.h',
   'util/u_debug_gallium.h',
   'util/u_debug_gallium.c',
   'util/u_debug_describe.c',
diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/gallium/auxiliary/util/u_cpu_detect.c
index 751443f06f9..4dbb4d8fb58 100644
--- a/src/gallium/auxiliary/util/u_cpu_detect.c
+++ b/src/gallium/auxiliary/util/u_cpu_detect.c
@@ -34,7 +34,7 @@
 
 #include "pipe/p_config.h"
 
-#include "u_debug.h"
+#include "util/u_debug.h"
 #include "u_cpu_detect.h"
 #include "c11/threads.h"
 
diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
deleted file mode 100644
index f6ed0138c1f..00000000000
--- a/src/gallium/auxiliary/util/u_debug.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-
-#include "pipe/p_config.h"
-
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
-#include "pipe/p_format.h"
-#include "pipe/p_state.h"
-#include "util/u_string.h"
-#include "util/u_math.h"
-#include <inttypes.h>
-
-#include <stdio.h>
-#include <limits.h> /* CHAR_BIT */
-#include <ctype.h> /* isalnum */
-
-#ifdef _WIN32
-#include <windows.h>
-#include <stdlib.h>
-#endif
-
-
-void
-_debug_vprintf(const char *format, va_list ap)
-{
-   static char buf[4096] = {'\0'};
-#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED)
-   /* We buffer until we find a newline. */
-   size_t len = strlen(buf);
-   int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);
-   if (ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {
-      os_log_message(buf);
-      buf[0] = '\0';
-   }
-#else
-   util_vsnprintf(buf, sizeof(buf), format, ap);
-   os_log_message(buf);
-#endif
-}
-
-
-void
-_pipe_debug_message(struct pipe_debug_callback *cb,
-                    unsigned *id,
-                    enum pipe_debug_type type,
-                    const char *fmt, ...)
-{
-   va_list args;
-   va_start(args, fmt);
-   if (cb && cb->debug_message)
-      cb->debug_message(cb->data, id, type, fmt, args);
-   va_end(args);
-}
-
-
-void
-debug_disable_error_message_boxes(void)
-{
-#ifdef _WIN32
-   /* When Windows' error message boxes are disabled for this process (as is
-    * typically the case when running tests in an automated fashion) we disable
-    * CRT message boxes too.
-    */
-   UINT uMode = SetErrorMode(0);
-   SetErrorMode(uMode);
-   if (uMode & SEM_FAILCRITICALERRORS) {
-      /* Disable assertion failure message box.
-       * http://msdn.microsoft.com/en-us/library/sas1dkb2.aspx
-       */
-      _set_error_mode(_OUT_TO_STDERR);
-#ifdef _MSC_VER
-      /* Disable abort message box.
-       * http://msdn.microsoft.com/en-us/library/e631wekh.aspx
-       */
-      _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
-   }
-#endif /* _WIN32 */
-}
-
-
-#ifdef DEBUG
-void
-debug_print_blob(const char *name, const void *blob, unsigned size)
-{
-   const unsigned *ublob = (const unsigned *)blob;
-   unsigned i;
-
-   debug_printf("%s (%d dwords%s)\n", name, size/4,
-                size%4 ? "... plus a few bytes" : "");
-
-   for (i = 0; i < size/4; i++) {
-      debug_printf("%d:\t%08x\n", i, ublob[i]);
-   }
-}
-#endif
-
-
-static boolean
-debug_get_option_should_print(void)
-{
-   static boolean first = TRUE;
-   static boolean value = FALSE;
-
-   if (!first)
-      return value;
-
-   /* Oh hey this will call into this function,
-    * but its cool since we set first to false
-    */
-   first = FALSE;
-   value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", FALSE);
-   /* XXX should we print this option? Currently it wont */
-   return value;
-}
-
-
-const char *
-debug_get_option(const char *name, const char *dfault)
-{
-   const char *result;
-
-   result = os_get_option(name);
-   if (!result)
-      result = dfault;
-
-   if (debug_get_option_should_print())
-      debug_printf("%s: %s = %s\n", __FUNCTION__, name,
-                   result ? result : "(null)");
-
-   return result;
-}
-
-
-boolean
-debug_get_bool_option(const char *name, boolean dfault)
-{
-   const char *str = os_get_option(name);
-   boolean result;
-
-   if (str == NULL)
-      result = dfault;
-   else if (!util_strcmp(str, "n"))
-      result = FALSE;
-   else if (!util_strcmp(str, "no"))
-      result = FALSE;
-   else if (!util_strcmp(str, "0"))
-      result = FALSE;
-   else if (!util_strcmp(str, "f"))
-      result = FALSE;
-   else if (!util_strcmp(str, "F"))
-      result = FALSE;
-   else if (!util_strcmp(str, "false"))
-      result = FALSE;
-   else if (!util_strcmp(str, "FALSE"))
-      result = FALSE;
-   else
-      result = TRUE;
-
-   if (debug_get_option_should_print())
-      debug_printf("%s: %s = %s\n", __FUNCTION__, name,
-                   result ? "TRUE" : "FALSE");
-
-   return result;
-}
-
-
-long
-debug_get_num_option(const char *name, long dfault)
-{
-   long result;
-   const char *str;
-
-   str = os_get_option(name);
-   if (!str) {
-      result = dfault;
-   } else {
-      char *endptr;
-
-      result = strtol(str, &endptr, 0);
-      if (str == endptr) {
-         /* Restore the default value when no digits were found. */
-         result = dfault;
-      }
-   }
-
-   if (debug_get_option_should_print())
-      debug_printf("%s: %s = %li\n", __FUNCTION__, name, result);
-
-   return result;
-}
-
-
-static boolean
-str_has_option(const char *str, const char *name)
-{
-   /* Empty string. */
-   if (!*str) {
-      return FALSE;
-   }
-
-   /* OPTION=all */
-   if (!util_strcmp(str, "all")) {
-      return TRUE;
-   }
-
-   /* Find 'name' in 'str' surrounded by non-alphanumeric characters. */
-   {
-      const char *start = str;
-      unsigned name_len = strlen(name);
-
-      /* 'start' is the beginning of the currently-parsed word,
-       * we increment 'str' each iteration.
-       * if we find either the end of string or a non-alphanumeric character,
-       * we compare 'start' up to 'str-1' with 'name'. */
-
-      while (1) {
-         if (!*str || !(isalnum(*str) || *str == '_')) {
-            if (str-start == name_len &&
-                !memcmp(start, name, name_len)) {
-               return TRUE;
-            }
-
-            if (!*str) {
-               return FALSE;
-            }
-
-            start = str+1;
-         }
-
-         str++;
-      }
-   }
-
-   return FALSE;
-}
-
-
-uint64_t
-debug_get_flags_option(const char *name,
-                       const struct debug_named_value *flags,
-                       uint64_t dfault)
-{
-   uint64_t result;
-   const char *str;
-   const struct debug_named_value *orig = flags;
-   unsigned namealign = 0;
-
-   str = os_get_option(name);
-   if (!str)
-      result = dfault;
-   else if (!util_strcmp(str, "help")) {
-      result = dfault;
-      _debug_printf("%s: help for %s:\n", __FUNCTION__, name);
-      for (; flags->name; ++flags)
-         namealign = MAX2(namealign, strlen(flags->name));
-      for (flags = orig; flags->name; ++flags)
-         _debug_printf("| %*s [0x%0*"PRIx64"]%s%s\n", namealign, flags->name,
-                      (int)sizeof(uint64_t)*CHAR_BIT/4, flags->value,
-                      flags->desc ? " " : "", flags->desc ? flags->desc : "");
-   }
-   else {
-      result = 0;
-      while (flags->name) {
-	 if (str_has_option(str, flags->name))
-	    result |= flags->value;
-	 ++flags;
-      }
-   }
-
-   if (debug_get_option_should_print()) {
-      if (str) {
-         debug_printf("%s: %s = 0x%"PRIx64" (%s)\n",
-                      __FUNCTION__, name, result, str);
-      } else {
-         debug_printf("%s: %s = 0x%"PRIx64"\n", __FUNCTION__, name, result);
-      }
-   }
-
-   return result;
-}
-
-
-void
-_debug_assert_fail(const char *expr, const char *file, unsigned line,
-                   const char *function)
-{
-   _debug_printf("%s:%u:%s: Assertion `%s' failed.\n",
-                 file, line, function, expr);
-   os_abort();
-}
-
-
-const char *
-debug_dump_enum(const struct debug_named_value *names,
-                unsigned long value)
-{
-   static char rest[64];
-
-   while (names->name) {
-      if (names->value == value)
-	 return names->name;
-      ++names;
-   }
-
-   util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-   return rest;
-}
-
-
-const char *
-debug_dump_enum_noprefix(const struct debug_named_value *names,
-                         const char *prefix,
-                         unsigned long value)
-{
-   static char rest[64];
-
-   while (names->name) {
-      if (names->value == value) {
-         const char *name = names->name;
-         while (*name == *prefix) {
-            name++;
-            prefix++;
-         }
-         return name;
-      }
-      ++names;
-   }
-
-   util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-   return rest;
-}
-
-
-const char *
-debug_dump_flags(const struct debug_named_value *names, unsigned long value)
-{
-   static char output[4096];
-   static char rest[256];
-   int first = 1;
-
-   output[0] = '\0';
-
-   while (names->name) {
-      if ((names->value & value) == names->value) {
-	 if (!first)
-	    util_strncat(output, "|", sizeof(output) - strlen(output) - 1);
-	 else
-	    first = 0;
-	 util_strncat(output, names->name, sizeof(output) - strlen(output) - 1);
-	 output[sizeof(output) - 1] = '\0';
-	 value &= ~names->value;
-      }
-      ++names;
-   }
-
-   if (value) {
-      if (!first)
-	 util_strncat(output, "|", sizeof(output) - strlen(output) - 1);
-      else
-	 first = 0;
-
-      util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-      util_strncat(output, rest, sizeof(output) - strlen(output) - 1);
-      output[sizeof(output) - 1] = '\0';
-   }
-
-   if (first)
-      return "0";
-
-   return output;
-}
-
-
-
-#ifdef DEBUG
-int fl_indent = 0;
-const char* fl_function[1024];
-
-int
-debug_funclog_enter(const char* f, UNUSED const int line,
-                    UNUSED const char* file)
-{
-   int i;
-
-   for (i = 0; i < fl_indent; i++)
-      debug_printf("  ");
-   debug_printf("%s\n", f);
-
-   assert(fl_indent < 1023);
-   fl_function[fl_indent++] = f;
-
-   return 0;
-}
-
-void
-debug_funclog_exit(const char* f, UNUSED const int line,
-                   UNUSED const char* file)
-{
-   --fl_indent;
-   assert(fl_indent >= 0);
-   assert(fl_function[fl_indent] == f);
-}
-
-void
-debug_funclog_enter_exit(const char* f, UNUSED const int line,
-                         UNUSED const char* file)
-{
-   int i;
-   for (i = 0; i < fl_indent; i++)
-      debug_printf("  ");
-   debug_printf("%s\n", f);
-}
-#endif
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
deleted file mode 100644
index b3505caebfd..00000000000
--- a/src/gallium/auxiliary/util/u_debug.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/**
- * @file
- * Cross-platform debugging helpers.
- * 
- * For now it just has assert and printf replacements, but it might be extended 
- * with stack trace reports and more advanced logging in the near future. 
- * 
- * @author Jose Fonseca <[email protected]>
- */
-
-#ifndef U_DEBUG_H_
-#define U_DEBUG_H_
-
-
-#include "util/os_misc.h"
-
-#if defined(PIPE_OS_HAIKU)
-/* Haiku provides debug_printf in libroot with OS.h */
-#include <OS.h>
-#endif
-
-#include "pipe/p_defines.h"
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
-#if defined(__GNUC__)
-#define _util_printf_format(fmt, list) __attribute__ ((format (printf, fmt, list)))
-#else
-#define _util_printf_format(fmt, list)
-#endif
-
-void _debug_vprintf(const char *format, va_list ap);
-   
-
-static inline void
-_debug_printf(const char *format, ...)
-{
-   va_list ap;
-   va_start(ap, format);
-   _debug_vprintf(format, ap);
-   va_end(ap);
-}
-
-
-/**
- * Print debug messages.
- *
- * The actual channel used to output debug message is platform specific. To
- * avoid misformating or truncation, follow these rules of thumb:
- * - output whole lines
- * - avoid outputing large strings (512 bytes is the current maximum length
- * that is guaranteed to be printed in all platforms)
- */
-#if !defined(PIPE_OS_HAIKU)
-static inline void
-debug_printf(const char *format, ...) _util_printf_format(1,2);
-
-static inline void
-debug_printf(const char *format, ...)
-{
-#ifdef DEBUG
-   va_list ap;
-   va_start(ap, format);
-   _debug_vprintf(format, ap);
-   va_end(ap);
-#else
-   (void) format; /* silence warning */
-#endif
-}
-#endif
-
-
-/*
- * ... isn't portable so we need to pass arguments in parentheses.
- *
- * usage:
- *    debug_printf_once(("answer: %i\n", 42));
- */
-#define debug_printf_once(args) \
-   do { \
-      static boolean once = TRUE; \
-      if (once) { \
-         once = FALSE; \
-         debug_printf args; \
-      } \
-   } while (0)
-
-
-#ifdef DEBUG
-#define debug_vprintf(_format, _ap) _debug_vprintf(_format, _ap)
-#else
-#define debug_vprintf(_format, _ap) ((void)0)
-#endif
-
-
-#ifdef DEBUG
-/**
- * Dump a blob in hex to the same place that debug_printf sends its
- * messages.
- */
-void debug_print_blob( const char *name, const void *blob, unsigned size );
-#else
-#define debug_print_blob(_name, _blob, _size) ((void)0)
-#endif
-
-
-/**
- * Disable interactive error message boxes.
- *
- * Should be called as soon as possible for effectiveness.
- */
-void
-debug_disable_error_message_boxes(void);
-
-
-/**
- * Hard-coded breakpoint.
- */
-#ifdef DEBUG
-#define debug_break() os_break()
-#else /* !DEBUG */
-#define debug_break() ((void)0)
-#endif /* !DEBUG */
-
-
-long
-debug_get_num_option(const char *name, long dfault);
-
-#ifdef _MSC_VER
-__declspec(noreturn)
-#endif
-void _debug_assert_fail(const char *expr, 
-                        const char *file, 
-                        unsigned line, 
-                        const char *function)
-#if defined(__GNUC__) && !defined(DEBUG)
-   __attribute__((noreturn))
-#endif
-;
-
-
-/** 
- * Assert macro
- * 
- * Do not expect that the assert call terminates -- errors must be handled 
- * regardless of assert behavior.
- *
- * For non debug builds the assert macro will expand to a no-op, so do not
- * call functions with side effects in the assert expression.
- */
-#ifndef NDEBUG
-#define debug_assert(expr) ((expr) ? (void)0 : _debug_assert_fail(#expr, __FILE__, __LINE__, __FUNCTION__))
-#else
-#define debug_assert(expr) (void)(0 && (expr))
-#endif
-
-
-/** Override standard assert macro */
-#ifdef assert
-#undef assert
-#endif
-#define assert(expr) debug_assert(expr)
-
-
-/**
- * Output the current function name.
- */
-#ifdef DEBUG
-#define debug_checkpoint() \
-   _debug_printf("%s\n", __FUNCTION__)
-#else
-#define debug_checkpoint() \
-   ((void)0) 
-#endif
-
-
-/**
- * Output the full source code position.
- */
-#ifdef DEBUG
-#define debug_checkpoint_full() \
-   _debug_printf("%s:%u:%s\n", __FILE__, __LINE__, __FUNCTION__)
-#else
-#define debug_checkpoint_full() \
-   ((void)0) 
-#endif
-
-
-/**
- * Output a warning message. Muted on release version.
- */
-#ifdef DEBUG
-#define debug_warning(__msg) \
-   _debug_printf("%s:%u:%s: warning: %s\n", __FILE__, __LINE__, __FUNCTION__, __msg)
-#else
-#define debug_warning(__msg) \
-   ((void)0) 
-#endif
-
-
-/**
- * Emit a warning message, but only once.
- */
-#ifdef DEBUG
-#define debug_warn_once(__msg) \
-   do { \
-      static bool warned = FALSE; \
-      if (!warned) { \
-         _debug_printf("%s:%u:%s: one time warning: %s\n", \
-                       __FILE__, __LINE__, __FUNCTION__, __msg); \
-         warned = TRUE; \
-      } \
-   } while (0)
-#else
-#define debug_warn_once(__msg) \
-   ((void)0) 
-#endif
-
-
-/**
- * Output an error message. Not muted on release version.
- */
-#ifdef DEBUG
-#define debug_error(__msg) \
-   _debug_printf("%s:%u:%s: error: %s\n", __FILE__, __LINE__, __FUNCTION__, __msg) 
-#else
-#define debug_error(__msg) \
-   _debug_printf("error: %s\n", __msg)
-#endif
-
-/**
- * Output a debug log message to the debug info callback.
- */
-#define pipe_debug_message(cb, type, fmt, ...) do { \
-   static unsigned id = 0; \
-   if ((cb) && (cb)->debug_message) { \
-      _pipe_debug_message(cb, &id, \
-                          PIPE_DEBUG_TYPE_ ## type, \
-                          fmt, ##__VA_ARGS__); \
-   } \
-} while (0)
-
-struct pipe_debug_callback;
-
-void
-_pipe_debug_message(
-   struct pipe_debug_callback *cb,
-   unsigned *id,
-   enum pipe_debug_type type,
-   const char *fmt, ...) _util_printf_format(4, 5);
-
-
-/**
- * Used by debug_dump_enum and debug_dump_flags to describe symbols.
- */
-struct debug_named_value
-{
-   const char *name;
-   uint64_t value;
-   const char *desc;
-};
-
-
-/**
- * Some C pre-processor magic to simplify creating named values.
- * 
- * Example:
- * @code
- * static const debug_named_value my_names[] = {
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_X),
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_Y),
- *    DEBUG_NAMED_VALUE(MY_ENUM_VALUE_Z),
- *    DEBUG_NAMED_VALUE_END
- * };
- * 
- *    ...
- *    debug_printf("%s = %s\n", 
- *                 name,
- *                 debug_dump_enum(my_names, my_value));
- *    ...
- * @endcode
- */
-#define DEBUG_NAMED_VALUE(__symbol) {#__symbol, (unsigned long)__symbol, NULL}
-#define DEBUG_NAMED_VALUE_WITH_DESCRIPTION(__symbol, __desc) {#__symbol, (unsigned long)__symbol, __desc}
-#define DEBUG_NAMED_VALUE_END {NULL, 0, NULL}
-
-
-/**
- * Convert a enum value to a string.
- */
-const char *
-debug_dump_enum(const struct debug_named_value *names, 
-                unsigned long value);
-
-const char *
-debug_dump_enum_noprefix(const struct debug_named_value *names, 
-                         const char *prefix,
-                         unsigned long value);
-
-
-/**
- * Convert binary flags value to a string.
- */
-const char *
-debug_dump_flags(const struct debug_named_value *names, 
-                 unsigned long value);
-
-
-/**
- * Function enter exit loggers
- */
-#ifdef DEBUG
-int debug_funclog_enter(const char* f, const int line, const char* file);
-void debug_funclog_exit(const char* f, const int line, const char* file);
-void debug_funclog_enter_exit(const char* f, const int line, const char* file);
-
-#define DEBUG_FUNCLOG_ENTER() \
-   int __debug_decleration_work_around = \
-      debug_funclog_enter(__FUNCTION__, __LINE__, __FILE__)
-#define DEBUG_FUNCLOG_EXIT() \
-   do { \
-      (void)__debug_decleration_work_around; \
-      debug_funclog_exit(__FUNCTION__, __LINE__, __FILE__); \
-      return; \
-   } while(0)
-#define DEBUG_FUNCLOG_EXIT_RET(ret) \
-   do { \
-      (void)__debug_decleration_work_around; \
-      debug_funclog_exit(__FUNCTION__, __LINE__, __FILE__); \
-      return ret; \
-   } while(0)
-#define DEBUG_FUNCLOG_ENTER_EXIT() \
-   debug_funclog_enter_exit(__FUNCTION__, __LINE__, __FILE__)
-
-#else
-#define DEBUG_FUNCLOG_ENTER() \
-   int __debug_decleration_work_around
-#define DEBUG_FUNCLOG_EXIT() \
-   do { (void)__debug_decleration_work_around; return; } while(0)
-#define DEBUG_FUNCLOG_EXIT_RET(ret) \
-   do { (void)__debug_decleration_work_around; return ret; } while(0)
-#define DEBUG_FUNCLOG_ENTER_EXIT()
-#endif
-
-
-/**
- * Get option.
- * 
- * It is an alias for getenv on Linux. 
- * 
- * On Windows it reads C:\gallium.cfg, which is a text file with CR+LF line 
- * endings with one option per line as
- *  
- *   NAME=value
- * 
- * This file must be terminated with an extra empty line.
- */
-const char *
-debug_get_option(const char *name, const char *dfault);
-
-boolean
-debug_get_bool_option(const char *name, boolean dfault);
-
-long
-debug_get_num_option(const char *name, long dfault);
-
-uint64_t
-debug_get_flags_option(const char *name, 
-                       const struct debug_named_value *flags,
-                       uint64_t dfault);
-
-#define DEBUG_GET_ONCE_OPTION(suffix, name, dfault) \
-static const char * \
-debug_get_option_ ## suffix (void) \
-{ \
-   static boolean first = TRUE; \
-   static const char * value; \
-   if (first) { \
-      first = FALSE; \
-      value = debug_get_option(name, dfault); \
-   } \
-   return value; \
-}
-
-#define DEBUG_GET_ONCE_BOOL_OPTION(sufix, name, dfault) \
-static boolean \
-debug_get_option_ ## sufix (void) \
-{ \
-   static boolean first = TRUE; \
-   static boolean value; \
-   if (first) { \
-      first = FALSE; \
-      value = debug_get_bool_option(name, dfault); \
-   } \
-   return value; \
-}
-
-#define DEBUG_GET_ONCE_NUM_OPTION(sufix, name, dfault) \
-static long \
-debug_get_option_ ## sufix (void) \
-{ \
-   static boolean first = TRUE; \
-   static long value; \
-   if (first) { \
-      first = FALSE; \
-      value = debug_get_num_option(name, dfault); \
-   } \
-   return value; \
-}
-
-#define DEBUG_GET_ONCE_FLAGS_OPTION(sufix, name, flags, dfault) \
-static unsigned long \
-debug_get_option_ ## sufix (void) \
-{ \
-   static boolean first = TRUE; \
-   static unsigned long value; \
-   if (first) { \
-      first = FALSE; \
-      value = debug_get_flags_option(name, flags, dfault); \
-   } \
-   return value; \
-}
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* U_DEBUG_H_ */
diff --git a/src/gallium/auxiliary/util/u_debug_stack.c b/src/gallium/auxiliary/util/u_debug_stack.c
index b1d4cfea6c1..235e116671b 100644
--- a/src/gallium/auxiliary/util/u_debug_stack.c
+++ b/src/gallium/auxiliary/util/u_debug_stack.c
@@ -32,7 +32,7 @@
  * @author Jose Fonseca <[email protected]>
  */
 
-#include "u_debug.h"
+#include "util/u_debug.h"
 #include "u_debug_symbol.h"
 #include "u_debug_stack.h"
 
diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
index 84760430489..22e6c8ce771 100644
--- a/src/gallium/auxiliary/util/u_debug_symbol.c
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
@@ -36,7 +36,7 @@
 #include "os/os_thread.h"
 #include "util/u_string.h"
 
-#include "u_debug.h"
+#include "util/u_debug.h"
 #include "u_debug_symbol.h"
 #include "u_hash_table.h"
 
diff --git a/src/gallium/auxiliary/util/u_format_zs.c b/src/gallium/auxiliary/util/u_format_zs.c
index 4b801d2dcf7..ff584769d12 100644
--- a/src/gallium/auxiliary/util/u_format_zs.c
+++ b/src/gallium/auxiliary/util/u_format_zs.c
@@ -26,7 +26,6 @@
  **************************************************************************/
 
 
-#include "u_debug.h"
 #include "u_format_zs.h"
 #include "util/u_math.h"
 
diff --git a/src/gallium/auxiliary/util/u_log.h b/src/gallium/auxiliary/util/u_log.h
index 09c47caee55..90f5d0f4de1 100644
--- a/src/gallium/auxiliary/util/u_log.h
+++ b/src/gallium/auxiliary/util/u_log.h
@@ -47,7 +47,7 @@
 
 #include <stdio.h>
 
-#include "u_debug.h"
+#include "util/u_debug.h"
 
 struct u_log_page;
 struct u_log_auto_logger;