Build fix for compact profile. Add disable macros for RegExp builtin files.

LaszloLango · LaszloLango · commit 5ecd250ed96f · 2015-06-10T10:23:07.000+02:00
JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp
@@ -57,6 +57,7 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
   ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
 
   ECMA_TRY_CATCH (obj_this, ecma_op_to_object (this_arg), ret_value);
+
   ecma_object_t *obj_p = ecma_get_object_from_value (obj_this);
   ecma_property_t *bytecode_prop = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_REGEXP_BYTECODE);
   re_bytecode_t *bytecode_p = ECMA_GET_POINTER (re_bytecode_t, bytecode_prop->u.internal_property.value);
@@ -75,7 +76,6 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
   ssize_t zt_str_size = (ssize_t) sizeof (ecma_char_t) * (chars + 1);
   ecma_string_to_zt_string (input_str_p, input_zt_str_p, zt_str_size);
 
-  /* FIXME: call of ecma_make_normal_completion_value should be in an ECMA_TRY_CATCH */
   ret_value = ecma_regexp_exec_helper (bytecode_p, input_zt_str_p);
 
   MEM_FINALIZE_LOCAL_ARRAY (input_zt_str_p);
diff --git a/jerry-core/ecma/operations/ecma-regexp-object.cpp b/jerry-core/ecma/operations/ecma-regexp-object.cpp
@@ -24,7 +24,8 @@
 #include "ecma-try-catch-macro.h"
 #include "jrt-libc-includes.h"
 #include "re-compiler.h"
-#include "stdio.h"
+
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -39,6 +40,11 @@
 #define RE_GLOBAL_START_IDX 0
 #define RE_GLOBAL_END_IDX   1
 
+/* flags */
+#define RE_FLAG_GLOBAL              (1 << 0)
+#define RE_FLAG_IGNORE_CASE         (1 << 1)
+#define RE_FLAG_MULTILINE           (1 << 2)
+
 /**
  * Parse RegExp flags (global, ignoreCase, multiline)
  */
@@ -1171,3 +1177,5 @@ ecma_regexp_exec_helper (re_bytecode_t *bc_p, /**< start of the RegExp bytecode
  * @}
  * @}
  */
+
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
diff --git a/jerry-core/ecma/operations/ecma-regexp-object.h b/jerry-core/ecma/operations/ecma-regexp-object.h
@@ -17,6 +17,8 @@
 #ifndef ECMA_REGEXP_OBJECT_H
 #define ECMA_REGEXP_OBJECT_H
 
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
+
 #include "ecma-globals.h"
 #include "re-compiler.h"
 
@@ -55,4 +57,5 @@ ecma_regexp_exec_helper (re_bytecode_t *bc_p, const ecma_char_t *str_p);
  * @}
  */
 
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
 #endif /* !ECMA_REGEXP_OBJECT_H */
diff --git a/jerry-core/parser/js/lexer.cpp b/jerry-core/parser/js/lexer.cpp
@@ -1,4 +1,5 @@
 /* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+ * Copyright 2015 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jerry-core/parser/js/parser.cpp b/jerry-core/parser/js/parser.cpp
@@ -1,4 +1,5 @@
 /* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+ * Copyright 2015 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jerry-core/parser/regexp/re-compiler.cpp b/jerry-core/parser/regexp/re-compiler.cpp
@@ -20,7 +20,8 @@
 #include "jrt-libc-includes.h"
 #include "mem-heap.h"
 #include "re-compiler.h"
-#include "stdio.h"
+
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
 
 #define REGEXP_BYTECODE_BLOCK_SIZE 256UL
 #define BYTECODE_LEN(bc_ctx_p) ((uint32_t) (bc_ctx_p->current_p - bc_ctx_p->block_start_p))
@@ -791,4 +792,6 @@ regexp_dump_bytecode (re_bytecode_ctx_t *bc_ctx_p)
   }
   JERRY_DLOG ("EOF\n");
 } /* regexp_dump_bytecode */
-#endif
+#endif /* JERRY_ENABLE_LOG */
+
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
diff --git a/jerry-core/parser/regexp/re-compiler.h b/jerry-core/parser/regexp/re-compiler.h
@@ -17,6 +17,8 @@
 #ifndef RE_COMPILER_H
 #define RE_COMPILER_H
 
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
+
 #include "ecma-globals.h"
 #include "re-parser.h"
 
@@ -54,11 +56,6 @@
 #define RE_OP_CHAR_CLASS                                    26
 #define RE_OP_INV_CHAR_CLASS                                27
 
-/* flags */
-#define RE_FLAG_GLOBAL              (1 << 0)
-#define RE_FLAG_IGNORE_CASE         (1 << 1)
-#define RE_FLAG_MULTILINE           (1 << 2)
-
 #define RE_COMPILE_RECURSION_LIMIT  100
 
 #define IS_CAPTURE_GROUP(x) (((x) < RE_OP_NON_CAPTURE_GROUP_START) ? 1 : 0)
@@ -94,4 +91,5 @@ get_opcode (re_bytecode_t **bc_p);
 uint32_t
 get_value (re_bytecode_t **bc_p);
 
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
 #endif /* RE_COMPILER_H */
diff --git a/jerry-core/parser/regexp/re-parser.cpp b/jerry-core/parser/regexp/re-parser.cpp
@@ -22,6 +22,8 @@
 #include "re-parser.h"
 #include "syntax-errors.h"
 
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
+
 #define RE_LOOKUP(str_p, lookup)  *(str_p + lookup)
 #define RE_ADVANCE(str_p, advance) do { str_p += advance; } while (0)
 
@@ -812,3 +814,5 @@ re_parse_next_token (re_parser_ctx_t *parser_ctx_p, /**< parser context */
 
   return ret_value;
 } /* re_parse_next_token */
+
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
diff --git a/jerry-core/parser/regexp/re-parser.h b/jerry-core/parser/regexp/re-parser.h
@@ -17,6 +17,8 @@
 #ifndef RE_PARSER_H
 #define RE_PARSER_H
 
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
+
 #include "opcodes-dumper.h"
 
 typedef uint8_t token_type_t;
@@ -89,4 +91,5 @@ re_parse_char_class (re_parser_ctx_t *parser_ctx_p,
 ecma_completion_value_t
 re_parse_next_token (re_parser_ctx_t *parser_ctx_p, re_token_t *out_token_p);
 
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
 #endif /* RE_PARSER_H */
diff --git a/jerry-core/vm/opcodes.cpp b/jerry-core/vm/opcodes.cpp
@@ -1,4 +1,5 @@
 /* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+ * Copyright 2015 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -166,6 +167,7 @@ opfunc_assignment (opcode_t opdata, /**< operation data */
   }
   else if (type_value_right == OPCODE_ARG_TYPE_REGEXP)
   {
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
     const literal_index_t lit_id = serializer_get_literal_id_by_uid (src_val_descr, int_data->pos);
     ecma_string_t *string_p = ecma_new_ecma_string_from_lit_index (lit_id);
 
@@ -216,6 +218,9 @@ opfunc_assignment (opcode_t opdata, /**< operation data */
 
     MEM_FINALIZE_LOCAL_ARRAY (re_str_p)
     ecma_deref_ecma_string (string_p);
+#else
+    JERRY_UNIMPLEMENTED ("Regular Expressions are not supported in compact profile!");
+#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`/* Copyright 2014-2015 Samsung Electronics Co., Ltd.`
	`2`	`+ * Copyright 2015 University of Szeged.`
`2`	`3`	`*`
`3`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`5`	`* you may not use this file except in compliance with the License.`