Skip to content

swb: annotate m_dynamicInterpreterThunk #1756

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
merged 1 commit into from
Oct 18, 2016
Merged

swb: annotate m_dynamicInterpreterThunk #1756

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
16 changes: 8 additions & 8 deletions lib/Common/Memory/RecyclerPointers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class NoWriteBarrierPtr
T** operator&() { return &value; }

// Setters
NoWriteBarrierPtr& operator=(T const& value)
NoWriteBarrierPtr& operator=(T * value)
{
this->value = value;
return *this;
Expand Down Expand Up @@ -98,15 +98,15 @@ class WriteBarrierPtr
T const** AddressOf() const { return &ptr; }
T** AddressOf() { return &ptr; }

T const** operator&() const
{
static_assert(false, "Might need to set barrier for this operation, and use AddressOf instead.");
return &ptr;
T const** operator&() const
{
static_assert(false, "Might need to set barrier for this operation, and use AddressOf instead.");
return &ptr;
}
T** operator&()
T** operator&()
{
static_assert(false, "Might need to set barrier for this operation, and use AddressOf instead.");
return &ptr;
static_assert(false, "Might need to set barrier for this operation, and use AddressOf instead.");
return &ptr;
}

// Setters
Expand Down
6 changes: 3 additions & 3 deletions lib/Runtime/Base/FunctionBody.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4308,7 +4308,7 @@ namespace Js
#if DYNAMIC_INTERPRETER_THUNK
if (m_isAsmJsFunction && m_dynamicInterpreterThunk)
{
m_scriptContext->ReleaseDynamicAsmJsInterpreterThunk((BYTE*)this->m_dynamicInterpreterThunk, true);
m_scriptContext->ReleaseDynamicAsmJsInterpreterThunk(this->m_dynamicInterpreterThunk, true);
this->m_dynamicInterpreterThunk = nullptr;
}
#endif
Expand Down Expand Up @@ -7329,11 +7329,11 @@ namespace Js
{
if (m_isAsmJsFunction)
{
m_scriptContext->ReleaseDynamicAsmJsInterpreterThunk((BYTE*)this->m_dynamicInterpreterThunk, /*addtoFreeList*/!isScriptContextClosing);
m_scriptContext->ReleaseDynamicAsmJsInterpreterThunk(this->m_dynamicInterpreterThunk, /*addtoFreeList*/!isScriptContextClosing);
}
else
{
m_scriptContext->ReleaseDynamicInterpreterThunk((BYTE*)this->m_dynamicInterpreterThunk, /*addtoFreeList*/!isScriptContextClosing);
m_scriptContext->ReleaseDynamicInterpreterThunk(this->m_dynamicInterpreterThunk, /*addtoFreeList*/!isScriptContextClosing);
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions lib/Runtime/Base/FunctionBody.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ namespace Js
Field(bool) m_utf8SourceHasBeenSet; // start of UTF8-encoded source
Field(uint) m_sourceIndex; // index into the scriptContext's list of saved sources
#if DYNAMIC_INTERPRETER_THUNK
void* m_dynamicInterpreterThunk; // Unique 'thunk' for every interpreted function - used for ETW symbol decoding.
PointerNoBarrier(void) m_dynamicInterpreterThunk; // Unique 'thunk' for every interpreted function - used for ETW symbol decoding.
#endif
Field(uint) m_cbStartOffset; // pUtf8Source is this many bytes from the start of the scriptContext's source buffer.

Expand Down Expand Up @@ -2699,16 +2699,16 @@ namespace Js
uint GetForInLoopDepth() const { return this->GetCountField(CounterFields::ForInLoopDepth); }
uint SetForInLoopDepth(uint count) { return this->SetCountField(CounterFields::ForInLoopDepth, count); }

bool AllocProfiledForInLoopCount(ProfileId* profileId)
bool AllocProfiledForInLoopCount(ProfileId* profileId)
{
ProfileId profiledForInLoopCount = this->GetProfiledForInLoopCount();
if (profiledForInLoopCount != Constants::NoProfileId)
{
*profileId = profiledForInLoopCount;
this->IncreaseCountField(CounterFields::ProfiledForInLoopCount);
return true;
}
return false;
ProfileId profiledForInLoopCount = this->GetProfiledForInLoopCount();
if (profiledForInLoopCount != Constants::NoProfileId)
{
*profileId = profiledForInLoopCount;
this->IncreaseCountField(CounterFields::ProfiledForInLoopCount);
return true;
}
return false;
}
ProfileId GetProfiledForInLoopCount() const { return (ProfileId)this->GetCountField(CounterFields::ProfiledForInLoopCount); }
void SetProfiledForInLoopCount(ProfileId count) { this->SetCountField(CounterFields::ProfiledForInLoopCount, count); }
Expand Down Expand Up @@ -3029,7 +3029,7 @@ namespace Js
ForInCache * GetForInCacheArray();
void CleanUpForInCache(bool isShutdown);

void AllocateInlineCache();
void AllocateInlineCache();
InlineCache * GetInlineCache(uint index);
bool CanFunctionObjectHaveInlineCaches();
void** GetInlineCaches();
Expand All @@ -3040,8 +3040,8 @@ namespace Js
IsInstInlineCache * GetIsInstInlineCache(uint index);
PolymorphicInlineCache * GetPolymorphicInlineCache(uint index);
PolymorphicInlineCache * CreateNewPolymorphicInlineCache(uint index, PropertyId propertyId, InlineCache * inlineCache);
PolymorphicInlineCache * CreateBiggerPolymorphicInlineCache(uint index, PropertyId propertyId);
private:
PolymorphicInlineCache * CreateBiggerPolymorphicInlineCache(uint index, PropertyId propertyId);
private:

void ResetInlineCaches();
PolymorphicInlineCache * CreatePolymorphicInlineCache(uint index, uint16 size);
Expand Down
8 changes: 4 additions & 4 deletions lib/Runtime/Base/ScriptContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4853,15 +4853,15 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
return this->interpreterThunkEmitter->IsInHeap((void*)address);
}

void ScriptContext::ReleaseDynamicInterpreterThunk(BYTE* address, bool addtoFreeList)
void ScriptContext::ReleaseDynamicInterpreterThunk(void* address, bool addtoFreeList)
{
this->interpreterThunkEmitter->Release(address, addtoFreeList);
this->interpreterThunkEmitter->Release((BYTE*)address, addtoFreeList);
}

void ScriptContext::ReleaseDynamicAsmJsInterpreterThunk(BYTE* address, bool addtoFreeList)
void ScriptContext::ReleaseDynamicAsmJsInterpreterThunk(void* address, bool addtoFreeList)
{
#ifdef ASMJS_PLAT
this->asmJsInterpreterThunkEmitter->Release(address, addtoFreeList);
this->asmJsInterpreterThunkEmitter->Release((BYTE*)address, addtoFreeList);
#else
Assert(UNREACHED);
#endif
Expand Down
10 changes: 5 additions & 5 deletions lib/Runtime/Base/ScriptContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,15 +910,15 @@ namespace Js
void SetDirectHostTypeId(TypeId typeId) {directHostTypeId = typeId; }
TypeId GetDirectHostTypeId() const { return directHostTypeId; }

intptr_t GetRemoteScriptAddr()
intptr_t GetRemoteScriptAddr()
{
#if ENABLE_OOP_NATIVE_CODEGEN
if (!m_remoteScriptContextAddr)
{
InitializeRemoteScriptContext();
}
#endif
return m_remoteScriptContextAddr;
return m_remoteScriptContextAddr;
}

char16 const * GetUrl() const { return url; }
Expand Down Expand Up @@ -1657,8 +1657,8 @@ namespace Js
JavascriptMethod GetNextDynamicAsmJsInterpreterThunk(PVOID* ppDynamicInterpreterThunk);
JavascriptMethod GetNextDynamicInterpreterThunk(PVOID* ppDynamicInterpreterThunk);
BOOL IsDynamicInterpreterThunk(JavascriptMethod address);
void ReleaseDynamicInterpreterThunk(BYTE* address, bool addtoFreeList);
void ReleaseDynamicAsmJsInterpreterThunk(BYTE* address, bool addtoFreeList);
void ReleaseDynamicInterpreterThunk(void* address, bool addtoFreeList);
void ReleaseDynamicAsmJsInterpreterThunk(void* address, bool addtoFreeList);
#endif

static Var DebugProfileProbeThunk(RecyclableObject* function, CallInfo callInfo, ...);
Expand Down Expand Up @@ -1770,7 +1770,7 @@ namespace Js

virtual bool IsRecyclerVerifyEnabled() const override;
virtual uint GetRecyclerVerifyPad() const override;

virtual Js::Var* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;

Js::SourceTextModuleRecord* GetModuleRecord(uint moduleId) const
Expand Down