Implement assert.h using PDCLib

mos-platform/common/c/CMakeLists.txt

@@ -1,5 +1,8 @@
 # C standard library and C++ abi.
 add_platform_library(common-c
+  # assert.h
+  assert.c
+
   # ctype.h
   ctype.c
 

mos-platform/common/c/assert.c

@@ -0,0 +1,17 @@
+#include <assert.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void __assert(const char *file, const char *line, const char *function,
+              const char *expr) {
+  fputs(file, stderr);
+  fputc(':', stderr);
+  fputs(line, stderr);
+  fputs(": ", stderr);
+  fputs(function, stderr);
+  fputs(": assertion failed: ", stderr);
+  fputs(expr, stderr);
+  fputc('\n', stderr);
+  abort();
+}

mos-platform/common/c/stdio.c

@@ -9,7 +9,19 @@ int putchar(int c) {
 // included in LTO.
 __attribute((interrupt, no_isr)) int puts(const char *s) {
   for (; *s; ++s)
-    __putchar(*s);
-  __putchar('\n');
+    putchar(*s);
+  putchar('\n');
+  return 0;
+}
+
+FILE *stdin;
+FILE *stdout;
+FILE *stderr;
+
+int fputc(int c, FILE *stream) { return putchar(c); }
+
+int fputs(const char *__restrict__ s, FILE *__restrict__ stream) {
+  for (; *s; ++s)
+    putchar(*s);
   return 0;
 }

mos-platform/common/include/__internal.h

@@ -0,0 +1,9 @@
+#ifndef __INTERNAL_H_
+#define __INTERNAL_H_
+
+// Originally from the Public Domain C Library (PDCLib).
+
+#define _SYMBOL_TO_STRING(x) #x
+#define _VALUE_TO_STRING(x) _SYMBOL_TO_STRING(x)
+
+#endif // not __INTERNAL_H_

mos-platform/common/include/assert.h

@@ -0,0 +1,30 @@
+// Originally from the Public Domain C library (PDCLib).
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <__internal.h>
+
+#ifndef _ASSERT_H
+#define _ASSERT_H
+void __assert(const char *file, const char *line, const char *function,
+              const char *expr);
+#endif
+
+/* If NDEBUG is set, assert() is a null operation. */
+#undef assert
+
+#ifdef NDEBUG
+#define assert(ignore) ((void)0)
+#else
+// Breaking this apart by component saves space.
+#define assert(expression)                                                     \
+  ((expression) ? (void)0                                                      \
+                : __assert(__FILE__, _VALUE_TO_STRING(__LINE__), __func__,     \
+                           #expression))
+#endif
+
+#ifdef __cplusplus
+}
+#endif

mos-platform/common/include/stdio.h

@@ -97,6 +97,27 @@ int getchar(void);
 // To be defined by platform.
 void __putchar(char c);
 
+// Originally from the Public Domain C Library (PDCLib).
+
+struct _FILE;
+typedef struct _FILE FILE;
+
+extern FILE *stdin;
+extern FILE *stdout;
+extern FILE *stderr;
+
+/**
+ * Write the value c (cast to unsigned char) to the given stream.
+ * \return c if successful, EOF otherwise.
+ */
+int fputc(int c, FILE *stream);
+
+/**
+ * Write the string s (not including the terminating \0) to the given stream.
+ * \return A value >=0 if successful, EOF otherwise.
+ */
+int fputs(const char *__restrict__ s, FILE *__restrict__ stream);
+
 #ifdef __cplusplus
 }
 #endif

mos-platform/sim/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 
 include_directories(BEFORE SYSTEM .)
 
-install(FILES assert.h stdlib.h TYPE INCLUDE)
+install(FILES stdlib.h TYPE INCLUDE)
 
 add_platform_library(sim-crt0)
 merge_libraries(sim-crt0
@@ -16,7 +16,6 @@ merge_libraries(sim-crt0
 )
 
 add_platform_library(sim-c
-  assert.c
   putchar.c
   stdlib.c
   sim-io.c