Skip to content

Commit 441da97

Browse files
mikee47mikee47
committed
Update jerryscript to master
1 parent 90d025d commit 441da97

File tree

10 files changed

+86
-31
lines changed

10 files changed

+86
-31
lines changed

‎emscripten-snapshot-compiler/emscripten-snapshot-compiler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ emscripten_snapshot_compiler_compile (const jerry_char_t *source_p, jerry_size_t
7070
// No errors, let's create the snapshot:
7171
uint32_t generate_snapshot_opts = 0;
7272
(void)is_for_global;
73-
jerry_value_t generate_result = jerry_generate_snapshot (source_p, source_size, NULL, generate_snapshot_opts,
73+
jerry_value_t generate_result = jerry_generate_snapshot (rv, generate_snapshot_opts,
7474
buffer_p, buffer_size);
7575

7676
size_t snapshot_size = (size_t) jerry_get_number_value (generate_result);

‎jerryscript

Submodule jerryscript updated 695 files

‎jerryscript.patch

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,67 @@
11
diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c
2-
index 88347f8e..05629a10 100644
2+
index b55baed5..bd6b41da 100644
33
--- a/jerry-core/parser/js/js-parser.c
44
+++ b/jerry-core/parser/js/js-parser.c
5-
@@ -2900,7 +2900,6 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */
5+
@@ -3356,12 +3356,9 @@ parser_parse_script (void *source_p, /**< source code */
6+
7+
return bytecode_p;
8+
#else /* !JERRY_PARSER */
9+
- JERRY_UNUSED (arg_list_p);
10+
- JERRY_UNUSED (arg_list_size);
611
JERRY_UNUSED (source_p);
7-
JERRY_UNUSED (source_size);
12+
- JERRY_UNUSED (source_size);
813
JERRY_UNUSED (parse_opts);
914
- JERRY_UNUSED (resource_name);
15+
+ JERRY_UNUSED (options_p);
1016

11-
ecma_raise_syntax_error (ECMA_ERR_MSG ("Source code parsing is disabled"));
17+
ecma_raise_syntax_error (ECMA_ERR_PARSER_NOT_SUPPORTED);
1218
return NULL;
19+
diff --git a/jerry-core/ecma/operations/ecma-eval.c b/jerry-core/ecma/operations/ecma-eval.c
20+
index e4a2d734..cd544844 100644
21+
--- a/jerry-core/ecma/operations/ecma-eval.c
22+
+++ b/jerry-core/ecma/operations/ecma-eval.c
23+
@@ -94,8 +94,7 @@ ecma_op_eval_chars_buffer (void *source_p, /**< source code */
24+
25+
return vm_run_eval (bytecode_p, parse_opts);
26+
#else /* !JERRY_PARSER */
27+
- JERRY_UNUSED (code_p);
28+
- JERRY_UNUSED (code_buffer_size);
29+
+ JERRY_UNUSED (source_p);
30+
JERRY_UNUSED (parse_opts);
31+
32+
return ecma_raise_syntax_error (ECMA_ERR_PARSER_NOT_SUPPORTED);
33+
diff --git a/jerry-core/ecma/base/ecma-helpers.c b/jerry-core/ecma/base/ecma-helpers.c
34+
index bd25d9d3..cce169bb 100644
35+
--- a/jerry-core/ecma/base/ecma-helpers.c
36+
+++ b/jerry-core/ecma/base/ecma-helpers.c
37+
@@ -1626,11 +1626,13 @@ ecma_script_get_from_value (ecma_value_t value) /**< compiled code */
38+
{
39+
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
40+
41+
+#if JERRY_PARSER
42+
if (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_SCRIPT)
43+
{
44+
bytecode_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_object_p->u.cls.u3.value);
45+
break;
46+
}
47+
+#endif
48+
49+
#if JERRY_MODULE_SYSTEM
50+
if (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_MODULE)
51+
diff --git a/jerry-core/api/jerryscript.c b/jerry-core/api/jerryscript.c
52+
index 13e3fd65..32444cd6 100644
53+
--- a/jerry-core/api/jerryscript.c
54+
+++ b/jerry-core/api/jerryscript.c
55+
@@ -564,10 +564,12 @@ jerry_run (const jerry_value_t func_val) /**< function to run */
56+
57+
ecma_object_t *object_p = ecma_get_object_from_value (func_val);
58+
59+
+#if JERRY_PARSER
60+
if (!ecma_object_class_is (object_p, ECMA_OBJECT_CLASS_SCRIPT))
61+
{
62+
return jerry_throw (ecma_raise_type_error (ECMA_ERR_WRONG_ARGS_MSG));
63+
}
64+
+#endif
65+
66+
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
67+

‎jsc/es.next/jsc.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,10 @@ var tempDouble;
12061206
var tempI64;
12071207

12081208
var ASM_CONSTS = {
1209-
53736: function() {
1209+
58568: function() {
12101210
throw new Error("Input must be valid UTF-8");
12111211
},
1212-
53787: function($0) {
1212+
58619: function($0) {
12131213
throw new Error(UTF8ToString($0));
12141214
}
12151215
};
@@ -1515,11 +1515,11 @@ var asmLibraryArg = {
15151515
"invoke_iii": invoke_iii,
15161516
"invoke_iiii": invoke_iiii,
15171517
"invoke_iiiii": invoke_iiiii,
1518+
"invoke_iiiiii": invoke_iiiiii,
15181519
"invoke_vi": invoke_vi,
15191520
"invoke_vii": invoke_vii,
15201521
"invoke_viii": invoke_viii,
15211522
"invoke_viiii": invoke_viiii,
1522-
"invoke_viiiii": invoke_viiiii,
15231523
"proc_exit": _proc_exit,
15241524
"segfault": segfault,
15251525
"setTempRet0": _setTempRet0
@@ -1595,32 +1595,32 @@ var _emscripten_get_sbrk_ptr = Module["_emscripten_get_sbrk_ptr"] = function() {
15951595
return (_emscripten_get_sbrk_ptr = Module["_emscripten_get_sbrk_ptr"] = Module["asm"]["emscripten_get_sbrk_ptr"]).apply(null, arguments);
15961596
};
15971597

1598-
function invoke_vi(index, a1) {
1598+
function invoke_ii(index, a1) {
15991599
var sp = stackSave();
16001600
try {
1601-
getWasmTableEntry(index)(a1);
1601+
return getWasmTableEntry(index)(a1);
16021602
} catch (e) {
16031603
stackRestore(sp);
16041604
if (e !== e + 0 && e !== "longjmp") throw e;
16051605
_setThrew(1, 0);
16061606
}
16071607
}
16081608

1609-
function invoke_ii(index, a1) {
1609+
function invoke_iiiiii(index, a1, a2, a3, a4, a5) {
16101610
var sp = stackSave();
16111611
try {
1612-
return getWasmTableEntry(index)(a1);
1612+
return getWasmTableEntry(index)(a1, a2, a3, a4, a5);
16131613
} catch (e) {
16141614
stackRestore(sp);
16151615
if (e !== e + 0 && e !== "longjmp") throw e;
16161616
_setThrew(1, 0);
16171617
}
16181618
}
16191619

1620-
function invoke_iii(index, a1, a2) {
1620+
function invoke_vi(index, a1) {
16211621
var sp = stackSave();
16221622
try {
1623-
return getWasmTableEntry(index)(a1, a2);
1623+
getWasmTableEntry(index)(a1);
16241624
} catch (e) {
16251625
stackRestore(sp);
16261626
if (e !== e + 0 && e !== "longjmp") throw e;
@@ -1639,10 +1639,10 @@ function invoke_viii(index, a1, a2, a3) {
16391639
}
16401640
}
16411641

1642-
function invoke_viiiii(index, a1, a2, a3, a4, a5) {
1642+
function invoke_iii(index, a1, a2) {
16431643
var sp = stackSave();
16441644
try {
1645-
getWasmTableEntry(index)(a1, a2, a3, a4, a5);
1645+
return getWasmTableEntry(index)(a1, a2);
16461646
} catch (e) {
16471647
stackRestore(sp);
16481648
if (e !== e + 0 && e !== "longjmp") throw e;

‎jsc/es.next/jsc.wasm

24.5 KB
Binary file not shown.

‎jsc/es.next/jsc.wasm.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jsc/minimal/jsc.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,10 @@ var tempDouble;
12061206
var tempI64;
12071207

12081208
var ASM_CONSTS = {
1209-
11372: function() {
1209+
12292: function() {
12101210
throw new Error("Input must be valid UTF-8");
12111211
},
1212-
11423: function($0) {
1212+
12343: function($0) {
12131213
throw new Error(UTF8ToString($0));
12141214
}
12151215
};
@@ -1394,10 +1394,10 @@ var asmLibraryArg = {
13941394
"invoke_iii": invoke_iii,
13951395
"invoke_iiii": invoke_iiii,
13961396
"invoke_iiiii": invoke_iiiii,
1397+
"invoke_iiiiii": invoke_iiiiii,
13971398
"invoke_vi": invoke_vi,
13981399
"invoke_vii": invoke_vii,
13991400
"invoke_viii": invoke_viii,
1400-
"invoke_viiiii": invoke_viiiii,
14011401
"proc_exit": _proc_exit,
14021402
"segfault": segfault,
14031403
"setTempRet0": _setTempRet0
@@ -1473,32 +1473,32 @@ var _emscripten_get_sbrk_ptr = Module["_emscripten_get_sbrk_ptr"] = function() {
14731473
return (_emscripten_get_sbrk_ptr = Module["_emscripten_get_sbrk_ptr"] = Module["asm"]["emscripten_get_sbrk_ptr"]).apply(null, arguments);
14741474
};
14751475

1476-
function invoke_vi(index, a1) {
1476+
function invoke_ii(index, a1) {
14771477
var sp = stackSave();
14781478
try {
1479-
getWasmTableEntry(index)(a1);
1479+
return getWasmTableEntry(index)(a1);
14801480
} catch (e) {
14811481
stackRestore(sp);
14821482
if (e !== e + 0 && e !== "longjmp") throw e;
14831483
_setThrew(1, 0);
14841484
}
14851485
}
14861486

1487-
function invoke_ii(index, a1) {
1487+
function invoke_iiiiii(index, a1, a2, a3, a4, a5) {
14881488
var sp = stackSave();
14891489
try {
1490-
return getWasmTableEntry(index)(a1);
1490+
return getWasmTableEntry(index)(a1, a2, a3, a4, a5);
14911491
} catch (e) {
14921492
stackRestore(sp);
14931493
if (e !== e + 0 && e !== "longjmp") throw e;
14941494
_setThrew(1, 0);
14951495
}
14961496
}
14971497

1498-
function invoke_iii(index, a1, a2) {
1498+
function invoke_vi(index, a1) {
14991499
var sp = stackSave();
15001500
try {
1501-
return getWasmTableEntry(index)(a1, a2);
1501+
getWasmTableEntry(index)(a1);
15021502
} catch (e) {
15031503
stackRestore(sp);
15041504
if (e !== e + 0 && e !== "longjmp") throw e;
@@ -1517,10 +1517,10 @@ function invoke_viii(index, a1, a2, a3) {
15171517
}
15181518
}
15191519

1520-
function invoke_viiiii(index, a1, a2, a3, a4, a5) {
1520+
function invoke_iii(index, a1, a2) {
15211521
var sp = stackSave();
15221522
try {
1523-
getWasmTableEntry(index)(a1, a2, a3, a4, a5);
1523+
return getWasmTableEntry(index)(a1, a2);
15241524
} catch (e) {
15251525
stackRestore(sp);
15261526
if (e !== e + 0 && e !== "longjmp") throw e;

‎jsc/minimal/jsc.wasm

4.49 KB
Binary file not shown.

0 commit comments

Comments
 (0)