Skip to content

[Wasm] Fix FP-based stack slot lookup #128958

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

Open
kg wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −0
Open

[Wasm] Fix FP-based stack slot lookup #128958

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
15 changes: 15 additions & 0 deletions src/coreclr/vm/gcinfodecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2166,6 +2166,9 @@ template <> OBJECTREF* TGcInfoDecoder<InterpreterGcInfoEncoding>::GetStackSlot(
}
#endif

#ifdef TARGET_WASM
TADDR GetWasmFramePointerFromStackPointer(TADDR sp);
#endif
Comment on lines +2169 to +2171

template <typename GcInfoEncoding> OBJECTREF* TGcInfoDecoder<GcInfoEncoding>::GetStackSlot(
INT32 spOffset,
Expand All @@ -2188,6 +2191,17 @@ template <typename GcInfoEncoding> OBJECTREF* TGcInfoDecoder<GcInfoEncoding>::Ge
_ASSERTE( GC_FRAMEREG_REL == spBase );
_ASSERTE( NO_STACK_BASE_REGISTER != m_StackBaseRegister );

#ifdef TARGET_WASM
// Wasm is a bit strange and when we do SetStackBaseRegister(REG_FPBASE)
// what that actually does is set it to REG_NA, which currently has the value 2.
_ASSERTE( 2 == m_StackBaseRegister );
// We have the stack pointer, use it to recover the frame pointer.
TADDR pFrameReg = GetWasmFramePointerFromStackPointer((TADDR)pRD->SP);
Comment on lines +2195 to +2199

pObjRef = (OBJECTREF*)(pFrameReg + spOffset);

#else // TARGET_WASM

SIZE_T * pFrameReg = (SIZE_T*) GetRegisterSlot(m_StackBaseRegister, pRD);

#if defined(TARGET_UNIX) && !defined(FEATURE_NATIVEAOT)
Expand All @@ -2201,6 +2215,7 @@ template <typename GcInfoEncoding> OBJECTREF* TGcInfoDecoder<GcInfoEncoding>::Ge
#endif // TARGET_UNIX && !FEATURE_NATIVEAOT

pObjRef = (OBJECTREF*)(*pFrameReg + spOffset);
#endif // !TARGET_WASM
}

return pObjRef;
Expand Down
Loading