Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use heap allocated buffer instead of char collection in ecma_strings #678

Closed
wants to merge 1 commit into from
Closed

Use heap allocated buffer instead of char collection in ecma_strings #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions jerry-core/ecma/base/ecma-globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,7 @@ typedef struct
typedef enum
{
ECMA_STRING_CONTAINER_LIT_TABLE, /**< actual data is in literal table */
ECMA_STRING_CONTAINER_HEAP_CHUNKS, /**< actual data is on the heap
in a ecma_collection_chunk_t chain */
ECMA_STRING_CONTAINER_STRING_DATA, /**< actual data is on the heap */
ECMA_STRING_CONTAINER_HEAP_NUMBER, /**< actual data is on the heap as a ecma_number_t */
ECMA_STRING_CONTAINER_UINT32_IN_DESC, /**< actual data is UInt32-represeneted Number
stored locally in the string's descriptor */
Expand All @@ -795,6 +794,18 @@ FIXME (Move to library that should define the type (literal.h /* ? */))
typedef rcs_record_t *literal_t;
typedef rcs_cpointer_t lit_cpointer_t;

#define ECMA_STRING_DATA_EXTRA_SIZE (2 * sizeof (uint16_t))

/**
* ECMA string data descriptor
*/
typedef struct ecma_string_data_t
{
uint16_t size;
uint16_t length;
lit_utf8_byte_t data;
} ecma_string_data_t;

/**
* ECMA string-value descriptor
*/
Expand Down Expand Up @@ -822,7 +833,7 @@ typedef struct ecma_string_t
lit_cpointer_t lit_cp;

/** Compressed pointer to an ecma_collection_header_t */
mem_cpointer_t collection_cp : ECMA_POINTER_FIELD_WIDTH;
mem_cpointer_t data_cp : ECMA_POINTER_FIELD_WIDTH;

/** Compressed pointer to an ecma_number_t */
mem_cpointer_t number_cp : ECMA_POINTER_FIELD_WIDTH;
Expand Down
Loading