AArch64: Add FarBranch support for BranchOp.

zakkak · Sep 18, 2023 · 2d6f1e3 · 2d6f1e3
1 parent 3fe6122
commit 2d6f1e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.../jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/.../jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -2015,6 +2015,9 @@ protected void patchJumpTarget(int patchPos, int jumpTarget) {
         final int extraInformation = PatchLabelKind.decodeExtraInformation(instruction);
         switch (type) {
             case BRANCH_CONDITIONALLY:
+                if (!NumUtil.isSignedNbit(21, pcRelativeOffset)) {
+                    throw new BranchTargetOutOfBoundsException(true, "Branch target %d out of bounds", pcRelativeOffset);
+                }
                 ConditionFlag condition = ConditionFlag.fromEncoding(extraInformation);
                 super.b(condition, pcRelativeOffset, patchPos);
                 break;

diff --git a/...src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java b/...src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
@@ -133,7 +133,9 @@ public BranchOp(AArch64Assembler.ConditionFlag condition, LabelRef trueDestinati
         @Override
         protected void emitBranch(CompilationResultBuilder crb, AArch64MacroAssembler masm, LabelRef target, boolean negate) {
             AArch64Assembler.ConditionFlag finalCond = negate ? condition.negate() : condition;
-            masm.branchConditionally(finalCond, target.label());
+            Consumer<Label> originalBranch = l -> masm.branchConditionally(finalCond, l);
+            Consumer<Label> negatedBranch = l -> masm.branchConditionally(finalCond.negate(), l);
+            emitBranchOrFarBranch(crb, masm, this, 21, target.label(), originalBranch, negatedBranch);
         }
     }