Skip to content

Fix ARM64 ADRP page-relative address calculation #576

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
ada-l0velace wants to merge 1 commit into
base: development
Choose a base branch
from
+2 −1
Open

Fix ARM64 ADRP page-relative address calculation #576

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
3 changes: 2 additions & 1 deletion Cpp2IL.Core/InstructionSets/NewArmV8InstructionSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ void AddCall(MethodAnalysisContext context, object? returnRegister2, ulong addre
case Arm64Mnemonic.ADRP:
//Just handle as a move
Add(address, OpCode.Move, ConvertOperand(instruction, 0), ConvertOperand(instruction, 1));
adrpOffsets[instruction.Op0Reg] = (ulong)instruction.Op1Imm;
var pageAddress = address & ~0xFFFUL;
adrpOffsets[instruction.Op0Reg] = (ulong)((long)pageAddress + instruction.Op1Imm);
break;
case Arm64Mnemonic.LDP when instruction.Op2Kind == Arm64OperandKind.Memory:
//LDP (dest1, dest2, [mem]) - basically just treat as two loads, with the second offset by the length of the first
Expand Down
Loading