[WIP] Another try

JerryScript-DCO-1.0-Signed-off-by: László Langó [email protected]

Author: LaszloLango

jerry-core/ecma/base/ecma-helpers-string.c

@@ -1319,9 +1319,7 @@ ecma_string_get_number_in_desc_size (const uint32_t uint32_number) /**< number i
 const lit_utf8_byte_t *
 ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
                        lit_utf8_size_t *size_p, /**< [out] size of the ecma string */
-                       bool *is_ascii_p) /**< [out] true, if the string is an ascii
-                                          *               character sequence (size == length)
-                                          *         false, otherwise */
+                       uint8_t *flags_p) /**< [out] TODO */
 {
   ecma_length_t length;
   lit_utf8_size_t size;
@@ -1351,8 +1349,10 @@ ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
       /* All numbers must be ascii strings. */
       JERRY_ASSERT (ecma_string_get_length (string_p) == size);
 
-      length = size;
-      result_p = NULL;
+      result_p = (const lit_utf8_byte_t *) jmem_heap_alloc_block (size);
+      length = ecma_uint32_to_utf8_string (string_p->u.uint32_number, (lit_utf8_byte_t *) result_p, size);
+      JERRY_ASSERT(length == size);
+      *flags_p |= 2;
       break;
     }
     case ECMA_STRING_CONTAINER_MAGIC_STRING:
@@ -1371,13 +1371,8 @@ ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
       JERRY_ASSERT (ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_MAGIC_STRING_EX);
 
       size = lit_get_magic_string_ex_size (string_p->u.magic_string_ex_id);
-      length = 0;
-
-      if (is_ascii_p != NULL)
-      {
-        length = lit_utf8_string_length (lit_get_magic_string_ex_utf8 (string_p->u.magic_string_ex_id),
-                                         lit_get_magic_string_ex_size (string_p->u.magic_string_ex_id));
-      }
+      length = lit_utf8_string_length (lit_get_magic_string_ex_utf8 (string_p->u.magic_string_ex_id),
+                                       lit_get_magic_string_ex_size (string_p->u.magic_string_ex_id));
 
       result_p = lit_get_magic_string_ex_utf8 (string_p->u.magic_string_ex_id);
       break;
@@ -1386,9 +1381,9 @@ ecma_string_get_chars (const ecma_string_t *string_p, /**< ecma-string */
 
   *size_p = size;
 
-  if (is_ascii_p != NULL)
+  if (length == size)
   {
-    *is_ascii_p = (length == size);
+    *flags_p |= 1;
   }
   return result_p;
 } /* ecma_string_get_chars */
@@ -1979,32 +1974,23 @@ ecma_string_get_char_at_pos (const ecma_string_t *string_p, /**< ecma-string */
   JERRY_ASSERT (index < ecma_string_get_length (string_p));
 
   lit_utf8_size_t buffer_size;
-  bool is_ascii;
-  const lit_utf8_byte_t *chars_p = ecma_string_get_chars (string_p, &buffer_size, &is_ascii);
+  uint8_t flags = 0;
+  const lit_utf8_byte_t *chars_p = ecma_string_get_chars (string_p, &buffer_size, &flags);
 
-  if (chars_p != NULL)
+  ecma_char_t ch;
+  if (flags & 1)
   {
-    if (is_ascii)
-    {
-      return chars_p[index];
-    }
-
-    return lit_utf8_string_code_unit_at (chars_p, buffer_size, index);
+    ch = chars_p[index];
+  }
+  else
+  {
+    ch = lit_utf8_string_code_unit_at (chars_p, buffer_size, index);
   }
 
-  ecma_char_t ch;
-
-  JMEM_DEFINE_LOCAL_ARRAY (utf8_str_p, buffer_size, lit_utf8_byte_t);
-
-  ecma_string_to_utf8_bytes (string_p, utf8_str_p, buffer_size);
-
-  JERRY_ASSERT (ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_UINT32_IN_DESC);
-  /* Uint32 must be an ascii string. */
-  JERRY_ASSERT (is_ascii);
-
-  ch = utf8_str_p[index];
-
-  JMEM_FINALIZE_LOCAL_ARRAY (utf8_str_p);
+  if (flags & 2)
+  {
+    jmem_heap_free_block ((void *) chars_p, buffer_size);
+  }
 
   return ch;
 } /* ecma_string_get_char_at_pos */
@@ -2181,30 +2167,6 @@ ecma_string_trim (const ecma_string_t *string_p) /**< pointer to an ecma string
   return ret_string_p;
 } /* ecma_string_trim */
 
-/**
- * Helper function for ecma_string conversion. It is used in
- * ECMA_STRING_TO_UTF8_STRING macro. Returns true if the output
- * buffer must be freed.
- *
- * @return true  - if the output buffer must be freed.
- *         false - otherwise
- */
-bool ecma_string_to_utf8_string (const ecma_string_t *ecma_str_ptr, /**< ecma string pointer */
-                                 const lit_utf8_byte_t **utf8_ptr, /**< [out] output buffer pointer */
-                                 lit_utf8_size_t *utf8_str_size) /**< [out] output buffer size */
-{
-  *utf8_ptr = ecma_string_get_chars (ecma_str_ptr, utf8_str_size, NULL);
-
-  if (*utf8_ptr == NULL)
-  {
-    *utf8_ptr = (const lit_utf8_byte_t *) jmem_heap_alloc_block (*utf8_str_size);
-    ecma_string_to_utf8_bytes (ecma_str_ptr, (lit_utf8_byte_t *) *utf8_ptr, *utf8_str_size);
-    return true;
-  }
-
-  return false;
-} /* ecma_string_to_utf8_string*/
-
 /**
  * @}
  * @}

jerry-core/ecma/base/ecma-helpers.h

@@ -61,8 +61,19 @@ bool ecma_string_to_utf8_string (const ecma_string_t *ecma_str_ptr,
                                    utf8_ptr, /**< [out] output buffer pointer */ \
                                    utf8_str_size) /**< [out] output buffer size */ \
   lit_utf8_size_t utf8_str_size; \
-  const lit_utf8_byte_t *utf8_ptr = NULL; \
-  bool utf8_ptr ## must_be_freed = ecma_string_to_utf8_string (ecma_str_ptr, &utf8_ptr, &utf8_str_size);
+  uint8_t utf8_ptr ## flags = 0; \
+  const lit_utf8_byte_t *utf8_ptr = ecma_string_get_chars (ecma_str_ptr, &utf8_str_size, &utf8_ptr ## flags);
+
+/**
+ * Free the cesu-8 string buffer allocated by 'ECMA_STRING_TO_UTF8_STRING'
+ */
+#define ECMA_FINALIZE_UTF8_STRING(utf8_ptr, /**< pointer to character buffer */ \
+                                  utf8_str_size) /**< buffer size */ \
+  if (utf8_ptr ## flags & 2) \
+  { \
+    JERRY_ASSERT (utf8_ptr != NULL); \
+    jmem_heap_free_block ((void *) utf8_ptr, utf8_str_size); \
+  }
 
 #ifdef ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY
 
@@ -118,17 +129,6 @@ bool ecma_string_to_utf8_string (const ecma_string_t *ecma_str_ptr,
 
 #endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY */
 
-/**
- * Free the cesu-8 string buffer allocated by 'ECMA_STRING_TO_UTF8_STRING'
- */
-#define ECMA_FINALIZE_UTF8_STRING(utf8_ptr, /**< pointer to character buffer */ \
-                                  utf8_str_size) /**< buffer size */ \
-  if (utf8_ptr ## must_be_freed) \
-  { \
-    JERRY_ASSERT (utf8_ptr != NULL); \
-    jmem_heap_free_block ((void *) utf8_ptr, utf8_str_size); \
-  }
-
 /**
  * Convert boolean to bitfield value.
  */
@@ -229,7 +229,7 @@ ecma_substring_copy_to_utf8_buffer (const ecma_string_t *string_desc_p,
                                     lit_utf8_size_t buffer_size);
 void ecma_string_to_utf8_bytes (const ecma_string_t *string_desc_p, lit_utf8_byte_t *buffer_p,
                                 lit_utf8_size_t buffer_size);
-const lit_utf8_byte_t *ecma_string_get_chars (const ecma_string_t *string_p, lit_utf8_size_t *size_p, bool *is_ascii_p);
+const lit_utf8_byte_t *ecma_string_get_chars (const ecma_string_t *string_p, lit_utf8_size_t *size_p, uint8_t *flags_p);
 void ecma_init_ecma_string_from_uint32 (ecma_string_t *string_desc_p, uint32_t uint32_number);
 void ecma_init_ecma_magic_string (ecma_string_t *string_desc_p, lit_magic_string_id_t id);
 bool ecma_compare_ecma_string_to_magic_id (const ecma_string_t *string_p, lit_magic_string_id_t id);