Changeset 1835 for trunk/src

Timestamp:

Oct 11, 2008, 9:18:45 PM (17 years ago)

Author:

bird

Message:

kmk: fixed assertion + made them useful.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (1 diff)
• make.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -553 +553 @@
                 o = op;
                 p = begp;
-                assert (!memchr (variable_buffer + line_offset, '\0', o - variable_buffer + line_offset));
+                MY_ASSERT_MSG (!(p1 = memchr (variable_buffer + line_offset, '\0', o - (variable_buffer + line_offset))),
+                               ("line=%p o/exp_end=%p act_end=%p\n", variable_buffer + line_offset, o, p1));
                 break;
               }

trunk/src/kmk/make.h

@@ -150 +150 @@
 #endif
 
-#ifdef KMK
+#if defined(KMK) || defined(CONFIG_WITH_VALUE_LENGTH)
 # ifdef _MSC_VER
-#  define MY_INLINE  _inline static
+#  define MY_INLINE     _inline static
+#  define MY_DBGBREAK   __debugbreak()
 # elif defined(__GNUC__)
-#  define MY_INLINE  static __inline__
-# else
-#  define MY_INLINE  static
-# endif
-#endif /* KMK */
-#if defined(CONFIG_WITH_VALUE_LENGTH) || defined(KMK)
+#  define MY_INLINE     static __inline__
+#  if defined(__i386__) || defined(__x86_64__)
+#   define MY_DBGBREAK  __asm__ __volatile__ ("int3")
+#else
+#   define MY_DBGBREAK  assert(0)
+#  endif
+# else
+#  define MY_INLINE     static
+#  define MY_DBGBREAK  assert(0)
+# endif
 # ifndef NDEBUG
 #  define MY_ASSERT_MSG(expr, printfargs) \
-    do { if (!(expr)) { printf printfargs; assert(expr); } } while (0)
+    do { if (!(expr)) { printf printfargs; MY_DBGBREAK; } } while (0)
 # else
 #  define MY_ASSERT_MSG(expr, printfargs)   do { } while (0)