Skip to content

Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT] #100117

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 2 commits into from
Mar 22, 2024
Merged

Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT] #100117

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
c044b5d
Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT]
filipnavara Mar 22, 2024
6d24934
Work around compiler-asserting tests
MichalStrehovsky Mar 22, 2024
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
4 changes: 2 additions & 2 deletions src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ C_FUNC(\Name):

.macro PREPARE_EXTERNAL_VAR Name, HelperReg
movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
add \HelperReg, pc
.endm

.macro PREPARE_EXTERNAL_VAR_INDIRECT Name, HelperReg
movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
add \HelperReg, pc
ldr \HelperReg, [\HelperReg]
.endm
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Stress/ABI/pinvokes_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Stress/ABI/pinvokes_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Stress/ABI/stubs_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Stress/ABI/tailcalls_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Stress/ABI/tailcalls_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<JitOptimizationSensitive>true</JitOptimizationSensitive>
<GCStressIncompatible>true</GCStressIncompatible>

<!-- https://github.com/dotnet/runtime/issues/100125 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down