From a725099e58119c19bb862558b3fee6fd3c47e0ce Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 18 Jun 2023 18:59:06 +0100 Subject: Add LLVM instruction br unconditional --- .../shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java | 4 ++++ .../backends/llvm/ir/ast/instructions/LlvmBrUnconditional.java | 6 ++++++ .../llvm/ir/ast/instructions/LlvmTerminatorInstruction.java | 2 +- .../backends/llvm/ir/LlvmIrSerializerInstructionTests.java | 10 ++++++++++ .../org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java | 4 ++++ 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBrUnconditional.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java index c06d06ca..47032f9f 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java @@ -168,6 +168,10 @@ public class LlvmIrSerializer { builder.append(", label %"); builder.append(br.ifFalseLabel()); } + case LlvmBrUnconditional br -> { + builder.append("br label %"); + builder.append(br.targetLabel()); + } case LlvmReturn returnValue -> { builder.append("ret "); serializeType(returnValue.type(), builder); diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBrUnconditional.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBrUnconditional.java new file mode 100644 index 00000000..0a33022b --- /dev/null +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBrUnconditional.java @@ -0,0 +1,6 @@ +package org.shedlang.compiler.backends.llvm.ir.ast.instructions; + +public record LlvmBrUnconditional( + String targetLabel +) implements LlvmTerminatorInstruction { +} diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmTerminatorInstruction.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmTerminatorInstruction.java index 2de7ae7e..12265086 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmTerminatorInstruction.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmTerminatorInstruction.java @@ -1,4 +1,4 @@ package org.shedlang.compiler.backends.llvm.ir.ast.instructions; -public sealed interface LlvmTerminatorInstruction permits LlvmBr, LlvmReturn, LlvmReturnVoid { +public sealed interface LlvmTerminatorInstruction permits LlvmBr, LlvmBrUnconditional, LlvmReturn, LlvmReturnVoid { } diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java index 56955b92..fc4f5e46 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java @@ -24,6 +24,7 @@ public class LlvmIrSerializerInstructionTests { assertThat(result, equalTo("%x = add i64 %y, %z")); } + @Test public void brIsSerializedWithOperandAndLabels() { var instruction = LlvmIr.br( @@ -37,6 +38,15 @@ public class LlvmIrSerializerInstructionTests { assertThat(result, equalTo("br i1 %x, label %ifTrue, label %ifFalse")); } + @Test + public void brUnconditionIsSerializedWithLabel() { + var instruction = LlvmIr.brUnconditional("target"); + + var result = serializeToString(instruction, LlvmIrSerializer::serializeTerminatorInstruction); + + assertThat(result, equalTo("br label %target")); + } + @Test public void canSerializeCallWithNoTargetAndNoArgs() { var instruction = LlvmIr.call( diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java index bfbba4a6..a8023c35 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java @@ -41,6 +41,10 @@ public class LlvmIr { return new LlvmBr(condition, ifTrue, ifFalse); } + public static LlvmBrUnconditional brUnconditional(String target) { + return new LlvmBrUnconditional(target); + } + public static LlvmCall call( LlvmType returnType, LlvmOperand functionPointer, -- cgit v1.2.3