mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-22 10:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move m_generatorTarget into ExecutionStateRareData. (#293)

Browse source 
Also do some cleanup in ExecutionState.

Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg 2019-07-01 09:42:46 +02:00 • committed by Patrick Kim
commit ebcd331fd8
2 changed files with 36 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/runtime/ExecutionState.cpp
View file

@ -31,15 +31,6 @@ void ExecutionState::throwException(const Value& e)
context()->throwException(*this, e);
}
ExecutionState* ExecutionState::parent()
{
if (m_parent & 1) {
return (ExecutionState*)(m_parent - 1);
} else {
return rareData()->m_parent;
}
}
ExecutionStateRareData* ExecutionState::ensureRareData()
{
if (m_parent & 1) {

58
src/runtime/ExecutionState.h
View file

@ -33,9 +33,12 @@ typedef Vector<ControlFlowRecord*, GCUtil::gc_malloc_ignore_off_page_allocator<C
struct ExecutionStateRareData : public gc {
Vector<ControlFlowRecord*, GCUtil::gc_malloc_ignore_off_page_allocator<ControlFlowRecord*>>* m_controlFlowRecord;
ExecutionState* m_parent;
Object* m_generatorTarget;
ExecutionStateRareData()
{
m_controlFlowRecord = nullptr;
m_generatorTarget = nullptr;
m_parent = nullptr;
}
};
@ -50,7 +53,6 @@ public:
ExecutionState(Context* context)
: m_context(context)
, m_lexicalEnvironment(nullptr)
, m_generatorTarget(nullptr)
, m_registerFile(nullptr)
, m_parent(1)
, m_inStrictMode(false)
@ -64,7 +66,6 @@ public:
ExecutionState(ExecutionState* parent, LexicalEnvironment* lexicalEnvironment, bool inStrictMode, Value* registerFile = nullptr)
: m_context(parent->context())
, m_lexicalEnvironment(lexicalEnvironment)
, m_generatorTarget(nullptr)
, m_stackBase(parent->stackBase())
, m_registerFile(registerFile)
, m_parent((size_t)parent + 1)
@ -77,7 +78,6 @@ public:
ExecutionState(Context* context, ExecutionState* parent, LexicalEnvironment* lexicalEnvironment, bool inStrictMode, Value* registerFile = nullptr)
: m_context(context)
, m_lexicalEnvironment(lexicalEnvironment)
, m_generatorTarget(nullptr)
, m_stackBase(parent->stackBase())
, m_registerFile(registerFile)
, m_parent((size_t)parent + 1)
@ -92,6 +92,20 @@ public:
return m_context;
}
LexicalEnvironment* lexicalEnvironment()
{
return m_lexicalEnvironment;
}
void setLexicalEnvironment(LexicalEnvironment* lexicalEnvironment, bool inStrictMode)
{
ASSERT(m_lexicalEnvironment == nullptr && m_inStrictMode == false);
ASSERT(lexicalEnvironment != nullptr);
m_lexicalEnvironment = lexicalEnvironment;
m_inStrictMode = inStrictMode;
}
size_t stackBase()
{
return m_stackBase;
@ -104,28 +118,42 @@ public:
void throwException(const Value& e);
ExecutionState* parent();
ExecutionStateRareData* ensureRareData();
bool hasRareData()
{
return (m_parent & 1) == 0;
}
ExecutionStateRareData* rareData()
{
ASSERT(hasRareData() == true);
return m_rareData;
}
LexicalEnvironment* lexicalEnvironment()
ExecutionState* parent()
{
return m_lexicalEnvironment;
if (hasRareData() == false) {
return (ExecutionState*)(m_parent - 1);
}
return rareData()->m_parent;
}
Object* generatorTarget()
{
return m_generatorTarget;
return rareData()->m_generatorTarget;
}
void setGeneratorTarget(Object* target)
{
ASSERT(target != nullptr);
m_generatorTarget = target;
ensureRareData()->m_generatorTarget = target;
}
void setParent(ExecutionState* parent)
{
ASSERT(m_parent == 1);
m_parent = (size_t)parent + 1;
}
bool inStrictMode()
@ -143,19 +171,6 @@ public:
return m_onGoingSuperCall;
}
void setParent(ExecutionState* parent)
{
ASSERT(m_parent == 1);
m_parent = (size_t)parent + 1;
}
void setLexicalEnvironment(LexicalEnvironment* lexicalEnvironment, bool inStrictMode)
{
ASSERT(m_lexicalEnvironment == nullptr && m_inStrictMode == false);
m_lexicalEnvironment = lexicalEnvironment;
m_inStrictMode = inStrictMode;
}
void setOnGoingClassConstruction(bool startClassConstruction)
{
m_onGoingClassConstruction = startClassConstruction;
@ -175,7 +190,6 @@ public:
private:
Context* m_context;
LexicalEnvironment* m_lexicalEnvironment;
Object* m_generatorTarget;
size_t m_stackBase;
Value* m_registerFile;
union {