From 1f204de15049f13acc5e294860770a13d0aad962 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Thu, 3 Jan 2019 15:27:09 +0100 Subject: [PATCH] Maintenance of fatal code enum (#2670) - `ERR_SYSCALL` is a legacy that has not been used anymore since the removal of jerry-libc. This commit removes it from the port API. - `ERR_DISABLED_BYTE_CODE` is a (relatively) recent addition to the fatal code enum. At the time it was added, the documentation has not been updated. This commit adds the missing documentation. (Plus, it removes a superfluous `JERRY_UNREACHABLE` from after a `jerry_fatal (ERR_DISABLED_BYTE_CODE)`.) Note: As the port API is modified, this is an API-breaking change. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu --- docs/05.PORT-API.md | 2 +- jerry-core/include/jerryscript-port.h | 1 - jerry-core/jrt/jrt-fatals.c | 5 ----- jerry-core/vm/vm.c | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/docs/05.PORT-API.md b/docs/05.PORT-API.md index 759af10f3..bfdab9e13 100644 --- a/docs/05.PORT-API.md +++ b/docs/05.PORT-API.md @@ -25,8 +25,8 @@ Error codes typedef enum { ERR_OUT_OF_MEMORY = 10, - ERR_SYSCALL = 11, ERR_REF_COUNT_LIMIT = 12, + ERR_DISABLED_BYTE_CODE = 13, ERR_FAILED_INTERNAL_ASSERTION = 120 } jerry_fatal_code_t; ``` diff --git a/jerry-core/include/jerryscript-port.h b/jerry-core/include/jerryscript-port.h index cc6eca8ce..f79efed0b 100644 --- a/jerry-core/include/jerryscript-port.h +++ b/jerry-core/include/jerryscript-port.h @@ -48,7 +48,6 @@ extern "C" typedef enum { ERR_OUT_OF_MEMORY = 10, - ERR_SYSCALL = 11, ERR_REF_COUNT_LIMIT = 12, ERR_DISABLED_BYTE_CODE = 13, ERR_FAILED_INTERNAL_ASSERTION = 120 diff --git a/jerry-core/jrt/jrt-fatals.c b/jerry-core/jrt/jrt-fatals.c index 838cbc925..8421981f1 100644 --- a/jerry-core/jrt/jrt-fatals.c +++ b/jerry-core/jrt/jrt-fatals.c @@ -37,11 +37,6 @@ jerry_fatal (jerry_fatal_code_t code) /**< status code */ JERRY_ERROR_MSG ("Error: ERR_OUT_OF_MEMORY\n"); break; } - case ERR_SYSCALL: - { - /* print nothing as it may invoke syscall recursively */ - break; - } case ERR_REF_COUNT_LIMIT: { JERRY_ERROR_MSG ("Error: ERR_REF_COUNT_LIMIT\n"); diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c index 16468b3a9..dc137191e 100644 --- a/jerry-core/vm/vm.c +++ b/jerry-core/vm/vm.c @@ -3112,7 +3112,6 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ JERRY_ASSERT (VM_OC_GROUP_GET_INDEX (opcode_data) == VM_OC_NONE); jerry_fatal (ERR_DISABLED_BYTE_CODE); - JERRY_UNREACHABLE (); } }