Add jerryscript-compiler.h public header to cover compiler incompatibilities (#2313)
In general, public headers should not have compiler-specific constructs but both the core and the port headers have attributes, which are non-standard. It's better to factor out such constructs to a common place (a new header) and hide them behind macros, which can then be defined on a per-compiler basis. This patch moves the existing definitions of function attributes and likely/unlikely builtins to the new header. At the same time, it unifies the names of these attribute defines and where they are used. Moreover, it touches on jerry-main and removes the uses of `__attribute__((unused))` entirely and replaces them with the elsewhere used `(void) ...` pattern. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
* If !JERRY_NDEBUG and code != 0, print status code with description
|
||||
* and call assertion fail handler.
|
||||
*/
|
||||
void __noreturn
|
||||
void JERRY_ATTR_NORETURN
|
||||
jerry_fatal (jerry_fatal_code_t code) /**< status code */
|
||||
{
|
||||
#ifndef JERRY_NDEBUG
|
||||
@@ -67,7 +67,7 @@ jerry_fatal (jerry_fatal_code_t code) /**< status code */
|
||||
/**
|
||||
* Handle failed assertion
|
||||
*/
|
||||
void __noreturn
|
||||
void JERRY_ATTR_NORETURN
|
||||
jerry_assert_fail (const char *assertion, /**< assertion condition string */
|
||||
const char *file, /**< file name */
|
||||
const char *function, /**< function name */
|
||||
@@ -85,7 +85,7 @@ jerry_assert_fail (const char *assertion, /**< assertion condition string */
|
||||
/**
|
||||
* Handle execution of control path that should be unreachable
|
||||
*/
|
||||
void __noreturn
|
||||
void JERRY_ATTR_NORETURN
|
||||
jerry_unreachable (const char *file, /**< file name */
|
||||
const char *function, /**< function name */
|
||||
const uint32_t line) /**< line */
|
||||
|
||||
+6
-32
@@ -28,34 +28,6 @@
|
||||
#include "jerryscript-port.h"
|
||||
#include "jrt-types.h"
|
||||
|
||||
/*
|
||||
* Attributes
|
||||
*/
|
||||
#define __noreturn __attribute__((noreturn))
|
||||
#define __attr_noinline___ __attribute__((noinline))
|
||||
#define __attr_return_value_should_be_checked___ __attribute__((warn_unused_result))
|
||||
#define __attr_hot___ __attribute__((hot))
|
||||
#ifndef __attr_always_inline___
|
||||
#define __attr_always_inline___ __attribute__((always_inline))
|
||||
#endif /* !__attr_always_inline___ */
|
||||
#ifndef __attr_const___
|
||||
#define __attr_const___ __attribute__((const))
|
||||
#endif /* !__attr_const___ */
|
||||
#ifndef __attr_pure___
|
||||
#define __attr_pure___ __attribute__((pure))
|
||||
#endif /* !__attr_pure___ */
|
||||
|
||||
/*
|
||||
* Conditions' likeliness, unlikeliness.
|
||||
*/
|
||||
#ifdef __GNUC__
|
||||
#define likely(x) __builtin_expect(!!(x), 1)
|
||||
#define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#else /* !__GNUC__ */
|
||||
#define likely(x) (x)
|
||||
#define unlikely(x) (x)
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
/*
|
||||
* Normally compilers store const(ant)s in ROM. Thus saving RAM.
|
||||
* But if your compiler does not support it then the directive below can force it.
|
||||
@@ -91,13 +63,15 @@
|
||||
enum { JERRY_STATIC_ASSERT_GLUE (static_assertion_failed_, __LINE__, msg) = 1 / (!!(x)) }
|
||||
|
||||
#ifndef JERRY_NDEBUG
|
||||
void __noreturn jerry_assert_fail (const char *assertion, const char *file, const char *function, const uint32_t line);
|
||||
void __noreturn jerry_unreachable (const char *file, const char *function, const uint32_t line);
|
||||
void JERRY_ATTR_NORETURN
|
||||
jerry_assert_fail (const char *assertion, const char *file, const char *function, const uint32_t line);
|
||||
void JERRY_ATTR_NORETURN
|
||||
jerry_unreachable (const char *file, const char *function, const uint32_t line);
|
||||
|
||||
#define JERRY_ASSERT(x) \
|
||||
do \
|
||||
{ \
|
||||
if (unlikely (!(x))) \
|
||||
if (JERRY_UNLIKELY (!(x))) \
|
||||
{ \
|
||||
jerry_assert_fail (#x, __FILE__, __func__, __LINE__); \
|
||||
} \
|
||||
@@ -128,7 +102,7 @@ void __noreturn jerry_unreachable (const char *file, const char *function, const
|
||||
/**
|
||||
* Exit on fatal error
|
||||
*/
|
||||
void __noreturn jerry_fatal (jerry_fatal_code_t code);
|
||||
void JERRY_ATTR_NORETURN jerry_fatal (jerry_fatal_code_t code);
|
||||
|
||||
/*
|
||||
* Logging
|
||||
|
||||
Reference in New Issue
Block a user