From 77a9026a8803fa4e1a677a0d74a20f4e969b26ed Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 18 Jun 2023 18:52:05 +0100 Subject: Add LLVM br instruction --- .../shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java | 8 ++++++++ .../compiler/backends/llvm/ir/ast/instructions/LlvmBr.java | 10 ++++++++++ .../llvm/ir/ast/instructions/LlvmTerminatorInstruction.java | 2 +- .../backends/llvm/ir/LlvmIrSerializerInstructionTests.java | 12 ++++++++++++ .../org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java | 4 ++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBr.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 d304ce84..c06d06ca 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 @@ -160,6 +160,14 @@ public class LlvmIrSerializer { StringBuilder builder ) { switch (instruction) { + case LlvmBr br -> { + builder.append("br i1 "); + serializeOperand(br.condition(), builder); + builder.append(", label %"); + builder.append(br.ifTrueLabel()); + builder.append(", label %"); + builder.append(br.ifFalseLabel()); + } case LlvmReturn returnValue -> { builder.append("ret "); serializeType(returnValue.type(), builder); diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBr.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBr.java new file mode 100644 index 00000000..2fa3e127 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmBr.java @@ -0,0 +1,10 @@ +package org.shedlang.compiler.backends.llvm.ir.ast.instructions; + +import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand; + +public record LlvmBr( + LlvmOperand condition, + String ifTrueLabel, + String ifFalseLabel +) 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 80030e10..2de7ae7e 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 LlvmReturn, LlvmReturnVoid { +public sealed interface LlvmTerminatorInstruction permits LlvmBr, 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 7e8f02cf..56955b92 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,18 @@ public class LlvmIrSerializerInstructionTests { assertThat(result, equalTo("%x = add i64 %y, %z")); } + @Test + public void brIsSerializedWithOperandAndLabels() { + var instruction = LlvmIr.br( + LlvmIr.variableLocal("x"), + "ifTrue", + "ifFalse" + ); + + var result = serializeToString(instruction, LlvmIrSerializer::serializeTerminatorInstruction); + + assertThat(result, equalTo("br i1 %x, label %ifTrue, label %ifFalse")); + } @Test public void canSerializeCallWithNoTargetAndNoArgs() { 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 a1eb8397..bfbba4a6 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 @@ -37,6 +37,10 @@ public class LlvmIr { return new LlvmBasicBlock(Optional.of(name), instructions, terminator); } + public static LlvmBr br(LlvmVariableLocal condition, String ifTrue, String ifFalse) { + return new LlvmBr(condition, ifTrue, ifFalse); + } + public static LlvmCall call( LlvmType returnType, LlvmOperand functionPointer, -- cgit v1.2.3