Changeset 2770 for trunk/src/kmk/variable.h

Timestamp:

Feb 1, 2015, 6:12:37 PM (10 years ago)

Author:

bird

Message:

string expansion debugged and enabled. fixed access-after-alloc bug in func_sort and could lead to heap corruption.

File:

• trunk/src/kmk/variable.h (modified) (2 diffs)

trunk/src/kmk/variable.h

@@ -116 +116 @@
 #endif
 #if defined (CONFIG_WITH_COMPILER) || defined (CONFIG_WITH_MAKE_STATS)
-    unsigned int evalval_count; /* Times used with $(evalval ) or $(evalctx ). */
-    unsigned int expand_count;  /* Times expanded (not to be confused with exp_count). */
+    unsigned int evalval_count; /* Times used with $(evalval ) or $(evalctx ) since last change. */
+    unsigned int expand_count;  /* Times expanded since last change (not to be confused with exp_count). */
 #endif
 #ifdef CONFIG_WITH_COMPILER
@@ -124 +124 @@
 #endif
   };
+
+/* Update statistics and invalidates optimizations when a variable changes. */
+#ifdef CONFIG_WITH_COMPILER
+# define VARIABLE_CHANGED(v) \
+  do { \
+      MAKE_STATS_2((v)->changes++); \
+      if ((v)->evalprog || (v)->expandprog) kmk_cc_variable_changed(v); \
+      (v)->expand_count = 0; \
+      (v)->evalval_count = 0; \
+    } while (0)
+#else
+# define VARIABLE_CHANGED(v) MAKE_STATS_2((v)->changes++)
+#endif
+
+
 
 /* Structure that represents a variable set.  */