Skip to content

[cDAC] Fix ARM32 thumb-bit bug in GetFuncletStartAddress #128571

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
max-charlamb merged 2 commits into from
May 26, 2026
Merged

[cDAC] Fix ARM32 thumb-bit bug in GetFuncletStartAddress #128571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3e44d
[cDAC] Strip ARM32 thumb bit in GetFuncletStartAddress
May 25, 2026
2721fbe
Note ARM32 Thumb bit on RuntimeFunction.BeginAddress
May 26, 2026
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
2 changes: 1 addition & 1 deletion docs/design/datacontracts/ExecutionManager.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ Data descriptors used:
| `ReadyToRunHeader` | `MinorVersion` | ReadyToRun minor version |
| `ImageDataDirectory` | `VirtualAddress` | Virtual address of the image data directory |
| `ImageDataDirectory` | `Size` | Size of the data |
| `RuntimeFunction` | `BeginAddress` | Begin address of the function |
| `RuntimeFunction` | `BeginAddress` | Begin address of the function. On ARM32, bit 0 (the Thumb bit) is set. |
| `RuntimeFunction` | `EndAddress` | End address of the function. Only exists on some platforms |
| `RuntimeFunction` | `UnwindData` | Pointer to the unwind info for the function |
| `HashMap` | `Buckets` | Pointer to the buckets of a `HashMap` |
Expand Down
3 changes: 2 additions & 1 deletion ...agnostics.DataContractReader.Contracts/Contracts/ExecutionManager/ExecutionManagerCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ TargetPointer IExecutionManager.GetFuncletStartAddress(CodeBlockHandle codeInfoH
// TODO(cdac): EXCEPTION_DATA_SUPPORTS_FUNCTION_FRAGMENTS, implement iterating over fragments until finding
// non-fragment RuntimeFunction

return range.Data.RangeBegin + runtimeFunction.BeginAddress;
return CodePointerUtils.AddressFromCodePointer(
new TargetCodePointer(range.Data.RangeBegin + runtimeFunction.BeginAddress), _target);
}

void IExecutionManager.GetMethodRegionInfo(CodeBlockHandle codeInfoHandle, out uint hotSize, out TargetPointer coldStart, out uint coldSize)
Expand Down
Loading