From 569f0b41059d41f1c62bf8c548edfae783d5104b Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 17 Dec 2016 13:18:45 -0500 Subject: [PATCH] debug: move debug features from misc to subsys/debug Change-Id: I446be0202325cf3cead7ce3024ca2047e3f7660d Signed-off-by: Anas Nashif --- arch/x86/debug/gdb_arch.c | 2 +- arch/x86/include/debug/gdb_arch.h | 2 +- include/{misc => }/debug/debug_info.h | 0 include/{misc => }/debug/gdb_server.h | 0 include/{misc => }/debug/mem_safe.h | 0 include/{misc => }/debug/object_tracing.h | 0 include/{misc => }/debug/object_tracing_common.h | 0 include/misc/ring_buffer.h | 2 +- kernel/unified/alert.c | 2 +- kernel/unified/fifo.c | 2 +- kernel/unified/lifo.c | 2 +- kernel/unified/mailbox.c | 2 +- kernel/unified/mem_pool.c | 2 +- kernel/unified/mem_slab.c | 2 +- kernel/unified/msg_q.c | 2 +- kernel/unified/mutex.c | 2 +- kernel/unified/pipes.c | 2 +- kernel/unified/sem.c | 2 +- kernel/unified/stack.c | 2 +- kernel/unified/timer.c | 2 +- misc/Kconfig | 2 -- misc/Makefile | 2 -- scripts/sysgen | 2 +- subsys/Kconfig | 2 ++ subsys/Makefile | 1 + {misc => subsys}/debug/Kconfig | 0 {misc => subsys}/debug/Makefile | 2 +- {misc => subsys}/debug/gdb_server.c | 2 +- {misc => subsys}/debug/mem_safe_check_boundaries.c | 2 +- tests/legacy/kernel/test_mem_safe/src/main.c | 2 +- .../kernel/test_obj_tracing/microkernel/src/object_monitor.c | 2 +- .../kernel/test_obj_tracing/nanokernel/src/object_monitor.c | 2 +- 32 files changed, 25 insertions(+), 26 deletions(-) rename include/{misc => }/debug/debug_info.h (100%) rename include/{misc => }/debug/gdb_server.h (100%) rename include/{misc => }/debug/mem_safe.h (100%) rename include/{misc => }/debug/object_tracing.h (100%) rename include/{misc => }/debug/object_tracing_common.h (100%) rename {misc => subsys}/debug/Kconfig (100%) rename {misc => subsys}/debug/Makefile (79%) rename {misc => subsys}/debug/gdb_server.c (99%) rename {misc => subsys}/debug/mem_safe_check_boundaries.c (99%) diff --git a/arch/x86/debug/gdb_arch.c b/arch/x86/debug/gdb_arch.c index 4674fd2b42f..e849258c551 100644 --- a/arch/x86/debug/gdb_arch.c +++ b/arch/x86/debug/gdb_arch.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define TRACE_FLAG 0x0100 /* EFLAGS:TF */ #define INT_FLAG 0x0200 /* EFLAGS:IF */ diff --git a/arch/x86/include/debug/gdb_arch.h b/arch/x86/include/debug/gdb_arch.h index 7a9629b722b..c81dfd467f8 100644 --- a/arch/x86/include/debug/gdb_arch.h +++ b/arch/x86/include/debug/gdb_arch.h @@ -22,7 +22,7 @@ extern "C" { #endif #include -#include +#include #define GDB_ARCH_HAS_ALL_REGS diff --git a/include/misc/debug/debug_info.h b/include/debug/debug_info.h similarity index 100% rename from include/misc/debug/debug_info.h rename to include/debug/debug_info.h diff --git a/include/misc/debug/gdb_server.h b/include/debug/gdb_server.h similarity index 100% rename from include/misc/debug/gdb_server.h rename to include/debug/gdb_server.h diff --git a/include/misc/debug/mem_safe.h b/include/debug/mem_safe.h similarity index 100% rename from include/misc/debug/mem_safe.h rename to include/debug/mem_safe.h diff --git a/include/misc/debug/object_tracing.h b/include/debug/object_tracing.h similarity index 100% rename from include/misc/debug/object_tracing.h rename to include/debug/object_tracing.h diff --git a/include/misc/debug/object_tracing_common.h b/include/debug/object_tracing_common.h similarity index 100% rename from include/misc/debug/object_tracing_common.h rename to include/debug/object_tracing_common.h diff --git a/include/misc/ring_buffer.h b/include/misc/ring_buffer.h index 9c00fd656c4..96beb357c61 100644 --- a/include/misc/ring_buffer.h +++ b/include/misc/ring_buffer.h @@ -21,7 +21,7 @@ #define __RING_BUFFER_H__ #include -#include +#include #include #include diff --git a/kernel/unified/alert.c b/kernel/unified/alert.c index 03aaea67403..2e42ba4fa24 100644 --- a/kernel/unified/alert.c +++ b/kernel/unified/alert.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/fifo.c b/kernel/unified/fifo.c index a3e8b95f4eb..fa7e5e64ba9 100644 --- a/kernel/unified/fifo.c +++ b/kernel/unified/fifo.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/lifo.c b/kernel/unified/lifo.c index 03d58972e87..4cd5a116c52 100644 --- a/kernel/unified/lifo.c +++ b/kernel/unified/lifo.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/mailbox.c b/kernel/unified/mailbox.c index eb84e83219e..c26aaa830a3 100644 --- a/kernel/unified/mailbox.c +++ b/kernel/unified/mailbox.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/mem_pool.c b/kernel/unified/mem_pool.c index ca1752781c0..f3a34847a89 100644 --- a/kernel/unified/mem_pool.c +++ b/kernel/unified/mem_pool.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/mem_slab.c b/kernel/unified/mem_slab.c index e219207cc42..486d2b6f460 100644 --- a/kernel/unified/mem_slab.c +++ b/kernel/unified/mem_slab.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/msg_q.c b/kernel/unified/msg_q.c index 652ec6f6b0c..684953c587d 100644 --- a/kernel/unified/msg_q.c +++ b/kernel/unified/msg_q.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/mutex.c b/kernel/unified/mutex.c index 18ef96ece6c..ddf7025205d 100644 --- a/kernel/unified/mutex.c +++ b/kernel/unified/mutex.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/kernel/unified/pipes.c b/kernel/unified/pipes.c index 2528612d3cb..6a69061b98d 100644 --- a/kernel/unified/pipes.c +++ b/kernel/unified/pipes.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/sem.c b/kernel/unified/sem.c index fcf663543f4..80ac3e89a16 100644 --- a/kernel/unified/sem.c +++ b/kernel/unified/sem.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/stack.c b/kernel/unified/stack.c index 366d0e3ed77..1b86aa82ff5 100644 --- a/kernel/unified/stack.c +++ b/kernel/unified/stack.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kernel/unified/timer.c b/kernel/unified/timer.c index d3507f08e2a..f6a803a3e90 100644 --- a/kernel/unified/timer.c +++ b/kernel/unified/timer.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/misc/Kconfig b/misc/Kconfig index eb3486ece78..21b53690f65 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -217,8 +217,6 @@ config OMIT_FRAME_POINTER trace. Recommended only for production builds which do not need to be debugged. -source "misc/debug/Kconfig" - endmenu menu "System Monitoring Options" diff --git a/misc/Makefile b/misc/Makefile index ae7213dd1e6..69f2e2e3ee5 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -9,5 +9,3 @@ obj-$(CONFIG_REBOOT) += reboot.o obj-$(CONFIG_RING_BUFFER) += ring_buffer.o obj-y += generated/ - -obj-y += debug/ diff --git a/scripts/sysgen b/scripts/sysgen index c85b6ca8a56..af6cb6bf1c9 100755 --- a/scripts/sysgen +++ b/scripts/sysgen @@ -290,7 +290,7 @@ def kernel_main_c_header(): do_not_edit_warning + "\n" + "#include \n" + - "#include \n" + + "#include \n" + "#include \n" + "#include \n" + "#include \n") diff --git a/subsys/Kconfig b/subsys/Kconfig index 10d1698b862..3598ea08150 100644 --- a/subsys/Kconfig +++ b/subsys/Kconfig @@ -24,3 +24,5 @@ source "subsys/bluetooth/Kconfig" source "subsys/net/Kconfig" source "subsys/logging/Kconfig" + +source "subsys/debug/Kconfig" diff --git a/subsys/Makefile b/subsys/Makefile index 81e307ec71b..acfdeef5ebf 100644 --- a/subsys/Makefile +++ b/subsys/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_BLUETOOTH) += bluetooth/ obj-$(CONFIG_NET_BUF) += net/ obj-y += logging/ +obj-y += debug/ diff --git a/misc/debug/Kconfig b/subsys/debug/Kconfig similarity index 100% rename from misc/debug/Kconfig rename to subsys/debug/Kconfig diff --git a/misc/debug/Makefile b/subsys/debug/Makefile similarity index 79% rename from misc/debug/Makefile rename to subsys/debug/Makefile index eaf2ee6dbfd..f1d2873555f 100644 --- a/misc/debug/Makefile +++ b/subsys/debug/Makefile @@ -1,4 +1,4 @@ -ccflags-y +=-I$(srctree)/include/misc/debug +ccflags-y +=-I$(srctree)/include/debug CFLAGS_gdb_server.o =-I$(srctree)/include/drivers obj-y = diff --git a/misc/debug/gdb_server.c b/subsys/debug/gdb_server.c similarity index 99% rename from misc/debug/gdb_server.c rename to subsys/debug/gdb_server.c index 2938aff9e7d..85e53ce085e 100644 --- a/misc/debug/gdb_server.c +++ b/subsys/debug/gdb_server.c @@ -335,7 +335,7 @@ #include #include #include -#include +#include #include #include #ifdef CONFIG_GDB_SERVER_INTERRUPT_DRIVEN diff --git a/misc/debug/mem_safe_check_boundaries.c b/subsys/debug/mem_safe_check_boundaries.c similarity index 99% rename from misc/debug/mem_safe_check_boundaries.c rename to subsys/debug/mem_safe_check_boundaries.c index a5440228d05..fc857d6b6c0 100644 --- a/misc/debug/mem_safe_check_boundaries.c +++ b/subsys/debug/mem_safe_check_boundaries.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #define NUM_REGIONS (CONFIG_MEM_SAFE_NUM_EXTRA_REGIONS + 2) diff --git a/tests/legacy/kernel/test_mem_safe/src/main.c b/tests/legacy/kernel/test_mem_safe/src/main.c index 9a0c35b46f7..44fdacc0ffd 100644 --- a/tests/legacy/kernel/test_mem_safe/src/main.c +++ b/tests/legacy/kernel/test_mem_safe/src/main.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c b/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c index ed779d57869..eb1ed8af342 100644 --- a/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c +++ b/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "phil.h" /** diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c index 4e9ffe96fa6..948082b795f 100644 --- a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c +++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "phil.h" /**