[Minios-devel] [UNIKRAFT PATCH v2] lib/nolibc: Provide assertions (assert.h)

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 lib/nolibc/Config.uk        |  8 ++++
 lib/nolibc/include/assert.h | 76 +++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 lib/nolibc/include/assert.h

diff --git a/lib/nolibc/Config.uk b/lib/nolibc/Config.uk
index ebf34b9d..a81aaece 100644
--- a/lib/nolibc/Config.uk
+++ b/lib/nolibc/Config.uk
@@ -4,4 +4,12 @@ menuconfig LIBNOLIBC
        default y if !HAVE_LIBC
 
 if LIBNOLIBC
+       config LIBNOLIBC_UKDEBUG_ASSERT
+               bool "Implement assertions with libukdebug"
+               default y if LIBUKDEBUG
+               default n
+               help
+                       Assertions (`assert()` defined in `<assert.h>`) are 
mapped to `UK_ASSERT()`.
+                       If selected, please note that libc assertions are also 
removed from the code
+                       when assertions are disabled in libukdebug.
 endif
diff --git a/lib/nolibc/include/assert.h b/lib/nolibc/include/assert.h
new file mode 100644
index 00000000..1e111595
--- /dev/null
+++ b/lib/nolibc/include/assert.h
@@ -0,0 +1,76 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Authors: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
+ *
+ * Copyright (c) 2019, NEC Laboratories Europe GmbH, NEC Corporation.
+ *                     All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
+ */
+
+#ifndef __ASSERT_H__
+#define __ASSERT_H__
+
+#include <uk/config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef NDEBUG /* Required by C99 standard */
+#define assert(x) ((void)(0))
+
+#else
+#if CONFIG_LIBNOLIBC_UKDEBUG_ASSERT
+#include <uk/assert.h>
+#define assert(x) UK_ASSERT(x)
+
+#else
+#include <uk/plat/bootstrap.h>
+#include <uk/arch/lcpu.h>
+#include <uk/essentials.h>
+#include <stdio.h>
+
+#define assert(x)                                                      \
+       do {                                                            \
+               if (unlikely(!(x))) {                                   \
+                       fprintf(stderr,                                 \
+                               "Assertion failed: %s, file %s, line %u\n", \
+                               STRINGIFY(x),                           \
+                               __FILE__, __LINE__);                    \
+                       ukplat_terminate(UKPLAT_CRASH);                 \
+               }                                                       \
+       } while (0)
+
+#endif /* CONFIG_LIBNOLIBC_UKDEBUG_ASSERT */
+#endif /* NDEBUG */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ASSERT_H__ */
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel