Skip to content

Commit 9513f37

Browse files
zherczegrobertsipka
authored andcommitted
Reduce with stack consumption by 1. (#2430)
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]
1 parent 5f4a220 commit 9513f37

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

jerry-core/parser/js/byte-code.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
/* PARSER_FOR_IN_CONTEXT_STACK_ALLOCATION must be <= 4 */
203203
#define PARSER_FOR_IN_CONTEXT_STACK_ALLOCATION 4
204204
/* PARSER_WITH_CONTEXT_STACK_ALLOCATION must be <= 4 */
205-
#define PARSER_WITH_CONTEXT_STACK_ALLOCATION 2
205+
#define PARSER_WITH_CONTEXT_STACK_ALLOCATION 1
206206
/* PARSER_TRY_CONTEXT_STACK_ALLOCATION must be <= 3 */
207207
#define PARSER_TRY_CONTEXT_STACK_ALLOCATION 2
208208

jerry-core/vm/vm-stack.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,23 @@ vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, /**< frame context */
5454
break;
5555
}
5656
case VM_CONTEXT_CATCH:
57-
case VM_CONTEXT_WITH:
5857
{
59-
ecma_deref_object (frame_ctx_p->lex_env_p);
60-
frame_ctx_p->lex_env_p = ecma_get_object_from_value (vm_stack_top_p[-2]);
58+
JERRY_ASSERT (PARSER_TRY_CONTEXT_STACK_ALLOCATION > PARSER_WITH_CONTEXT_STACK_ALLOCATION);
6159

62-
JERRY_ASSERT (PARSER_TRY_CONTEXT_STACK_ALLOCATION == PARSER_WITH_CONTEXT_STACK_ALLOCATION);
60+
const uint16_t size_diff = PARSER_TRY_CONTEXT_STACK_ALLOCATION - PARSER_WITH_CONTEXT_STACK_ALLOCATION;
6361

64-
VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_TRY_CONTEXT_STACK_ALLOCATION);
65-
vm_stack_top_p -= PARSER_TRY_CONTEXT_STACK_ALLOCATION;
62+
VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, size_diff);
63+
vm_stack_top_p -= size_diff;
64+
/* FALLTHRU */
65+
}
66+
case VM_CONTEXT_WITH:
67+
{
68+
ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p;
69+
frame_ctx_p->lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
70+
ecma_deref_object (lex_env_p);
71+
72+
VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_WITH_CONTEXT_STACK_ALLOCATION);
73+
vm_stack_top_p -= PARSER_WITH_CONTEXT_STACK_ALLOCATION;
6674
break;
6775
}
6876
default:
@@ -218,8 +226,9 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */
218226
}
219227
else
220228
{
221-
ecma_deref_object (frame_ctx_p->lex_env_p);
222-
frame_ctx_p->lex_env_p = ecma_get_object_from_value (vm_stack_top_p[-2]);
229+
ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p;
230+
frame_ctx_p->lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
231+
ecma_deref_object (lex_env_p);
223232

224233
if (byte_code_p[0] == CBC_CONTEXT_END)
225234
{

jerry-core/vm/vm.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,14 +2314,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
23142314
object_p = ecma_get_object_from_value (result);
23152315

23162316
with_env_p = ecma_create_object_lex_env (frame_ctx_p->lex_env_p, object_p);
2317-
23182317
ecma_deref_object (object_p);
23192318

23202319
VM_PLUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_WITH_CONTEXT_STACK_ALLOCATION);
23212320
stack_top_p += PARSER_WITH_CONTEXT_STACK_ALLOCATION;
23222321

23232322
stack_top_p[-1] = VM_CREATE_CONTEXT (VM_CONTEXT_WITH, branch_offset);
2324-
stack_top_p[-2] = ecma_make_object_value (frame_ctx_p->lex_env_p);
23252323

23262324
frame_ctx_p->lex_env_p = with_env_p;
23272325
continue;
@@ -2468,8 +2466,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
24682466

24692467
if (VM_GET_CONTEXT_TYPE (stack_top_p[-1]) == VM_CONTEXT_CATCH)
24702468
{
2471-
ecma_deref_object (frame_ctx_p->lex_env_p);
2472-
frame_ctx_p->lex_env_p = ecma_get_object_from_value (stack_top_p[-2]);
2469+
ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p;
2470+
frame_ctx_p->lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
2471+
ecma_deref_object (lex_env_p);
24732472
}
24742473

24752474
stack_top_p[-1] = (ecma_value_t) VM_CREATE_CONTEXT (VM_CONTEXT_FINALLY_JUMP, branch_offset);
@@ -2903,7 +2902,6 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
29032902
ecma_string_t *catch_name_p = ecma_get_string_from_value (literal_start_p[literal_index]);
29042903
ecma_op_create_mutable_binding (catch_env_p, catch_name_p, false);
29052904

2906-
stack_top_p[-2 - 1] = ecma_make_object_value (frame_ctx_p->lex_env_p);
29072905
frame_ctx_p->lex_env_p = catch_env_p;
29082906
}
29092907
else

0 commit comments

Comments
 (0)