Introduce macro ECMA_STACK_USAGE_OVERFLOW to simplify the stack overflow check code

JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]

Author: lygstate

jerry-core/ecma/base/ecma-globals.h

@@ -2044,14 +2044,14 @@ typedef enum
  * Check the current stack usage. If the limit is reached a RangeError is raised.
  * The macro argument specifies the return value which is usally ECMA_VALUE_ERROR or NULL.
  */
-#define ECMA_CHECK_STACK_USAGE_RETURN(RETURN_VALUE)               \
-  do                                                              \
-  {                                                               \
-    if (ecma_get_current_stack_usage () > CONFIG_MEM_STACK_LIMIT) \
-    {                                                             \
-      ecma_raise_maximum_callstack_error ();                      \
-      return RETURN_VALUE;                                        \
-    }                                                             \
+#define ECMA_CHECK_STACK_USAGE_RETURN(RETURN_VALUE)                          \
+  do                                                                         \
+  {                                                                          \
+    if (JERRY_UNLIKELY (ECMA_STACK_USAGE_OVERFLOW (CONFIG_MEM_STACK_LIMIT))) \
+    {                                                                        \
+      ecma_raise_maximum_callstack_error ();                                 \
+      return RETURN_VALUE;                                                   \
+    }                                                                        \
   } while (0)
 
 /**

jerry-core/ecma/base/ecma-helpers.h

@@ -492,6 +492,7 @@ uint8_t *ecma_compiled_code_get_line_info (const ecma_compiled_code_t *bytecode_
 ecma_value_t ecma_get_source_name (const ecma_compiled_code_t *bytecode_p);
 #if (JERRY_STACK_LIMIT != 0)
 uintptr_t ecma_get_current_stack_usage (void);
+#define ECMA_STACK_USAGE_OVERFLOW(target) (ecma_get_current_stack_usage () > (target))
 #endif /* (JERRY_STACK_LIMIT != 0) */
 
 /* ecma-helpers-external-pointers.c */

jerry-core/ecma/operations/ecma-regexp-object.c

@@ -534,7 +534,7 @@ ecma_regexp_run (ecma_regexp_ctx_t *re_ctx_p, /**< RegExp matcher context */
                  const lit_utf8_byte_t *str_curr_p) /**< input string pointer */
 {
 #if (JERRY_STACK_LIMIT != 0)
-  if (JERRY_UNLIKELY (ecma_get_current_stack_usage () > CONFIG_MEM_STACK_LIMIT))
+  if (JERRY_UNLIKELY (ECMA_STACK_USAGE_OVERFLOW (CONFIG_MEM_STACK_LIMIT)))
   {
     return ECMA_RE_OUT_OF_STACK;
   }

jerry-core/parser/js/js-lexer.c

@@ -2700,7 +2700,7 @@ lexer_construct_function_object (parser_context_t *context_p, /**< context */
                                  uint32_t extra_status_flags) /**< extra status flags */
 {
 #if (JERRY_STACK_LIMIT != 0)
-  if (JERRY_UNLIKELY (ecma_get_current_stack_usage () > CONFIG_MEM_STACK_LIMIT))
+  if (JERRY_UNLIKELY (ECMA_STACK_USAGE_OVERFLOW (CONFIG_MEM_STACK_LIMIT)))
   {
     parser_raise_error (context_p, PARSER_ERR_STACK_OVERFLOW);
   }