Changeset 263bda2 in mainline for kernel/Makefile

Timestamp:

2010-06-30T09:10:04Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4edd57fd

Parents:

793cf029

Message:

remove LOG_EXEC() macro, use compile-time instrumentation for detailed kernel logging

• add more files to the INSTRUMENTED_SOURCES list in kernel/Makefile where instrumentation is safe (extra care must be taken not to enable instrumentation in functions where it would lead to an infinite cycle [e.g. print functions] and where resources are limited [e.g. temporary stack])
• even in files which are in the INSTRUMENTED_SOURCES list specific functions can be excluded from being instrumented via the attribute((no_instrument_function)) decoration

File:

• kernel/Makefile (modified) (8 diffs)

kernel/Makefile

@@ -160 +160 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -165 +166 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -170 +172 @@
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -176 +179 @@
         DEFS += $(CONFIG_DEFS)
         DEPEND_DEFS = $(DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -181 +185 @@
         CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -202 +207 @@
         generic/src/debug/stacktrace.c \
         generic/src/debug/panic.c \
+        generic/src/debug/debug.c \
         generic/src/interrupt/interrupt.c \
         generic/src/main/main.c \
@@ -355 +361 @@
 endif
 
+## Sources where instrumentation is enabled
+#
+
+ifeq ($(CONFIG_LOG),y)
+INSTRUMENTED_SOURCES = \
+        generic/src/cpu/cpu.c \
+        generic/src/main/kinit.c
+endif
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
@@ -414 +429 @@
 
 %.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c -o $@ $<
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)