Skip to content

Commit ca835ad

Browse files
author
Zsolt Borbély
committed
Add option to enable all-in-one build mode
Related issue: #626 JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély [email protected]
1 parent ecc0132 commit ca835ad

File tree

5 files changed

+177
-16
lines changed

5 files changed

+177
-16
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ project (Jerry CXX C ASM)
6262
option(ENABLE_VALGRIND_FREYA "Enable valgrind-freya helpers in memory allocators" OFF)
6363
option(ENABLE_LTO "Enable LTO build" ON)
6464
option(ENABLE_LOG "Enable LOG build" OFF)
65+
option(ENABLE_ALL_IN_ONE "Enable ALL_IN_ONE build" OFF)
6566

6667
if("${PLATFORM}" STREQUAL "LINUX")
6768
set(PLATFORM_EXT "LINUX")

‎Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@
7676
LOG := OFF
7777
endif
7878

79+
# All-in-one build
80+
ALL_IN_ONE ?= OFF
81+
ifneq ($(ALL_IN_ONE),ON)
82+
ALL_IN_ONE := OFF
83+
endif
84+
7985
# Verbosity
8086
ifdef VERBOSE
8187
Q :=
@@ -141,9 +147,10 @@ export SHELL=/bin/bash
141147
OPTIONS_COMBINATIONS := $(foreach __OPTION,ON OFF,$(__COMBINATION)-VALGRIND-$(__OPTION))
142148
OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-VALGRIND_FREYA-$(__OPTION)))
143149
OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-LTO-$(__OPTION)))
150+
OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-ALL_IN_ONE-$(__OPTION)))
144151

145152
# Building current options string
146-
OPTIONS_STRING := -VALGRIND-$(VALGRIND)-VALGRIND_FREYA-$(VALGRIND_FREYA)-LTO-$(LTO)
153+
OPTIONS_STRING := -VALGRIND-$(VALGRIND)-VALGRIND_FREYA-$(VALGRIND_FREYA)-LTO-$(LTO)-ALL_IN_ONE-$(ALL_IN_ONE)
147154

148155
# Build directories
149156
BUILD_DIR_PREFIX := ./build/obj
@@ -190,6 +197,7 @@ $(BUILD_DIRS_NATIVE):
190197
-DENABLE_VALGRIND_FREYA=$(VALGRIND_FREYA) \
191198
-DENABLE_LOG=$(LOG) \
192199
-DENABLE_LTO=$(LTO) \
200+
-DENABLE_ALL_IN_ONE=$(ALL_IN_ONE) \
193201
-DUSE_COMPILER_DEFAULT_LIBC=$(USE_COMPILER_DEFAULT_LIBC) \
194202
-DCMAKE_TOOLCHAIN_FILE=`cat toolchain.config` ../../.. 2>&1 | tee cmake.log $(QLOG) ; ( exit $${PIPESTATUS[0]} ) ) || \
195203
(echo "CMake run failed. See "`pwd`"/cmake.log for details."; exit 1;); \

‎jerry-core/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,11 @@ project (JerryCore CXX C ASM)
121121
set(INCLUDE_THIRD_PARTY_VALGRIND ${CMAKE_SOURCE_DIR}/third-party/valgrind)
122122

123123
# Sources
124+
# All-in-one build
125+
if("${ENABLE_ALL_IN_ONE}" STREQUAL "ON")
126+
set(SOURCE_CORE jerry-all-in.cpp)
127+
else()
124128
# Jerry core
125-
file(GLOB SOURCE_CORE_API *.cpp)
126129
file(GLOB SOURCE_CORE_LIT lit/*.cpp)
127130
file(GLOB SOURCE_CORE_RCS rcs/*.cpp)
128131
file(GLOB SOURCE_CORE_MEM mem/*.cpp)
@@ -137,7 +140,6 @@ project (JerryCore CXX C ASM)
137140

138141
set(SOURCE_CORE
139142
jerry.cpp
140-
${SOURCE_CORE_API}
141143
${SOURCE_CORE_LIT}
142144
${SOURCE_CORE_RCS}
143145
${SOURCE_CORE_MEM}
@@ -149,6 +151,7 @@ project (JerryCore CXX C ASM)
149151
${SOURCE_CORE_PARSER_JS_COLLECTIONS}
150152
${SOURCE_CORE_PARSER_REGEXP}
151153
${SOURCE_CORE_JRT})
154+
endif()
152155

153156
# Per-option configuration
154157
# Valgrind

‎jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
#undef ROUTINE_ARG_LIST_0
5454
#undef ROUTINE_ARG
5555

56-
static lit_magic_string_id_t ecma_builtin_property_names[] =
56+
#define ECMA_BUILTIN_PROPERTY_NAMES \
57+
PASTE (PASTE (ecma_builtin_property_names, _), BUILTIN_UNDERSCORED_ID)
58+
59+
static lit_magic_string_id_t ECMA_BUILTIN_PROPERTY_NAMES[] =
5760
{
5861
#define SIMPLE_VALUE(name, obj_getter, prop_writable, prop_enumerable, prop_configurable) name,
5962
#define NUMBER_VALUE(name, obj_getter, prop_writable, prop_enumerable, prop_configurable) name,
@@ -77,14 +80,14 @@ SORT_PROPERTY_NAMES_ROUTINE_NAME (BUILTIN_UNDERSCORED_ID) (void)
7780
swapped = false;
7881

7982
for (ecma_length_t i = 1;
80-
i < (sizeof (ecma_builtin_property_names) / sizeof (ecma_builtin_property_names[0]));
83+
i < (sizeof (ECMA_BUILTIN_PROPERTY_NAMES) / sizeof (ECMA_BUILTIN_PROPERTY_NAMES[0]));
8184
i++)
8285
{
83-
if (ecma_builtin_property_names[i] < ecma_builtin_property_names[i - 1])
86+
if (ECMA_BUILTIN_PROPERTY_NAMES[i] < ECMA_BUILTIN_PROPERTY_NAMES[i - 1])
8487
{
85-
lit_magic_string_id_t id_temp = ecma_builtin_property_names[i - 1];
86-
ecma_builtin_property_names[i - 1] = ecma_builtin_property_names[i];
87-
ecma_builtin_property_names[i] = id_temp;
88+
lit_magic_string_id_t id_temp = ECMA_BUILTIN_PROPERTY_NAMES[i - 1];
89+
ECMA_BUILTIN_PROPERTY_NAMES[i - 1] = ECMA_BUILTIN_PROPERTY_NAMES[i];
90+
ECMA_BUILTIN_PROPERTY_NAMES[i] = id_temp;
8891

8992
swapped = true;
9093
}
@@ -118,10 +121,10 @@ TRY_TO_INSTANTIATE_PROPERTY_ROUTINE_NAME (BUILTIN_UNDERSCORED_ID) (ecma_object_t
118121
return NULL;
119122
}
120123

121-
const ecma_length_t property_numbers = (ecma_length_t) (sizeof (ecma_builtin_property_names) /
122-
sizeof (ecma_builtin_property_names[0]));
124+
const ecma_length_t property_numbers = (ecma_length_t) (sizeof (ECMA_BUILTIN_PROPERTY_NAMES) /
125+
sizeof (ECMA_BUILTIN_PROPERTY_NAMES[0]));
123126
int32_t index;
124-
index = ecma_builtin_bin_search_for_magic_string_id_in_array (ecma_builtin_property_names,
127+
index = ecma_builtin_bin_search_for_magic_string_id_in_array (ECMA_BUILTIN_PROPERTY_NAMES,
125128
property_numbers,
126129
id);
127130

@@ -307,17 +310,17 @@ LIST_LAZY_PROPERTY_NAMES_ROUTINE_NAME (BUILTIN_UNDERSCORED_ID) (ecma_object_t *o
307310

308311
JERRY_ASSERT (ecma_builtin_is (object_p, builtin_object_id));
309312

310-
const ecma_length_t properties_number = (ecma_length_t) (sizeof (ecma_builtin_property_names) /
311-
sizeof (ecma_builtin_property_names[0]));
313+
const ecma_length_t properties_number = (ecma_length_t) (sizeof (ECMA_BUILTIN_PROPERTY_NAMES) /
314+
sizeof (ECMA_BUILTIN_PROPERTY_NAMES[0]));
312315

313316
for (ecma_length_t i = 0;
314317
i < properties_number;
315318
i++)
316319
{
317-
lit_magic_string_id_t name = ecma_builtin_property_names[i];
320+
lit_magic_string_id_t name = ECMA_BUILTIN_PROPERTY_NAMES[i];
318321

319322
int32_t index;
320-
index = ecma_builtin_bin_search_for_magic_string_id_in_array (ecma_builtin_property_names,
323+
index = ecma_builtin_bin_search_for_magic_string_id_in_array (ECMA_BUILTIN_PROPERTY_NAMES,
321324
properties_number,
322325
name);
323326

@@ -445,4 +448,5 @@ DISPATCH_ROUTINE_ROUTINE_NAME (BUILTIN_UNDERSCORED_ID) (uint16_t builtin_routine
445448
#undef TRY_TO_INSTANTIATE_PROPERTY_ROUTINE_NAME
446449
#undef BUILTIN_UNDERSCORED_ID
447450
#undef BUILTIN_INC_HEADER_NAME
451+
#undef ECMA_BUILTIN_PROPERTY_NAMES
448452

‎jerry-core/jerry-all-in.cpp

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
/* Copyright 2015 Samsung Electronics Co., Ltd.
2+
* Copyright 2015 University of Szeged.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
#include "jerry.cpp"
18+
19+
/* ecma/base */
20+
#include "ecma-alloc.cpp"
21+
#include "ecma-gc.cpp"
22+
#include "ecma-helpers-conversion.cpp"
23+
#include "ecma-helpers.cpp"
24+
#include "ecma-helpers-external-pointers.cpp"
25+
#include "ecma-helpers-number.cpp"
26+
#include "ecma-helpers-string.cpp"
27+
#include "ecma-helpers-value.cpp"
28+
#include "ecma-helpers-values-collection.cpp"
29+
#include "ecma-init-finalize.cpp"
30+
#include "ecma-lcache.cpp"
31+
32+
/* ecma/builtin-objects */
33+
#include "ecma-builtin-array.cpp"
34+
#include "ecma-builtin-array-prototype.cpp"
35+
#include "ecma-builtin-boolean.cpp"
36+
#include "ecma-builtin-boolean-prototype.cpp"
37+
#include "ecma-builtin-compact-profile-error.cpp"
38+
#include "ecma-builtin-date.cpp"
39+
#include "ecma-builtin-date-prototype.cpp"
40+
#include "ecma-builtin-error.cpp"
41+
#include "ecma-builtin-error-prototype.cpp"
42+
#include "ecma-builtin-evalerror.cpp"
43+
#include "ecma-builtin-evalerror-prototype.cpp"
44+
#include "ecma-builtin-function.cpp"
45+
#include "ecma-builtin-function-prototype.cpp"
46+
#include "ecma-builtin-global.cpp"
47+
#include "ecma-builtin-helpers.cpp"
48+
#include "ecma-builtin-helpers-date.cpp"
49+
#include "ecma-builtin-helpers-json.cpp"
50+
#include "ecma-builtin-json.cpp"
51+
#include "ecma-builtin-math.cpp"
52+
#include "ecma-builtin-number.cpp"
53+
#include "ecma-builtin-number-prototype.cpp"
54+
#include "ecma-builtin-object.cpp"
55+
#include "ecma-builtin-object-prototype.cpp"
56+
#include "ecma-builtin-rangeerror.cpp"
57+
#include "ecma-builtin-rangeerror-prototype.cpp"
58+
#include "ecma-builtin-referenceerror.cpp"
59+
#include "ecma-builtin-referenceerror-prototype.cpp"
60+
#include "ecma-builtin-regexp.cpp"
61+
#include "ecma-builtin-regexp-prototype.cpp"
62+
#include "ecma-builtins.cpp"
63+
#include "ecma-builtin-string.cpp"
64+
#include "ecma-builtin-string-prototype.cpp"
65+
#include "ecma-builtin-syntaxerror.cpp"
66+
#include "ecma-builtin-syntaxerror-prototype.cpp"
67+
#include "ecma-builtin-typeerror.cpp"
68+
#include "ecma-builtin-typeerror-prototype.cpp"
69+
#include "ecma-builtin-type-error-thrower.cpp"
70+
#include "ecma-builtin-urierror.cpp"
71+
#include "ecma-builtin-urierror-prototype.cpp"
72+
73+
/* ecma/operations */
74+
#include "ecma-array-object.cpp"
75+
#include "ecma-boolean-object.cpp"
76+
#include "ecma-comparison.cpp"
77+
#include "ecma-conversion.cpp"
78+
#include "ecma-eval.cpp"
79+
#include "ecma-exceptions.cpp"
80+
#include "ecma-function-object.cpp"
81+
#include "ecma-get-put-value.cpp"
82+
#include "ecma-lex-env.cpp"
83+
#include "ecma-number-arithmetic.cpp"
84+
#include "ecma-number-object.cpp"
85+
#include "ecma-objects-arguments.cpp"
86+
#include "ecma-objects.cpp"
87+
#include "ecma-objects-general.cpp"
88+
#include "ecma-reference.cpp"
89+
#include "ecma-regexp-object.cpp"
90+
#include "ecma-string-object.cpp"
91+
92+
/* jrt */
93+
#include "jrt-bit-fields.cpp"
94+
#include "jrt-fatals.cpp"
95+
96+
/* lit */
97+
#include "lit/lit-char-helpers.cpp"
98+
#include "lit/lit-literal.cpp"
99+
#include "lit/lit-literal-storage.cpp"
100+
#include "lit/lit-magic-strings.cpp"
101+
#include "lit/lit-strings.cpp"
102+
103+
/* mem */
104+
#include "mem-allocator.cpp"
105+
#include "mem-heap.cpp"
106+
#include "mem-poolman.cpp"
107+
108+
/* parser/js */
109+
#include "jsp-early-error.cpp"
110+
#include "jsp-label.cpp"
111+
#include "jsp-mm.cpp"
112+
#include "lexer.cpp"
113+
#include "opcodes-dumper.cpp"
114+
#include "parser.cpp"
115+
#include "scopes-tree.cpp"
116+
#include "serializer.cpp"
117+
118+
/* parser/js/collections */
119+
#include "array-list.cpp"
120+
#include "hash-table.cpp"
121+
#include "linked-list.cpp"
122+
#include "lit-id-hash-table.cpp"
123+
124+
/* parser/regexp */
125+
#include "re-compiler.cpp"
126+
#include "re-parser.cpp"
127+
128+
/* rcs */
129+
#include "rcs-chunked-list.cpp"
130+
#include "rcs-recordset.cpp"
131+
132+
/* vm */
133+
#include "opcodes-agnostic.cpp"
134+
#include "opcodes.cpp"
135+
#include "opcodes-ecma-arithmetics.cpp"
136+
#include "opcodes-ecma-bitwise.cpp"
137+
#include "opcodes-ecma-equality.cpp"
138+
#include "opcodes-ecma-relational.cpp"
139+
#include "opcodes-ecma-try-catch-finally.cpp"
140+
#include "opcodes-for-in.cpp"
141+
#include "opcodes-helpers-variables.cpp"
142+
#include "opcodes-varg.cpp"
143+
#include "pretty-printer.cpp"
144+
#include "vm.cpp"
145+
#include "vm-stack.cpp"

0 commit comments

Comments
 (0)