Skip to content

Literal storage #148

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

Merged
sand1k merged 3 commits into from
Jun 10, 2015
Merged

Literal storage #148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
528a333
Implement recordset iterators
sand1k Jun 10, 2015
340a9ef
Add literal storage, literal_t type and functions for its processing.
sand1k Jun 10, 2015
53801e3
Replace array of literals with literal storage.
sand1k Jun 10, 2015
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
Prev Previous commit
Next Next commit
Add literal storage, literal_t type and functions for its processing. 
JerryScript-DCO-1.0-Signed-off-by: Evgeny Gavrin [email protected]
JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov [email protected]
  • Loading branch information
@sand1k
sand1k committed Jun 10, 2015
commit 340a9ef002e41419c252d359fd7bf56847301a36
3 changes: 3 additions & 0 deletions jerry-core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ project (JerryCore CXX C ASM)
# Include directories
set(INCLUDE_CORE
${CMAKE_SOURCE_DIR}/jerry-core
${CMAKE_SOURCE_DIR}/jerry-core/lit
${CMAKE_SOURCE_DIR}/jerry-core/rcs
${CMAKE_SOURCE_DIR}/jerry-core/mem
${CMAKE_SOURCE_DIR}/jerry-core/vm
Expand All @@ -110,6 +111,7 @@ project (JerryCore CXX C ASM)
# Sources
# Jerry core
file(GLOB SOURCE_CORE_API *.cpp)
file(GLOB SOURCE_CORE_LIT lit/*.cpp)
file(GLOB SOURCE_CORE_RCS rcs/*.cpp)
file(GLOB SOURCE_CORE_MEM mem/*.cpp)
file(GLOB SOURCE_CORE_VM vm/*.cpp)
Expand All @@ -123,6 +125,7 @@ project (JerryCore CXX C ASM)
set(SOURCE_CORE
jerry.cpp
${SOURCE_CORE_API}
${SOURCE_CORE_LIT}
${SOURCE_CORE_RCS}
${SOURCE_CORE_MEM}
${SOURCE_CORE_VM}
Expand Down
10 changes: 10 additions & 0 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 @@ -26,6 +26,7 @@
#include "config.h"
#include "jrt.h"
#include "mem-allocator.h"
#include "rcs-recordset.h"

/** \addtogroup compressedpointer Compressed pointer
* @{
Expand Down Expand Up @@ -757,11 +758,20 @@ typedef enum
} ecma_string_container_t;

FIXME (Move to library that should define the type (literal.h /* ? */))
/**
* Literal and compressed pointer to literal
*/
typedef rcs_record_t *literal_t;
typedef rcs_cpointer_t lit_cpointer_t;
Copy link

@ruben-ayrapetyan ruben-ayrapetyan Jun 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we move this to lit-literal.h?

Copy link
Contributor

@egavrin egavrin Jun 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruben-ayrapetyan I suppose we should, but ecma-globals.h has dependencies on lit_cpointer_t, while lit_* depends on ecma_globals.h

Copy link

@ruben-ayrapetyan ruben-ayrapetyan Jun 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@egavrin, I see. In the case, probably we should update the 'FIXME' comment above.

Copy link
Contributor

@egavrin egavrin Jun 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruben-ayrapetyan we may leave it as is, since we're going to fix anyway. But with a separate pr.


/**
* Index in literal table
*
* FIXME: Remove after switching to literal storage
*/
typedef uint32_t literal_index_t;


/**
* Identifiers of ECMA and implementation-defined magic string constants
*/
Expand Down
12 changes: 12 additions & 0 deletions jerry-core/jrt/jrt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,16 @@ extern void __noreturn jerry_fatal (jerry_fatal_code_t code);
#define JERRY_MIN(v1, v2) ((v1 < v2) ? v1 : v2)
#define JERRY_MAX(v1, v2) ((v1 < v2) ? v2 : v1)

/**
* Placement new operator (constructs an object on a pre-allocated buffer)
*
* Our version of the libc library doesn't support calling the constructors and destructors of the static variables.
* It is proposed to use placement new operator. Generally it is available via #include <new>,
* To fix the unavailability of the header in some configurations placement new operator is implemented here.
*/
inline void* operator new (size_t, void* where)
Copy link
Contributor

@egavrin egavrin Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add comment to the code with proper explanation.

Copy link
Contributor Author

@sand1k sand1k Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

{
return where;
} /* operator new */

#endif /* !JERRY_GLOBALS_H */
Loading