portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/DEBUG/CONFIG_DEBUG_BUILD/

Browse source 
DEBUG definition is not supposed to be used in the kernel, rather CONFIG_DEBUG_BUILD,
which can be toggled separately to user notion of DEBUG
This commit is contained in:
Adrian Danis 2017-04-05 12:23:42 +10:00
parent 77616ac43d
commit 0abc720277
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/arch/arm/arch/64/mode/machine/registerset.h
View file

@ -54,7 +54,7 @@
* We cannot allow async aborts in the verified kernel, but they are useful
* in identifying invalid memory access bugs so we enable them in debug mode.
*/
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
#define PSTATE_EXTRA_FLAGS 0
#else
#define PSTATE_EXTRA_FLAGS PMODE_SERROR

2
include/assert.h
View file

@ -13,7 +13,7 @@
#include <util.h>
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
void _fail(
const char* str,

2
include/benchmark/benchmark_track.h
View file

@ -20,7 +20,7 @@
#include <model/statedata.h>
#include <mode/machine.h>
#if defined(DEBUG) || defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
#if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
#define TRACK_KERNEL_ENTRIES 1
extern kernel_entry_t ksKernelEntry;
#ifdef CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES

2
src/api/syscall.c
View file

@ -28,7 +28,7 @@
#include <kernel/traps.h>
#include <arch/machine.h>
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
#include <arch/machine/capdl.h>
#endif

2
src/arch/arm/32/kernel/vspace.c
View file

@ -2972,7 +2972,7 @@ exception_t benchmark_arch_map_logBuffer(word_t frame_cptr)
}
#endif /* CONFIG_BENCHMARK_USE_KERNEL_LOG_BUFFER */
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
void kernelPrefetchAbort(word_t pc) VISIBLE;
void kernelDataAbort(word_t pc) VISIBLE;

2
src/arch/arm/64/kernel/vspace.c
View file

@ -2185,7 +2185,7 @@ decodeARMMMUInvocation(word_t invLabel, word_t length, cptr_t cptr,
}
}
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
void kernelPrefetchAbort(word_t pc) VISIBLE;
void kernelDataAbort(word_t pc) VISIBLE;

2
src/arch/x86/machine/breakpoint.c
View file

@ -615,7 +615,7 @@ handleUserLevelDebugException(int int_vector)
getAndResetActiveBreakpoint_t active_bp;
testAndResetSingleStepException_t single_step_info;
#if defined(DEBUG) || defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
#if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
ksKernelEntry.path = Entry_UserLevelFault;
ksKernelEntry.word = int_vector;
#else

2
src/assert.c
View file

@ -11,7 +11,7 @@
#include <assert.h>
#include <machine/io.h>
#ifdef DEBUG
#ifdef CONFIG_DEBUG_BUILD
void _fail(
const char* s,

2
src/model/statedata.c
View file

@ -68,7 +68,7 @@ word_t ksDomScheduleIdx;
/* Only used by lockTLBEntry */
word_t tlbLockCount = 0;
#if (defined DEBUG || defined CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
#if (defined CONFIG_DEBUG_BUILD || defined CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
kernel_entry_t ksKernelEntry;
#endif /* DEBUG */