Skip to content

[RISC-V] Fix GenerateResolveStub #106562

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
Aug 22, 2024
Merged

[RISC-V] Fix GenerateResolveStub #106562

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
8 changes: 4 additions & 4 deletions src/coreclr/vm/riscv64/virtualcallstubcpu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ struct ResolveHolder
;;cachemask => [CALL_STUB_CACHE_MASK * sizeof(void*)]

// Called directly by JITTED code
// ResolveStub._resolveEntryPoint(a0:Object*, a1 ...,a7, t8:IndirectionCellAndFlags)
// ResolveStub._resolveEntryPoint(a0:Object*, a1 ...,a7, t5:IndirectionCellAndFlags)
// {
// MethodTable mt = a0.m_pMethTab;
// int i = ((mt + mt >> 12) ^ this._hashedToken) & _cacheMask
Expand Down Expand Up @@ -263,14 +263,14 @@ struct ResolveHolder
_stub._resolveEntryPoint[n++] = 0x01cf9a63;// | PC_REL_OFFSET(_slowEntryPoint[0], n);

// ld t6, 0(t1) # t6 = e.token;
_stub._resolveEntryPoint[n++] = 0x00033f83 | ((offsetof(ResolveCacheElem, token) & 0xfff)<<10);
_stub._resolveEntryPoint[n++] = 0x00033f83 | ((offsetof(ResolveCacheElem, token) & 0xfff)<<20);
// bne t6, t2, next
_stub._resolveEntryPoint[n++] = 0x007f9663;// | PC_REL_OFFSET(_slowEntryPoint[0], n);

pc_offset = offsetof(ResolveCacheElem, target) & 0xffffffff;
_ASSERTE(pc_offset >=0 && pc_offset%8 == 0);
// ld t3, 0(t1) # t3 = e.target;
_stub._resolveEntryPoint[n++] = 0x00033e03 | ((offsetof(ResolveCacheElem, target) & 0xfff)<<10);
_stub._resolveEntryPoint[n++] = 0x00033e03 | ((offsetof(ResolveCacheElem, target) & 0xfff)<<20);
// jalr x0, t3, 0
_stub._resolveEntryPoint[n++] = 0x000e0067;

Expand All @@ -289,7 +289,7 @@ struct ResolveHolder

// auipc t0, 0
_stub._slowEntryPoint[0] = 0x00000297;
// ld t6, 0(t0) # r21 = _resolveWorkerTarget;
// ld t6, 0(t0) # t6 = _resolveWorkerTarget;
static_assert_no_msg((0x14*4) == ((INT32)(offsetof(ResolveStub, _resolveWorkerTarget) - (offsetof(ResolveStub, _slowEntryPoint[0])))));
static_assert_no_msg((ResolveStub::slowEntryPointLen + ResolveStub::failEntryPointLen+1+3*2) == 0x14);
_stub._slowEntryPoint[1] = 0x0002bf83 | ((0x14 * 4) << 20);
Expand Down