YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor literal-storage to not use C++ features

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Roland Takacs rtakacs.u-szeged@partner.samsung.com
This commit is contained in:
Roland Takacs
2015-12-24 17:24:46 +03:00
committed by Peter Gal
parent f932b7d48c
commit 21f561f8ef
36 changed files with 2603 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/lit/lit-literal-storage.cpp
+84 -744
View File
@@ -1,4 +1,5 @@
/* Copyright 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.
@@ -13,336 +14,86 @@
* limitations under the License.
*/
#include "bytecode-data.h"
#include "ecma-helpers.h"
#include "jrt.h"
#include "lit-literal-storage.h"
#include "lit-literal.h"
#include "lit-magic-strings.h"
/**
* Literal storage
* As our libc library doesn't call constructors of static variables, lit_storage is initialized
* in lit_init function by placement new operator.
*/
lit_literal_storage_t lit_storage;
#include "ecma-helpers.h"
#include "rcs-allocator.h"
#include "rcs-iterator.h"
#include "rcs-records.h"
/**
* Get pointer to the previous record inside the literal storage
*
* @return pointer to the previous record of NULL if this is the first record ('prev' field in the header)
*/
rcs_record_t *
lit_charset_record_t::get_prev () const
{
rcs_record_iterator_t it ((rcs_recordset_t *)&lit_storage, (rcs_record_t *)this);
it.skip (RCS_DYN_STORAGE_LENGTH_UNIT);
cpointer_t cpointer;
cpointer.packed_value = it.read<uint16_t> ();
return cpointer_t::decompress (cpointer);
} /* lit_charset_record_t::get_prev */
/**
* Set the pointer to the previous record inside the literal storage (sets 'prev' field in the header)
*/
void
lit_charset_record_t::set_prev (rcs_record_t *prev_rec_p) /**< pointer to the record to set as previous */
{
rcs_record_iterator_t it ((rcs_recordset_t *)&lit_storage, (rcs_record_t *)this);
it.skip (RCS_DYN_STORAGE_LENGTH_UNIT);
it.write<uint16_t> (cpointer_t::compress (prev_rec_p).packed_value);
} /* lit_charset_record_t::set_prev */
/**
* Set the charset of the record
*/
void
lit_charset_record_t::set_charset (const lit_utf8_byte_t *str, /**< buffer containing characters to set */
lit_utf8_size_t size) /**< size of the buffer in bytes */
{
JERRY_ASSERT (header_size () + size == get_size () - get_alignment_bytes_count ());
rcs_record_iterator_t it ((rcs_recordset_t *)&lit_storage, (rcs_record_t *)this);
it.skip (header_size ());
for (lit_utf8_size_t i = 0; i < get_length (); ++i)
{
it.write<lit_utf8_byte_t> (str[i]);
it.skip<lit_utf8_byte_t> ();
}
} /* lit_charset_record_t::set_charset */
/**
* Get the characters which are stored to the record
*
* @return number of code units written to the buffer
*/
lit_utf8_size_t
lit_charset_record_t::get_charset (lit_utf8_byte_t *buff, /**< output buffer */
size_t size) /**< size of the output buffer in bytes */
{
JERRY_ASSERT (buff && size >= sizeof (lit_utf8_byte_t));
rcs_record_iterator_t it ((rcs_recordset_t *)&lit_storage, (rcs_record_t *)this);
it.skip (header_size ());
lit_utf8_size_t len = get_length ();
lit_utf8_size_t i;
for (i = 0; i < len && size > 0; ++i)
{
buff[i] = it.read<lit_utf8_byte_t> ();
it.skip<lit_utf8_byte_t> ();
size -= sizeof (lit_utf8_byte_t);
}
return i;
} /* lit_charset_record_t::get_charset */
/**
* Compares characters from the record to the string
*
* @return 0 if strings are equal
* -1 if str_to_compare_with is greater
* 1 if str_to_compare_with is less
*/
int
lit_charset_record_t::compare_utf8 (const lit_utf8_byte_t *str_to_compare_with, /**< buffer with string to compare */
lit_utf8_size_t str_size) /**< size of the string */
{
TODO ("Support utf-8 in comparison.");
size_t i;
if (get_length () == 0)
{
if (str_to_compare_with != NULL)
{
return -1;
}
else
{
return 0;
}
}
if (str_to_compare_with == NULL)
{
return 1;
}
rcs_record_iterator_t it_this (&lit_storage, this);
it_this.skip (header_size ());
for (i = 0; i < get_length () && i < str_size; i++)
{
lit_utf8_byte_t chr = it_this.read<lit_utf8_byte_t> ();
if (chr > str_to_compare_with[i])
{
return 1;
}
else if (chr < str_to_compare_with[i])
{
return -1;
}
it_this.skip<lit_utf8_byte_t> ();
}
if (i < str_size)
{
return -1;
}
return 0;
} /* lit_charset_record_t::compare_zt */
/**
* Compares two lit_charset_record_t records for equality
*
* @return true if strings inside records are equal
* false otherwise
*/
bool
lit_charset_record_t::is_equal (lit_charset_record_t *rec) /**< charset record to compare with */
{
if (get_length () != rec->get_length ())
{
return false;
}
rcs_record_iterator_t it_this (&lit_storage, this);
rcs_record_iterator_t it_record (&lit_storage, rec);
it_this.skip (header_size ());
it_record.skip (rec->header_size ());
for (lit_utf8_size_t i = 0; i < get_length (); i++)
{
if (it_this.read<lit_utf8_byte_t> () != it_record.read<lit_utf8_byte_t> ())
{
return false;
}
it_this.skip<lit_utf8_byte_t> ();
it_record.skip<lit_utf8_byte_t> ();
}
return true;
} /* lit_charset_record_t::is_equal */
/**
* Compare this lit_charset_record_t record with string (which could contain '\0' characters) for equality
*
* @return true if compared instances are equal
* false otherwise
*/
bool
lit_charset_record_t::is_equal_utf8_string (const lit_utf8_byte_t *str, /**< string to compare with */
lit_utf8_size_t str_size) /**< length of the string */
{
rcs_record_iterator_t it_this (&lit_storage, this);
it_this.skip (header_size ());
for (lit_utf8_size_t i = 0; i < get_length () && i < str_size; i++)
{
if (it_this.read<lit_utf8_byte_t> () != str[i])
{
return false;
}
it_this.skip<lit_utf8_byte_t> ();
}
return get_length () == str_size;
} /* lit_charset_record_t::equal_non_zt */
/**
* Dump charset record to specified snapshot buffer
*
* @return number of bytes dumped,
* or 0 - upon dump failure
*/
uint32_t
lit_charset_record_t::dump_for_snapshot (uint8_t *buffer_p, /**< buffer to dump to */
size_t buffer_size, /**< buffer size */
size_t *in_out_buffer_offset_p) /**< in-out: buffer write offset */
{
lit_utf8_size_t length = get_length ();
if (!jrt_write_to_buffer_by_offset (buffer_p, buffer_size, in_out_buffer_offset_p, length))
{
return 0;
}
rcs_record_iterator_t it_this (&lit_storage, this);
it_this.skip (header_size ());
for (lit_utf8_size_t i = 0; i < length; i++)
{
lit_utf8_byte_t next_byte = it_this.read<lit_utf8_byte_t> ();
it_this.skip<lit_utf8_byte_t> ();
if (!jrt_write_to_buffer_by_offset (buffer_p, buffer_size, in_out_buffer_offset_p, next_byte))
{
return 0;
}
}
return ((uint32_t) sizeof (length) + length * (uint32_t) sizeof (lit_utf8_byte_t));
} /* lit_charset_record_t::dump_for_snapshot */
/**
* Dump number record to specified snapshot buffer
*
* @return number of bytes dumped,
* or 0 - upon dump failure
*/
uint32_t
lit_number_record_t::dump_for_snapshot (uint8_t *buffer_p, /**< buffer to dump to */
size_t buffer_size, /**< buffer size */
size_t *in_out_buffer_offset_p) const /**< in-out: buffer write offset */
{
/* dumping as double (not ecma_number_t), because ecma_number_t can be float or double,
* depending on engine compile-time configuration */
double num = get_number ();
if (!jrt_write_to_buffer_by_offset (buffer_p, buffer_size, in_out_buffer_offset_p, num))
{
return 0;
}
return ((uint32_t) sizeof (num));
} /* lit_number_record_t::dump_for_snapshot */
rcs_record_set_t rcs_lit_storage;
/**
* Create charset record in the literal storage
*
* @return pointer to the created record
* @return pointer to the created record
*/
lit_charset_record_t *
lit_literal_storage_t::create_charset_record (const lit_utf8_byte_t *str, /**< string to be placed in the record */
lit_utf8_size_t buf_size) /**< size in bytes of the buffer which holds the
* string */
rcs_record_t *
lit_create_charset_literal (rcs_record_set_t *rec_set_p, /**< recordset */
const lit_utf8_byte_t *str_p, /**< string to be placed into the record */
const lit_utf8_size_t buf_size) /**< size in bytes of the buffer which holds the string */
{
const size_t alignment = lit_charset_record_t::size (buf_size) - (lit_charset_record_t::header_size () + buf_size);
const size_t record_size = RCS_CHARSET_HEADER_SIZE + buf_size;
const size_t aligned_record_size = JERRY_ALIGNUP (record_size, RCS_DYN_STORAGE_LENGTH_UNIT);
const size_t alignment = aligned_record_size - record_size;
lit_charset_record_t *ret = alloc_record<lit_charset_record_t, size_t> (LIT_STR, buf_size);
rcs_record_t *rec_p = rcs_alloc_record (rec_set_p, RCS_RECORD_TYPE_CHARSET, aligned_record_size);
ret->set_alignment_bytes_count (alignment);
ret->set_charset (str, buf_size);
ret->set_hash (lit_utf8_string_calc_hash (str, ret->get_length ()));
rcs_record_set_alignment_bytes_count (rec_p, (uint8_t) alignment);
rcs_record_set_charset (rec_set_p, rec_p, str_p, buf_size);
rcs_record_set_hash (rec_p, lit_utf8_string_calc_hash (str_p, rcs_record_get_length (rec_p)));
return ret;
} /* lit_literal_storage_t::create_charset_record */
return rec_p;
} /* lit_create_charset_literal */
/**
* Create magic string record in the literal storage
* Create magic string record in the literal storage.
*
* @return pointer to the created record
*/
lit_magic_record_t *
lit_literal_storage_t::create_magic_record (lit_magic_string_id_t id) /**< id of a magic string */
rcs_record_t *
lit_create_magic_literal (rcs_record_set_t *rec_set_p, /**< recordset */
lit_magic_string_id_t id) /**< id of magic string */
{
lit_magic_record_t *ret = alloc_record<lit_magic_record_t> (LIT_MAGIC_STR);
ret->set_magic_str_id (id);
rcs_record_t *rec_p = rcs_alloc_record (rec_set_p, RCS_RECORD_TYPE_MAGIC_STR, RCS_MAGIC_STR_HEADER_SIZE);
rcs_record_set_magic_str_id (rec_p, id);
return ret;
} /* lit_literal_storage_t::create_magic_record */
return rec_p;
} /* lit_create_magic_literal */
/**
* Create external magic string record in the literal storage
* Create external magic string record in the literal storage.
*
* @return pointer to the created record
*/
lit_magic_record_t *
lit_literal_storage_t::create_magic_record_ex (lit_magic_string_ex_id_t id) /**< id of a magic string */
rcs_record_t *
lit_create_magic_literal_ex (rcs_record_set_t *rec_set_p, /**< recordset */
lit_magic_string_ex_id_t id) /**< id of magic string */
{
lit_magic_record_t *ret = alloc_record<lit_magic_record_t> (LIT_MAGIC_STR_EX);
ret->set_magic_str_id (id);
rcs_record_t *rec_p = rcs_alloc_record (rec_set_p, RCS_RECORD_TYPE_MAGIC_STR_EX, RCS_MAGIC_STR_HEADER_SIZE);
rcs_record_set_magic_str_ex_id (rec_p, id);
return ret;
} /* lit_literal_storage_t::create_magic_record_ex */
return rec_p;
} /* lit_create_magic_record_ex */
/**
* Create number record in the literal storage
* Create number record in the literal storage.
*
* @return pointer to the created record
*/
lit_number_record_t *
lit_literal_storage_t::create_number_record (ecma_number_t num) /**< number */
rcs_record_t *
lit_create_number_literal (rcs_record_set_t *rec_set_p, /** recordset */
ecma_number_t num) /**< numeric value */
{
lit_number_record_t *ret = alloc_record<lit_number_record_t> (LIT_NUMBER);
rcs_record_iterator_t it_this (this, ret);
const size_t record_size = RCS_NUMBER_HEADER_SIZE + sizeof (ecma_number_t);
rcs_record_t *rec_p = rcs_alloc_record (rec_set_p, RCS_RECORD_TYPE_NUMBER, record_size);
it_this.skip (ret->header_size ());
it_this.write<ecma_number_t> (num);
rcs_iterator_t it_ctx = rcs_iterator_create (rec_set_p, rec_p);
rcs_iterator_skip (&it_ctx, RCS_NUMBER_HEADER_SIZE);
rcs_iterator_write (&it_ctx, &num, sizeof (ecma_number_t));
return ret;
} /* lit_literal_storage_t::create_number_record */
return rec_p;
} /* lit_create_number_literal */
/**
* Count literal records in the storage
@@ -350,77 +101,87 @@ lit_literal_storage_t::create_number_record (ecma_number_t num) /**< number */
* @return number of literals
*/
uint32_t
lit_literal_storage_t::count_literals (void)
lit_count_literals (rcs_record_set_t *rec_set_p) /**< recordset */
{
uint32_t num = 0;
rcs_record_t *rec_p;
for (literal_t lit = lit_storage.get_first (); lit != NULL; lit = lit_storage.get_next (lit))
for (rec_p = rcs_record_get_first (rec_set_p);
rec_p != NULL;
rec_p = rcs_record_get_next (rec_set_p, rec_p))
{
rcs_record_t::type_t type = lit->get_type ();
if (type >= _first_type_id)
if (rcs_record_get_type (rec_p) >= RCS_RECORD_TYPE_FIRST)
{
num++;
}
}
return num;
} /* lit_literal_storage_t::count_literals */
} /* lit_count_literals */
/**
* Dump the contents of the literal storage
* Dump the contents of the literal storage.
*/
void
lit_literal_storage_t::dump ()
lit_dump_literals (rcs_record_set_t *rec_set_p) /**< recordset */
{
rcs_record_t *rec_p;
printf ("LITERALS:\n");
for (rcs_record_t *rec_p = lit_storage.get_first (); rec_p != NULL; rec_p = lit_storage.get_next (rec_p))
for (rec_p = rcs_record_get_first (rec_set_p);
rec_p != NULL;
rec_p = rcs_record_get_next (rec_set_p, rec_p))
{
printf ("%p ", rec_p);
printf ("[%3zu] ", get_record_size (rec_p));
printf ("[%3zu] ", rcs_record_get_size (rec_p));
switch (rec_p->get_type ())
switch (rcs_record_get_type (rec_p))
{
case LIT_STR:
case RCS_RECORD_TYPE_CHARSET:
{
lit_charset_record_t *lit_p = static_cast<lit_charset_record_t *> (rec_p);
rcs_record_iterator_t it_this (this, rec_p);
rcs_iterator_t it_ctx = rcs_iterator_create (rec_set_p, rec_p);
rcs_iterator_skip (&it_ctx, RCS_CHARSET_HEADER_SIZE);
it_this.skip (lit_charset_record_t::header_size ());
size_t str_len = rcs_record_get_length (rec_p);
size_t i;
for (size_t i = 0; i < lit_p->get_length (); ++i)
for (i = 0; i < str_len; ++i)
{
FIXME ("Support proper printing of characters which occupy more than one byte.")
printf ("%c", it_this.read<lit_utf8_byte_t> ());
it_this.skip<lit_utf8_byte_t> ();
lit_utf8_byte_t chr;
rcs_iterator_read (&it_ctx, &chr, sizeof (lit_utf8_byte_t));
rcs_iterator_skip (&it_ctx, sizeof (lit_utf8_byte_t));
printf ("%c", chr);
}
printf (" : STRING");
break;
}
case LIT_MAGIC_STR:
case RCS_RECORD_TYPE_MAGIC_STR:
{
lit_magic_string_id_t id = lit_magic_record_get_magic_str_id (rec_p);
lit_magic_string_id_t id = rcs_record_get_magic_str_id (rec_p);
printf ("%s : MAGIC STRING", lit_get_magic_string_utf8 (id));
printf (" [id=%d] ", id);
break;
}
case LIT_MAGIC_STR_EX:
case RCS_RECORD_TYPE_MAGIC_STR_EX:
{
lit_magic_string_ex_id_t id = lit_magic_record_ex_get_magic_str_id (rec_p);
lit_magic_string_ex_id_t id = rcs_record_get_magic_str_ex_id (rec_p);
printf ("%s : EXT MAGIC STRING", lit_get_magic_string_ex_utf8 (id));
printf (" [id=%d] ", id);
break;
}
case LIT_NUMBER:
case RCS_RECORD_TYPE_NUMBER:
{
lit_number_record_t *lit_p = static_cast<lit_number_record_t *> (rec_p);
ecma_number_t value = rcs_record_get_number (rec_set_p, rec_p);
if (ecma_number_is_nan (lit_p->get_number ()))
if (ecma_number_is_nan (value))
{
printf ("%s : NUMBER", "NaN");
}
@@ -429,7 +190,7 @@ lit_literal_storage_t::dump ()
lit_utf8_byte_t buff[ECMA_MAX_CHARS_IN_STRINGIFIED_NUMBER + 1u];
memset (buff, 0, sizeof (buff));
lit_utf8_size_t sz = ecma_number_to_utf8_string (lit_p->get_number (), buff, sizeof (buff));
lit_utf8_size_t sz = ecma_number_to_utf8_string (value, buff, sizeof (buff));
JERRY_ASSERT (sz <= ECMA_MAX_CHARS_IN_STRINGIFIED_NUMBER);
printf ("%s : NUMBER", buff);
@@ -445,425 +206,4 @@ lit_literal_storage_t::dump ()
printf ("\n");
}
} /* lit_literal_storage_t::dump */
/**
* Get previous record in the literal storage
*
* @return pointer to the previous record relative to rec_p, or NULL if rec_p is the first record in the storage
*/
rcs_record_t *
lit_literal_storage_t::get_prev (rcs_record_t *rec_p) /**< record, relative to which previous should be found */
{
switch (rec_p->get_type ())
{
case LIT_STR:
{
return (static_cast<lit_charset_record_t *> (rec_p))->get_prev ();
}
case LIT_MAGIC_STR:
case LIT_MAGIC_STR_EX:
{
return (static_cast<lit_magic_record_t *> (rec_p))->get_prev ();
}
case LIT_NUMBER:
{
return (static_cast<lit_number_record_t *> (rec_p))->get_prev ();
}
default:
{
JERRY_ASSERT (rec_p->get_type () < _first_type_id);
return rcs_recordset_t::get_prev (rec_p);
}
}
} /* lit_literal_storage_t::get_prev */
/**
* Set pointer to the previous record
*/
void
lit_literal_storage_t::set_prev (rcs_record_t *rec_p, /**< record to modify */
rcs_record_t *prev_rec_p) /**< record which should be set as previous */
{
switch (rec_p->get_type ())
{
case LIT_STR:
{
return (static_cast<lit_charset_record_t *> (rec_p))->set_prev (prev_rec_p);
}
case LIT_MAGIC_STR:
case LIT_MAGIC_STR_EX:
{
return (static_cast<lit_magic_record_t *> (rec_p))->set_prev (prev_rec_p);
}
case LIT_NUMBER:
{
return (static_cast<lit_number_record_t *> (rec_p))->set_prev (prev_rec_p);
}
default:
{
JERRY_ASSERT (rec_p->get_type () < _first_type_id);
return rcs_recordset_t::set_prev (rec_p, prev_rec_p);
}
}
} /* lit_literal_storage_t::set_prev */
/**
* Get size of a record
*
* @return size of a record in bytes
*/
size_t
lit_literal_storage_t::get_record_size (rcs_record_t* rec_p) /**< pointer to a record */
{
switch (rec_p->get_type ())
{
case LIT_STR:
{
return (static_cast<lit_charset_record_t *> (rec_p))->get_size ();
}
case LIT_MAGIC_STR:
case LIT_MAGIC_STR_EX:
{
return lit_magic_record_t::size ();
}
case LIT_NUMBER:
{
return lit_number_record_t::size ();
}
default:
{
JERRY_ASSERT (rec_p->get_type () < _first_type_id);
return rcs_recordset_t::get_record_size (rec_p);
}
}
} /* lit_literal_storage_t::get_record_size */
#ifdef JERRY_ENABLE_SNAPSHOT
/**
* Dump literals to specified snapshot buffer
*
* @return true, if dump was performed successfully (i.e. buffer size is sufficient),
* false - otherwise.
*/
bool
lit_dump_literals_for_snapshot (uint8_t *buffer_p, /**< output snapshot buffer */
size_t buffer_size, /**< size of the buffer */
size_t *in_out_buffer_offset_p, /**< in-out: write position in the buffer */
lit_mem_to_snapshot_id_map_entry_t **out_map_p, /**< out: map from literal identifiers
* to the literal offsets
* in snapshot */
uint32_t *out_map_num_p, /**< out: number of literals */
uint32_t *out_lit_table_size_p) /**< out: number of bytes, dumped to snapshot buffer */
{
uint32_t literals_num = lit_storage.count_literals ();
uint32_t lit_table_size = 0;
*out_map_p = NULL;
*out_map_num_p = 0;
*out_lit_table_size_p = 0;
if (!jrt_write_to_buffer_by_offset (buffer_p, buffer_size, in_out_buffer_offset_p, literals_num))
{
return false;
}
lit_table_size += (uint32_t) sizeof (literals_num);
if (literals_num != 0)
{
bool is_ok = true;
size_t id_map_size = sizeof (lit_mem_to_snapshot_id_map_entry_t) * literals_num;
lit_mem_to_snapshot_id_map_entry_t *id_map_p;
id_map_p = (lit_mem_to_snapshot_id_map_entry_t *) mem_heap_alloc_block (id_map_size, MEM_HEAP_ALLOC_SHORT_TERM);
uint32_t literal_index = 0;
for (literal_t lit = lit_storage.get_first ();
lit != NULL;
lit = lit_storage.get_next (lit))
{
rcs_record_t::type_t type = lit->get_type ();
if (!(type >= lit_literal_storage_t::LIT_TYPE_FIRST
&& type <= lit_literal_storage_t::LIT_TYPE_LAST))
{
continue;
}
if (!jrt_write_to_buffer_by_offset (buffer_p, buffer_size, in_out_buffer_offset_p, type))
{
is_ok = false;
break;
}
uint32_t sz;
if (type == LIT_STR_T)
{
lit_charset_record_t *rec_p = static_cast<lit_charset_record_t *> (lit);
sz = rec_p->dump_for_snapshot (buffer_p, buffer_size, in_out_buffer_offset_p);
}
else if (type == LIT_MAGIC_STR_T
|| type == LIT_MAGIC_STR_EX_T)
{
lit_magic_record_t *rec_p = static_cast<lit_magic_record_t *> (lit);
if (type == LIT_MAGIC_STR_T)
{
sz = rec_p->dump_for_snapshot<lit_magic_string_id_t> (buffer_p, buffer_size, in_out_buffer_offset_p);
}
else
{
JERRY_ASSERT (type == LIT_MAGIC_STR_EX_T);
sz = rec_p->dump_for_snapshot<lit_magic_string_ex_id_t> (buffer_p, buffer_size, in_out_buffer_offset_p);
}
}
else
{
JERRY_ASSERT (type == LIT_NUMBER_T);
lit_number_record_t *rec_p = static_cast<lit_number_record_t *> (lit);
sz = rec_p->dump_for_snapshot (buffer_p, buffer_size, in_out_buffer_offset_p);
}
if (sz == 0)
{
/* write failed */
is_ok = false;
break;
}
else
{
lit_cpointer_t lit_cp = lit_cpointer_t::compress (lit);
id_map_p[literal_index].literal_id = lit_cp;
id_map_p[literal_index].literal_offset = lit_table_size;
lit_table_size += (uint32_t) sizeof (type);
lit_table_size += sz;
}
literal_index++;
}
if (!is_ok)
{
mem_heap_free_block (id_map_p);
return false;
}
else
{
JERRY_ASSERT (literal_index == literals_num);
*out_map_p = id_map_p;
}
}
if (!bc_align_data_in_output_buffer (&lit_table_size,
buffer_p,
buffer_size,
in_out_buffer_offset_p))
{
return false;
}
*out_map_num_p = literals_num;
*out_lit_table_size_p = lit_table_size;
return true;
} /* lit_dump_literals_for_snapshot */
/**
* Load literals from snapshot
*
* @return true, if load was performed successfully (i.e. literals dump in the snapshot is consistent),
* false - otherwise (i.e. snapshot is incorrect).
*/
bool
lit_load_literals_from_snapshot (const uint8_t *lit_table_p, /**< buffer with literal table in snapshot */
uint32_t lit_table_size, /**< size of literal table in snapshot */
lit_mem_to_snapshot_id_map_entry_t **out_map_p, /**< out: map from literal offsets
* in snapshot to identifiers
* of loaded literals in literal
* storage */
uint32_t *out_map_num_p, /**< out: literals number */
bool is_copy) /** flag, indicating whether the passed in-snapshot data
* should be copied to engine's memory (true),
* or it can be referenced until engine is stopped
* (i.e. until call to jerry_cleanup) */
{
/* currently, always performing literals copy */
(void) is_copy;
*out_map_p = NULL;
*out_map_num_p = 0;
size_t lit_table_read = 0;
uint32_t literals_num;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&literals_num))
{
return false;
}
if (literals_num == 0)
{
return true;
}
size_t id_map_size = sizeof (lit_mem_to_snapshot_id_map_entry_t) * literals_num;
lit_mem_to_snapshot_id_map_entry_t *id_map_p;
id_map_p = (lit_mem_to_snapshot_id_map_entry_t *) mem_heap_alloc_block (id_map_size, MEM_HEAP_ALLOC_SHORT_TERM);
bool is_ok = true;
for (uint32_t lit_index = 0; lit_index < literals_num; lit_index++)
{
uint32_t offset = (uint32_t) lit_table_read;
JERRY_ASSERT (offset == lit_table_read);
rcs_record_t::type_t type;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&type))
{
is_ok = false;
break;
}
literal_t lit;
if (type == LIT_STR_T)
{
lit_utf8_size_t length;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&length)
|| (lit_table_read + length > lit_table_size))
{
is_ok = false;
break;
}
lit = lit_find_or_create_literal_from_utf8_string (lit_table_p + lit_table_read, length);
lit_table_read += length;
}
else if (type == LIT_MAGIC_STR_T)
{
lit_magic_string_id_t id;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&id))
{
is_ok = false;
break;
}
const lit_utf8_byte_t *magic_str_p = lit_get_magic_string_utf8 (id);
lit_utf8_size_t magic_str_sz = lit_get_magic_string_size (id);
/*
* TODO:
* Consider searching literal storage by magic string identifier instead of by its value
*/
lit = lit_find_or_create_literal_from_utf8_string (magic_str_p, magic_str_sz);
}
else if (type == LIT_MAGIC_STR_EX_T)
{
lit_magic_string_ex_id_t id;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&id))
{
is_ok = false;
break;
}
const lit_utf8_byte_t *magic_str_ex_p = lit_get_magic_string_ex_utf8 (id);
lit_utf8_size_t magic_str_ex_sz = lit_get_magic_string_ex_size (id);
/*
* TODO:
* Consider searching literal storage by magic string identifier instead of by its value
*/
lit = lit_find_or_create_literal_from_utf8_string (magic_str_ex_p, magic_str_ex_sz);
}
else if (type == LIT_NUMBER_T)
{
double num;
if (!jrt_read_from_buffer_by_offset (lit_table_p,
lit_table_size,
&lit_table_read,
&num))
{
is_ok = false;
break;
}
lit = lit_find_or_create_literal_from_num ((ecma_number_t) num);
}
else
{
is_ok = false;
break;
}
id_map_p[lit_index].literal_offset = offset;
id_map_p[lit_index].literal_id = lit_cpointer_t::compress (lit);
}
if (is_ok)
{
*out_map_p = id_map_p;
*out_map_num_p = literals_num;
return true;
}
else
{
mem_heap_free_block (id_map_p);
return false;
}
} /* lit_load_literals_from_snapshot */
#endif /* JERRY_ENABLE_SNAPSHOT */
template void rcs_record_iterator_t::skip<uint8_t> ();
template void rcs_record_iterator_t::skip<uint16_t> ();
template void rcs_record_iterator_t::skip<uint32_t> ();
template void rcs_record_iterator_t::write<uint8_t> (uint8_t);
template uint8_t rcs_record_iterator_t::read<uint8_t> ();
template void rcs_record_iterator_t::write<ecma_number_t> (ecma_number_t);
template ecma_number_t rcs_record_iterator_t::read<ecma_number_t> ();
template void rcs_record_iterator_t::write<uint16_t> (uint16_t);
template uint16_t rcs_record_iterator_t::read<uint16_t> ();
template lit_magic_string_id_t lit_magic_record_t::get_magic_str_id<lit_magic_string_id_t>() const;
template lit_magic_string_ex_id_t lit_magic_record_t::get_magic_str_id<lit_magic_string_ex_id_t>() const;
template void lit_magic_record_t::set_magic_str_id<lit_magic_string_id_t>(lit_magic_string_id_t);
template void lit_magic_record_t::set_magic_str_id<lit_magic_string_ex_id_t>(lit_magic_string_ex_id_t);
template uint32_t lit_magic_record_t::dump_for_snapshot<lit_magic_string_id_t>(uint8_t *, size_t, size_t *) const;
template uint32_t lit_magic_record_t::dump_for_snapshot<lit_magic_string_ex_id_t>(uint8_t *, size_t, size_t *) const;
template lit_charset_record_t *rcs_recordset_t::alloc_record<lit_charset_record_t> (rcs_record_t::type_t type,
size_t size);
template lit_magic_record_t *rcs_recordset_t::alloc_record<lit_magic_record_t> (rcs_record_t::type_t type);
template lit_number_record_t *rcs_recordset_t::alloc_record<lit_number_record_t> (rcs_record_t::type_t type);
} /* lit_dump_literals */