e653f8f65a
There are now separate libs for benchmark, assert, printf, putchar
start/stop:
libs/libsel4benchmark
libs/libsel4assert
libs/libsel4printf
libs/libsel4putchar
libs/libsel4startstop
The primary changes are introducing sel4/sel4.h and removing std* types
plus porting assert and IO code from the kernel to libsel4assert,
libsel4printf, libsel4putchar.
This means the code within libsel4 and the newlibs do not overload any
typical libc entities. Instead the libraries use types like
seL4_Uint32 ... instead of uint32_t. And printf is now seL4_Printf and
assert is seL4_Assert ....
Finally, the only file modified that effects kernel code is
kernel/tools/bitfield_gen.py. It needed to be modified as it generates
files for both kernel and user space. And for user space the generated code
(types_gen.h) needed to use the new types and asserts. The changes should
not change what is generated for the kernel and I did a comparison of
kernel_final.{c|s} before and after my change and the only differences
were time stamps.
Bug: #15 Streamline kernel/libsel4 and remove its libc dependencies
52 lines
1.7 KiB
C
52 lines
1.7 KiB
C
/*
|
|
* Copyright 2014, NICTA
|
|
*
|
|
* This software may be distributed and modified according to the terms of
|
|
* the BSD 2-Clause license. Note that NO WARRANTY is provided.
|
|
* See "LICENSE_BSD2.txt" for details.
|
|
*
|
|
* @TAG(NICTA_BSD)
|
|
*/
|
|
|
|
/**
|
|
* Declares macros and methods for sel4 specific assert and fail.
|
|
*
|
|
* These are unconditional, there are conditional versions of
|
|
* these in debug_assert.h and are name seL4_DebugAssert and
|
|
* sl4_DebugCompileTimeAsssert.
|
|
*/
|
|
|
|
#ifndef __LIBSEL4_ASSERT_H
|
|
#define __LIBSEL4_ASSERT_H
|
|
|
|
/**
|
|
* Hidden function, use the macros seL4_Fail or seL4_Assert.
|
|
*/
|
|
void __assert_fail(const char* str, const char* file, int line, const char* function);
|
|
|
|
/**
|
|
* If expr evaluates to false _seL4_Fail is called with the
|
|
* expr as a string plus the file, line and function.
|
|
*/
|
|
#define seL4_Fail(s) __assert_fail(s, __FILE__, __LINE__, __func__)
|
|
|
|
/**
|
|
* If expr evaluates to false _seL4_AssertFail is called with the
|
|
* expr as a string plus the file, line and function.
|
|
*/
|
|
#define seL4_Assert(expr) \
|
|
do { if (!(expr)) { __assert_fail(#expr, __FILE__, __LINE__, __FUNCTION__); } } while(0)
|
|
|
|
/**
|
|
* An assert that tests that the expr is a compile time constant and
|
|
* evaluates to true.
|
|
*
|
|
* This code is similar to compile_time_assert in libutils/include/utils/compile_time.h,
|
|
* we may want to have only one. Also, using __COUNTER__ its not necessary to have name
|
|
* for uniqueness so I've removed it, although maybe there is another reason for it, like
|
|
* some compilers don't support __COUNTER__.
|
|
*/
|
|
#define seL4_CompileTimeAssert(expr) \
|
|
extern char __seL4_CompileTimeAssertFailed_ ## __COUNTER__[__builtin_constant_p(expr) ? ((expr) ? 1 : -1) : -1] __attribute__((unused))
|
|
|
|
#endif // __LIBSEL4_ASSERT_H
|