YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding configuration option for ECMA exception support.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-09-08 19:09:34 +04:00
parent 4d34bab9a0
commit dafbaa742e
4 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.h
+5
View File
@@ -99,4 +99,9 @@
#define CONFIG_ECMA_CHAR_ASCII #define CONFIG_ECMA_CHAR_ASCII
// #define CONFIG_ECMA_CHAR_UTF16 // #define CONFIG_ECMA_CHAR_UTF16
/**
* Enable ecma-exception support
*/
#define CONFIG_ECMA_EXCEPTION_SUPPORT
#endif /* !CONFIG_H */ #endif /* !CONFIG_H */
src/libcoreint/interpreter.c
+2
View File
@@ -94,10 +94,12 @@ run_int (void)
/* SyntaxError should be treated as an early error */ /* SyntaxError should be treated as an early error */
JERRY_UNREACHABLE (); JERRY_UNREACHABLE ();
} }
#ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
case ECMA_COMPLETION_TYPE_THROW: case ECMA_COMPLETION_TYPE_THROW:
{ {
jerry_exit (ERR_UNHANDLED_EXCEPTION); jerry_exit (ERR_UNHANDLED_EXCEPTION);
} }
#endif /* CONFIG_ECMA_EXCEPTION_SUPPORT */
} }
JERRY_UNREACHABLE (); JERRY_UNREACHABLE ();
src/libecmaobjects/ecma-globals.h
+2
View File
@@ -103,7 +103,9 @@ typedef enum
ECMA_COMPLETION_TYPE_RETURN, /**< block completed with return */ ECMA_COMPLETION_TYPE_RETURN, /**< block completed with return */
ECMA_COMPLETION_TYPE_BREAK, /**< block completed with break */ ECMA_COMPLETION_TYPE_BREAK, /**< block completed with break */
ECMA_COMPLETION_TYPE_CONTINUE, /**< block completed with continue */ ECMA_COMPLETION_TYPE_CONTINUE, /**< block completed with continue */
#ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
ECMA_COMPLETION_TYPE_THROW, /**< block completed with throw */ ECMA_COMPLETION_TYPE_THROW, /**< block completed with throw */
#endif /* CONFIG_ECMA_EXCEPTION_SUPPORT */
ECMA_COMPLETION_TYPE_EXIT, /**< implementation-defined completion type ECMA_COMPLETION_TYPE_EXIT, /**< implementation-defined completion type
for finishing script execution */ for finishing script execution */
ECMA_COMPLETION_TYPE_META /**< implementation-defined completion type ECMA_COMPLETION_TYPE_META /**< implementation-defined completion type
src/libecmaobjects/ecma-helpers-value.c
+32 -10
View File
@@ -287,12 +287,16 @@ ecma_completion_value_t
ecma_make_completion_value (ecma_completion_type_t type, /**< type */ ecma_make_completion_value (ecma_completion_type_t type, /**< type */
ecma_value_t value) /**< value */ ecma_value_t value) /**< value */
{ {
JERRY_ASSERT (type == ECMA_COMPLETION_TYPE_NORMAL const bool is_type_ok = (type == ECMA_COMPLETION_TYPE_NORMAL
|| type == ECMA_COMPLETION_TYPE_THROW #ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
|| type == ECMA_COMPLETION_TYPE_RETURN || type == ECMA_COMPLETION_TYPE_THROW
|| type == ECMA_COMPLETION_TYPE_EXIT #endif /* CONFIG_ECMA_EXCEPTION_SUPPORT */
|| (type == ECMA_COMPLETION_TYPE_META || type == ECMA_COMPLETION_TYPE_RETURN
&& ecma_is_value_empty (value))); || type == ECMA_COMPLETION_TYPE_EXIT
|| (type == ECMA_COMPLETION_TYPE_META
&& ecma_is_value_empty (value)));
JERRY_ASSERT (is_type_ok);
ecma_completion_value_t ret_value = (ecma_completion_value_t) ecma_completion_value_t ret_value = (ecma_completion_value_t)
{ {
@@ -368,7 +372,13 @@ ecma_make_normal_completion_value (ecma_value_t value) /**< value */
ecma_completion_value_t ecma_completion_value_t
ecma_make_throw_completion_value (ecma_value_t value) /**< value */ ecma_make_throw_completion_value (ecma_value_t value) /**< value */
{ {
#ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
return ecma_make_completion_value (ECMA_COMPLETION_TYPE_THROW, value); return ecma_make_completion_value (ECMA_COMPLETION_TYPE_THROW, value);
#else /* CONFIG_ECMA_EXCEPTION_SUPPORT */
(void) value;
jerry_exit (ERR_UNHANDLED_EXCEPTION);
#endif /* !CONFIG_ECMA_EXCEPTION_SUPPORT */
} /* ecma_make_throw_completion_value */ } /* ecma_make_throw_completion_value */
/** /**
@@ -445,10 +455,14 @@ ecma_make_meta_completion_value (void)
ecma_completion_value_t ecma_completion_value_t
ecma_copy_completion_value (ecma_completion_value_t value) /**< completion value */ ecma_copy_completion_value (ecma_completion_value_t value) /**< completion value */
{ {
JERRY_ASSERT (value.type == ECMA_COMPLETION_TYPE_NORMAL const bool is_type_ok = (value.type == ECMA_COMPLETION_TYPE_NORMAL
|| value.type == ECMA_COMPLETION_TYPE_THROW #ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
|| value.type == ECMA_COMPLETION_TYPE_RETURN || value.type == ECMA_COMPLETION_TYPE_THROW
|| value.type == ECMA_COMPLETION_TYPE_EXIT); #endif /* CONFIG_ECMA_EXCEPTION_SUPPORT */
|| value.type == ECMA_COMPLETION_TYPE_RETURN
|| value.type == ECMA_COMPLETION_TYPE_EXIT);
JERRY_ASSERT (is_type_ok);
return ecma_make_completion_value (value.type, return ecma_make_completion_value (value.type,
ecma_copy_value (value.u.value, true)); ecma_copy_value (value.u.value, true));
@@ -463,7 +477,9 @@ ecma_free_completion_value (ecma_completion_value_t completion_value) /**< compl
switch ((ecma_completion_type_t)completion_value.type) switch ((ecma_completion_type_t)completion_value.type)
{ {
case ECMA_COMPLETION_TYPE_NORMAL: case ECMA_COMPLETION_TYPE_NORMAL:
#ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
case ECMA_COMPLETION_TYPE_THROW: case ECMA_COMPLETION_TYPE_THROW:
#endif /* CONFIG_ECMA_EXCEPTION_SUPPORT */
case ECMA_COMPLETION_TYPE_RETURN: case ECMA_COMPLETION_TYPE_RETURN:
{ {
ecma_free_value (completion_value.u.value, true); ecma_free_value (completion_value.u.value, true);
@@ -508,7 +524,13 @@ ecma_is_completion_value_normal (ecma_completion_value_t value) /**< completion
bool bool
ecma_is_completion_value_throw (ecma_completion_value_t value) /**< completion value */ ecma_is_completion_value_throw (ecma_completion_value_t value) /**< completion value */
{ {
#ifdef CONFIG_ECMA_EXCEPTION_SUPPORT
return (value.type == ECMA_COMPLETION_TYPE_THROW); return (value.type == ECMA_COMPLETION_TYPE_THROW);
#else /* CONFIG_ECMA_EXCEPTION_SUPPORT */
(void) value;
return false;
#endif /* !CONFIG_ECMA_EXCEPTION_SUPPORT */
} /* ecma_is_completion_value_throw */ } /* ecma_is_completion_value_throw */
/** /**