Introducing jerry-libc's interface include directory.

2015-03-19 20:49:36 +03:00
parent 1ec7ffcbab
commit 5e125187e5
11 changed files with 189 additions and 78 deletions
@@ -44,7 +44,9 @@ set(COMPILE_FLAGS_LIBC "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY}")
    set(DEFINES_LIBC_MCU_STM32F4 __TARGET_MCU_STM32F4)

 # Include directories
- set(INCLUDE_LIBC .)
+ set(INCLUDE_LIBC ${CMAKE_SOURCE_DIR}/jerry-libc)
+ set(INCLUDE_LIBC_INTERFACE ${CMAKE_SOURCE_DIR}/jerry-libc/include)
+ set(INCLUDE_LIBC_INTERFACE ${INCLUDE_LIBC_INTERFACE} PARENT_SCOPE)

 # Platform-specific
  # Linux
@@ -124,6 +126,7 @@ set(COMPILE_FLAGS_LIBC "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY}")
                PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_LIBC} ${FLAGS_COMMON_${BUILD_MODE}}")
   target_compile_definitions(${TARGET_NAME}.lib PRIVATE ${DEFINES_LIBC})
   target_include_directories(${TARGET_NAME}.lib PRIVATE ${INCLUDE_LIBC})
+   target_include_directories(${TARGET_NAME}.lib SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
   add_dependencies(jerry-libc-all ${TARGET_NAME}.lib)

  # Third-party MCU library
@@ -132,6 +135,8 @@ set(COMPILE_FLAGS_LIBC "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY}")
    set_property(TARGET ${TARGET_NAME}${SUFFIX_THIRD_PARTY_LIB}
                 PROPERTY COMPILE_FLAGS "${FLAGS_COMMON_${BUILD_MODE}}")
    target_include_directories(${TARGET_NAME}${SUFFIX_THIRD_PARTY_LIB} PRIVATE ${INCLUDE_THIRD_PARTY_${PLATFORM_EXT}})
+    target_include_directories(${TARGET_NAME}${SUFFIX_THIRD_PARTY_LIB} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
+    target_link_libraries(${TARGET_NAME}.lib ${TARGET_NAME}${SUFFIX_THIRD_PARTY_LIB})

    target_link_libraries(${TARGET_NAME}.lib ${TARGET_NAME}${SUFFIX_THIRD_PARTY_LIB})
   endif()
@@ -0,0 +1,32 @@
+/* Copyright 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JERRY_LIBC_CTYPE_H
+#define JERRY_LIBC_CTYPE_H
+
+#ifdef __cplusplus
+# define EXTERN_C "C"
+#else /* !__cplusplus */
+# define EXTERN_C
+#endif /* !__cplusplus */
+
+extern EXTERN_C int isxdigit (int c);
+extern EXTERN_C int isalpha (int c);
+extern EXTERN_C int isdigit (int c);
+extern EXTERN_C int islower (int c);
+extern EXTERN_C int isspace (int c);
+extern EXTERN_C int isupper (int c);
+
+#endif /* !JERRY_LIBC_CTYPE_H */
@@ -0,0 +1,63 @@
+/* Copyright 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JERRY_LIBC_STDIO_H
+#define JERRY_LIBC_STDIO_H
+
+#include <stdarg.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+# define EXTERN_C "C"
+#else /* !__cplusplus */
+# define EXTERN_C
+#endif /* !__cplusplus */
+
+/**
+ * File descriptor type
+ */
+typedef void FILE;
+
+/**
+ * Standard file descriptors
+ */
+extern FILE *stdin;
+extern FILE *stdout;
+extern FILE *stderr;
+
+/**
+ * fseek's 'whence' argument values
+ */
+#define SEEK_SET 0
+#define SEEK_CUR 1
+#define SEEK_END 2
+
+/**
+ * I/O routines
+ */
+extern EXTERN_C int vfprintf (FILE *stream, const char *format, va_list ap);
+extern EXTERN_C int puts (const char *s);
+extern EXTERN_C FILE *fopen (const char *path, const char *mode);
+extern EXTERN_C int fclose (FILE *fp);
+extern EXTERN_C size_t fread (void *ptr, size_t size, size_t nmemb, FILE *stream);
+extern EXTERN_C size_t fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream);
+extern EXTERN_C int fseek (FILE *stream, long offset, int whence);
+extern EXTERN_C long ftell (FILE *stream);
+extern EXTERN_C int printf (const char *format, ...);
+extern EXTERN_C void rewind (FILE *stream);
+extern EXTERN_C int fprintf (FILE *stream, const char *format, ...);
+extern EXTERN_C int putchar (int c);
+
+#endif /* !JERRY_LIBC_STDIO_H */
@@ -0,0 +1,27 @@
+/* Copyright 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JERRY_LIBC_STDLIB_H
+#define JERRY_LIBC_STDLIB_H
+
+#ifdef __cplusplus
+# define EXTERN_C "C"
+#else /* !__cplusplus */
+# define EXTERN_C
+#endif /* !__cplusplus */
+
+extern EXTERN_C void __attribute__ ((noreturn)) exit (int);
+
+#endif /* !JERRY_LIBC_STDLIB_H */
@@ -0,0 +1,36 @@
+/* Copyright 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JERRY_LIBC_STRING_H
+#define JERRY_LIBC_STRING_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+# define EXTERN_C "C"
+#else /* !__cplusplus */
+# define EXTERN_C
+#endif /* !__cplusplus */
+
+extern EXTERN_C int    memcmp (const void *s1, const void *s2, size_t n);
+extern EXTERN_C void*  memcpy (void *dest, const void *src, size_t n);
+extern EXTERN_C void*  memset (void *s, int c, size_t n);
+extern EXTERN_C int    strcmp (const char *s1, const char *s2);
+extern EXTERN_C size_t strlen (const char *s);
+extern EXTERN_C void*  memmove (void *dest, const void *src, size_t n);
+extern EXTERN_C int    strncmp (const char *s1, const char *s2, size_t n);
+extern EXTERN_C char*  strncpy (char *dest, const char *src, size_t n);
+
+#endif /* !JERRY_LIBC_STRING_H */
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdlib.h>

 /**
 * Attributes
@@ -69,49 +68,10 @@ libc_fatal (const char *msg,
 * but referenced from third-party libraries.
 */
 #define LIBC_UNREACHABLE_STUB_FOR(...) \
+extern __VA_ARGS__; \
 __attr_used___ __VA_ARGS__ \
 { \
  LIBC_UNREACHABLE (); \
 }

-/**
- * Libc redefinitions
- */
-
-/* Ensuring no macro implementation of variables / functions are in effect */
-#undef vfprintf
-#undef fprintf
-#undef printf
-#undef isspace
-#undef isalpha
-#undef islower
-#undef isupper
-#undef isdigit
-#undef isxdigit
-#undef memset
-#undef memcmp
-#undef memcpy
-#undef memmove
-#undef strcmp
-#undef strncmp
-#undef strncpy
-#undef strlen
-#undef putchar
-#undef puts
-#undef exit
-#undef fopen
-#undef rewind
-#undef fclose
-#undef fseek
-#undef ftell
-#undef fread
-#undef fwrite
-#undef stdin
-#undef stdout
-#undef stderr
-
-extern FILE* stdin;
-extern FILE* stdout;
-extern FILE* stderr;
-
 #endif /* !DEFS_H */
@@ -18,6 +18,7 @@
 */

 #include <stdio.h>
+#include <stdlib.h>

 #include "jerry-libc-defs.h"